From 72a63649c25545cbf2315ce2a7e73db6d3067d98 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 5 Apr 2022 16:03:08 -0400
Subject: [PATCH] zink: use EXT_image_2d_view_of_3d

fixes #4562

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15716>
---
 src/gallium/drivers/zink/zink_device_info.py | 3 +++
 src/gallium/drivers/zink/zink_resource.c     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py
index ef21092e490..84b3f77e76e 100644
--- a/src/gallium/drivers/zink/zink_device_info.py
+++ b/src/gallium/drivers/zink/zink_device_info.py
@@ -87,6 +87,9 @@ EXTENSIONS = [
               alias="storage_16bit",
               features=True,
               conditions=["$feats.storageBuffer16BitAccess"]),
+    Extension("VK_EXT_image_2d_view_of_3d",
+              alias="view2d",
+              features=True),
     Extension("VK_KHR_driver_properties",
         alias="driver",
         properties=True),
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 2c16b738941..e9659124cfa 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -377,6 +377,8 @@ create_ici(struct zink_screen *screen, VkImageCreateInfo *ici, const struct pipe
    case PIPE_TEXTURE_3D:
       ici->imageType = VK_IMAGE_TYPE_3D;
       ici->flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT;
+      if (screen->info.have_EXT_image_2d_view_of_3d)
+         ici->flags |= VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT;
       break;
 
    case PIPE_BUFFER: