Module: Mesa Branch: staging/21.3 Commit: a4cd736cb39f02a06bda5934c5306204997e84d1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4cd736cb39f02a06bda5934c5306204997e84d1
Author: Mike Blumenkrantz <[email protected]> Date: Fri Oct 29 11:22:44 2021 -0400 zink: always add VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT for 3D images there's no way to know what an image will be used for, so this bit needs to always be added fixes KHR-GL46.packed_pixels.varied_rectangle.compressed_rgb cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13798> (cherry picked from commit 43c457a6ecfc1638846a77fe18dbe72b10187103) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 10e43531f20..c53d43e98c4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -877,7 +877,7 @@ "description": "zink: always add VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT for 3D images", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 78101d70b96..39d3749bff1 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -348,8 +348,7 @@ create_ici(struct zink_screen *screen, VkImageCreateInfo *ici, const struct pipe case PIPE_TEXTURE_3D: ici->imageType = VK_IMAGE_TYPE_3D; - if (bind & PIPE_BIND_RENDER_TARGET) - ici->flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT; + ici->flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT; break; case PIPE_BUFFER:
