From 6fa56273be734dd04d4a8c0d342dd65bc8602a30 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Fri, 5 Feb 2021 12:07:08 -0800 Subject: [PATCH] anv/image: Drop duplicate 'format' in anv_image_create() Reduces the chance of misusing unitialized 'n_planes' and 'format' during image creation. Reviewed-by: Jason Ekstrand Part-of: --- src/intel/vulkan/anv_image.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 2a312f86980..1dac94ed915 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -796,6 +796,7 @@ anv_image_create(VkDevice _device, pCreateInfo->extent); image->vk_format = pCreateInfo->format; image->format = anv_get_format(pCreateInfo->format); + image->n_planes = image->format->n_planes; image->aspects = vk_format_aspects(image->vk_format); image->levels = pCreateInfo->mipLevels; image->array_size = pCreateInfo->arrayLayers; @@ -829,15 +830,10 @@ anv_image_create(VkDevice _device, return VK_SUCCESS; } - const struct anv_format *format = anv_get_format(image->vk_format); - assert(format != NULL); - const isl_tiling_flags_t isl_tiling_flags = choose_isl_tiling_flags(&device->info, create_info, isl_mod_info, image->needs_set_tiling); - image->n_planes = format->n_planes; - const VkImageFormatListCreateInfoKHR *fmt_list = vk_find_struct_const(pCreateInfo->pNext, IMAGE_FORMAT_LIST_CREATE_INFO_KHR);