From 8d2280f533faf5e372d604cf35b355b898423375 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 28 Oct 2021 10:03:22 -0400 Subject: [PATCH] zink: don't clamp cube array surfacess to cubes this was probably necessary for some other reason that has since been fixed, and instead now just creates validation spam cc: mesa-stable fixes #5566 Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_surface.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_surface.h b/src/gallium/drivers/zink/zink_surface.h index b6de77cd596..cb08869c2b4 100644 --- a/src/gallium/drivers/zink/zink_surface.h +++ b/src/gallium/drivers/zink/zink_surface.h @@ -123,10 +123,7 @@ zink_surface_clamp_viewtype(VkImageViewType viewType, unsigned first_layer, unsi if (viewType == VK_IMAGE_VIEW_TYPE_CUBE || viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY) { if (first_layer == last_layer) return VK_IMAGE_VIEW_TYPE_2D; - if (layerCount % 6 == 0) { - if (viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY && layerCount == 6) - return VK_IMAGE_VIEW_TYPE_CUBE; - } else if (first_layer || layerCount != array_size) + if (layerCount % 6 != 0 && (first_layer || layerCount != array_size)) return VK_IMAGE_VIEW_TYPE_2D_ARRAY; } else if (viewType == VK_IMAGE_VIEW_TYPE_2D_ARRAY) { if (first_layer == last_layer)