KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13586>
This commit is contained in:
Mike Blumenkrantz 2021-10-28 10:03:22 -04:00 committed by Marge Bot
parent 6ab915960c
commit 8d2280f533
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_surface.h
View File

@ -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)