AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: Make sure the properties are all zero when the format is not supported

Browse Source 
Move one of the is_supported() check before we start filling the
structure so we don't end up with a partially filled object when
we return VK_ERROR_FORMAT_NOT_SUPPORTED (which deqp doesn't seem to like,
so it's probably coming from a spec requirement).

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15698>
This commit is contained in:
Boris Brezillon
2022-03-31 17:56:37 +02:00
committed by Marge Bot
parent dc3dd9690b
commit 8dfab9b382
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft/vulkan/dzn_device.cpp
+3 -3
View File
@@ -724,6 +724,9 @@ dzn_physical_device_get_image_format_properties(dzn_physical_device *pdev,
(!(dfmt_info.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW) || is_bgra4))
return VK_ERROR_FORMAT_NOT_SUPPORTED;
if (info->type == VK_IMAGE_TYPE_3D && info->tiling != VK_IMAGE_TILING_OPTIMAL)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
bool is_3d = info->type == VK_IMAGE_TYPE_3D;
uint32_t max_extent = dzn_physical_device_get_max_extent(is_3d);
@@ -750,9 +753,6 @@ dzn_physical_device_get_image_format_properties(dzn_physical_device *pdev,
properties->imageFormatProperties.maxExtent.depth = 1;
break;
case VK_IMAGE_TYPE_3D:
if (info->tiling != VK_IMAGE_TILING_OPTIMAL)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
properties->imageFormatProperties.maxExtent.width = max_extent;
properties->imageFormatProperties.maxExtent.height = max_extent;
properties->imageFormatProperties.maxExtent.depth = max_extent;