From 2bfd43ba0bf7ef43d73c0d4dc9174aad8f0522f7 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Sun, 9 Aug 2020 12:53:47 -0700 Subject: [PATCH] anv/image: Add more asserts to choose_isl_tiling_flags Acked-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_image.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 855294264d4..418db402d41 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -101,6 +101,9 @@ choose_isl_tiling_flags(const struct gen_device_info *devinfo, const VkImageCreateInfo *base_info = anv_info->vk_info; isl_tiling_flags_t flags = 0; + assert((isl_mod_info != NULL) == + (base_info->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT)); + switch (base_info->tiling) { default: unreachable("bad VkImageTiling"); @@ -111,12 +114,13 @@ choose_isl_tiling_flags(const struct gen_device_info *devinfo, flags = ISL_TILING_LINEAR_BIT; break; case VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT: - assert(isl_mod_info); flags = 1 << isl_mod_info->tiling; } - if (anv_info->isl_tiling_flags) + if (anv_info->isl_tiling_flags) { + assert(isl_mod_info == NULL); flags &= anv_info->isl_tiling_flags; + } if (legacy_scanout) { isl_tiling_flags_t legacy_mask = ISL_TILING_LINEAR_BIT;