commit 0a9b8077adbe181e1dab20185bbde444c0468cac
author Iago Toral Quiroga <itoral@igalia.com> Wed Oct 28 09:04:42 2020 +0100
committer Iago Toral Quiroga <itoral@igalia.com> Mon Nov 02 09:33:32 2020 +0100
tree dca05dca2c767a9693fe6f1be087a63d6d3eec17
parent 03f260cb272838b7bd2e65cff6bb50840db56679

v3dv: add image view debug checks for VK_KHR_maintenance1

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7364>

src/broadcom/vulkan/v3dv_image.c

diff --git a/src/broadcom/vulkan/v3dv_image.c b/src/broadcom/vulkan/v3dv_image.c
index 519d3f1..cf365a1 100644
--- a/src/broadcom/vulkan/v3dv_image.c
+++ b/src/broadcom/vulkan/v3dv_image.c
@@ -327,7 +327,7 @@
    image->array_size = pCreateInfo->arrayLayers;
    image->samples = pCreateInfo->samples;
    image->usage = pCreateInfo->usage;
-   image->create_flags = pCreateInfo->flags;
+   image->flags = pCreateInfo->flags;
 
    image->drm_format_mod = modifier;
    image->tiling = tiling;
@@ -596,6 +596,13 @@
    case VK_IMAGE_TYPE_3D:
       assert(range->baseArrayLayer + v3dv_layer_count(image, range) - 1
              <= u_minify(image->extent.depth, range->baseMipLevel));
+      /* VK_KHR_maintenance1 */
+      assert(pCreateInfo->viewType != VK_IMAGE_VIEW_TYPE_2D ||
+             ((image->flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT) &&
+              range->levelCount == 1 && range->layerCount == 1));
+      assert(pCreateInfo->viewType != VK_IMAGE_VIEW_TYPE_2D_ARRAY ||
+             ((image->flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT) &&
+              range->levelCount == 1));
       break;
    default:
       unreachable("bad VkImageType");

src/broadcom/vulkan/v3dv_private.h

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 59e661e..0a916cb 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -425,7 +425,7 @@
    uint32_t array_size;
    uint32_t samples;
    VkImageUsageFlags usage;
-   VkImageCreateFlags create_flags;
+   VkImageCreateFlags flags;
    VkImageTiling tiling;
 
    VkFormat vk_format;