Mesa (main): vulkan: check 3D image type for VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9a6ea51388505ce90834708dc7848b23d2b362b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a6ea51388505ce90834708dc7848b23d2b362b3

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Apr  5 08:39:34 2022 -0400

vulkan: check 3D image type for VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15754>

---

 src/vulkan/runtime/vk_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c
index 6bdbe68a350..87beafdcaa8 100644
--- a/src/vulkan/runtime/vk_image.c
+++ b/src/vulkan/runtime/vk_image.c
@@ -278,7 +278,7 @@ vk_image_view_init(struct vk_device *device,
       break;
    case VK_IMAGE_VIEW_TYPE_2D:
    case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
-      if (image->create_flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT)
+      if (image->create_flags & (VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT | VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT))
          assert(image->image_type == VK_IMAGE_TYPE_3D);
       else
          assert(image->image_type == VK_IMAGE_TYPE_2D);