OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: check VkPhysicalDeviceImageDrmFormatModifierInfoEXT

Browse Source 
Make sure VK_ERROR_FORMAT_NOT_SUPPORTED is returned when
VkPhysicalDeviceImageDrmFormatModifierInfoEXT specifies an unsupported
modifier.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31719>
This commit is contained in:
Chia-I Wu
2024-10-14 17:35:13 -07:00
committed by Marge Bot
parent 252ddaf51b
commit cb7ce6a934
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/panfrost/vulkan/panvk_physical_device.c
View File

@@ -1104,25 +1104,30 @@ get_image_format_properties(struct panvk_physical_device *physical_device,
case VK_IMAGE_TILING_LINEAR:
format_feature_flags = format_props.linearTilingFeatures;
break;
case VK_IMAGE_TILING_OPTIMAL:
format_feature_flags = format_props.optimalTilingFeatures;
break;
case VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT: {
const VkPhysicalDeviceImageDrmFormatModifierInfoEXT *mod_info =
vk_find_struct_const(
info->pNext, PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT);
if (mod_info->drmFormatModifier != DRM_FORMAT_MOD_LINEAR)
goto unsupported;
case VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT:
/* The only difference between optimal and linear is currently whether
* depth/stencil attachments are allowed on depth/stencil formats.
* There's no reason to allow importing depth/stencil textures, so just
* disallow it and then this annoying edge case goes away.
*
* TODO: If anyone cares, we could enable this by looking at the
* modifier and checking if it's LINEAR or not.
*/
if (util_format_is_depth_or_stencil(format))
goto unsupported;
assert(format_props.optimalTilingFeatures ==
format_props.linearTilingFeatures);
FALLTHROUGH;
case VK_IMAGE_TILING_OPTIMAL:
format_feature_flags = format_props.optimalTilingFeatures;
format_feature_flags = format_props.linearTilingFeatures;
break;
}
default:
unreachable("bad VkPhysicalDeviceImageFormatInfo2");
}