fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 16:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tu: Correctly handle VK_IMAGE_CREATE_EXTENDED_USAGE_BIT

Browse source 
In this case we should relax checks based on the format, since the user
will be responsible for them when creating an image view.

This gets dEQP-VK.image.sample_texture.*_bit_compressed_format_* not
skipping again after VK-GL-CTS 736eec57dc0c ("Fix checkSupport in
compressed texture sampling tests").

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15563>
This commit is contained in:
Connor Abbott 2022-03-24 17:31:29 +01:00 • committed by Marge Bot
parent 1b2ccea63f
commit 9d081d7561
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/freedreno/vulkan/tu_formats.c
View file

@ -443,25 +443,43 @@ tu_get_image_format_properties(
*/
}
if (info->usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
/* From the Vulkan 1.3.206 spec:
*
* "VK_IMAGE_CREATE_EXTENDED_USAGE_BIT specifies that the image can be
* created with usage flags that are not supported for the format the image
* is created with but are supported for at least one format a VkImageView
* created from the image can have."
*
* This means we should relax checks that only depend on the
* format_feature_flags, to allow the user to create images that may be
* e.g. reinterpreted as storage when the original format doesn't allow it.
* The user will have to check against the format features anyway.
* Otherwise we'd unnecessarily disallow it.
*/
VkImageUsageFlags image_usage = info->usage;
if (info->flags & VK_IMAGE_CREATE_EXTENDED_USAGE_BIT)
image_usage = 0;
if (image_usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
if (!(format_feature_flags & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT)) {
goto unsupported;
}
}
if (info->usage & VK_IMAGE_USAGE_STORAGE_BIT) {
if (image_usage & VK_IMAGE_USAGE_STORAGE_BIT) {
if (!(format_feature_flags & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)) {
goto unsupported;
}
}
if (info->usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
if (image_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
if (!(format_feature_flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) {
goto unsupported;
}
}
if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
if (image_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
if (!(format_feature_flags &
VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) {
goto unsupported;