fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 19:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv/image: Minor refactor of VkImageFormatProperties::sampleCounts

Browse source 
The code in anv_get_image_format_properties() that set sampleCounts
appears correct, but weirdly inconsistent. Clean the code to
consistently set sampleCounts in the same location as
maxExtent/maxMipLevels/maxArraySize.

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Chad Versace 2020-08-08 18:42:22 -05:00
parent 2b3ec91326
commit 8c5b4b1e1d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/intel/vulkan/anv_formats.c
View file

@ -904,7 +904,7 @@ anv_get_image_format_properties(
VkExtent3D maxExtent;
uint32_t maxMipLevels;
uint32_t maxArraySize;
VkSampleCountFlags sampleCounts = VK_SAMPLE_COUNT_1_BIT;
VkSampleCountFlags sampleCounts;
const struct gen_device_info *devinfo = &physical_device->info;
const struct anv_format *format = anv_get_format(info->format);
const struct isl_drm_modifier_info *isl_mod_info = NULL;
@ -946,6 +946,7 @@ anv_get_image_format_properties(
maxExtent.depth = 1;
maxMipLevels = 15; /* log2(maxWidth) + 1 */
maxArraySize = 2048;
sampleCounts = VK_SAMPLE_COUNT_1_BIT;
break;
case VK_IMAGE_TYPE_3D:
maxExtent.width = 2048;
@ -953,6 +954,7 @@ anv_get_image_format_properties(
maxExtent.depth = 2048;
maxMipLevels = 12; /* log2(maxWidth) + 1 */
maxArraySize = 1;
sampleCounts = VK_SAMPLE_COUNT_1_BIT;
break;
}
@ -1060,7 +1062,7 @@ anv_get_image_format_properties(
goto unsupported;
maxArraySize = 1;
maxMipLevels = 1;
assert(sampleCounts == VK_SAMPLE_COUNT_1_BIT);
sampleCounts = VK_SAMPLE_COUNT_1_BIT;
/* Modifiers are not yet supported for YCbCr */
const struct anv_format *format = anv_get_format(info->format);