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 <jason@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8097>
This commit is contained in:
parent
2328edbb62
commit
6fa56273be
|
@ -796,6 +796,7 @@ anv_image_create(VkDevice _device,
|
||||||
pCreateInfo->extent);
|
pCreateInfo->extent);
|
||||||
image->vk_format = pCreateInfo->format;
|
image->vk_format = pCreateInfo->format;
|
||||||
image->format = anv_get_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->aspects = vk_format_aspects(image->vk_format);
|
||||||
image->levels = pCreateInfo->mipLevels;
|
image->levels = pCreateInfo->mipLevels;
|
||||||
image->array_size = pCreateInfo->arrayLayers;
|
image->array_size = pCreateInfo->arrayLayers;
|
||||||
|
@ -829,15 +830,10 @@ anv_image_create(VkDevice _device,
|
||||||
return VK_SUCCESS;
|
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 =
|
const isl_tiling_flags_t isl_tiling_flags =
|
||||||
choose_isl_tiling_flags(&device->info, create_info, isl_mod_info,
|
choose_isl_tiling_flags(&device->info, create_info, isl_mod_info,
|
||||||
image->needs_set_tiling);
|
image->needs_set_tiling);
|
||||||
|
|
||||||
image->n_planes = format->n_planes;
|
|
||||||
|
|
||||||
const VkImageFormatListCreateInfoKHR *fmt_list =
|
const VkImageFormatListCreateInfoKHR *fmt_list =
|
||||||
vk_find_struct_const(pCreateInfo->pNext,
|
vk_find_struct_const(pCreateInfo->pNext,
|
||||||
IMAGE_FORMAT_LIST_CREATE_INFO_KHR);
|
IMAGE_FORMAT_LIST_CREATE_INFO_KHR);
|
||||||
|
|
Loading…
Reference in New Issue