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

venus: scrub disallowed ycbcr features for rgba10x6

Browse Source 
This is needed before we passthrough VK_EXT_rgba10x6_formats on
supported platforms.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33296>
This commit is contained in:
Yiwei Zhang
2025-01-30 05:41:10 +00:00
committed by Marge Bot
parent 6f5c227e2c
commit d73642d9ff
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/virtio/vulkan/vn_physical_device.c
View File

@@ -1802,6 +1802,38 @@ vn_GetPhysicalDeviceMemoryProperties2(
pMemoryProperties->memoryProperties = physical_dev->memory_properties; pMemoryProperties->memoryProperties = physical_dev->memory_properties;
} }
static inline void
vn_sanitize_format_properties(VkFormat format,
VkFormatProperties *props,
VkFormatProperties3 *props3)
{
// YCbCr formats only support a subset of format feature flags
static const VkFormatFeatureFlags allowed_ycbcr_feats =
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT |
VK_FORMAT_FEATURE_TRANSFER_SRC_BIT |
VK_FORMAT_FEATURE_TRANSFER_DST_BIT |
VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT |
VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT |
VK_FORMAT_FEATURE_DISJOINT_BIT;
/* TODO drop this after supporting VK_EXT_rgba10x6_formats */
if (format == VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16) {
props->linearTilingFeatures &= allowed_ycbcr_feats;
props->optimalTilingFeatures &= allowed_ycbcr_feats;
if (props3) {
props3->linearTilingFeatures &= allowed_ycbcr_feats;
props3->optimalTilingFeatures &= allowed_ycbcr_feats;
}
}
}
void void
vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
VkFormat format, VkFormat format,
@@ -1843,6 +1875,8 @@ vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
vn_call_vkGetPhysicalDeviceFormatProperties2(ring, physicalDevice, format, vn_call_vkGetPhysicalDeviceFormatProperties2(ring, physicalDevice, format,
pFormatProperties); pFormatProperties);
vn_sanitize_format_properties(format, &pFormatProperties->formatProperties,
props3);
if (entry) { if (entry) {
vn_physical_device_add_format_properties( vn_physical_device_add_format_properties(
physical_dev, entry, &pFormatProperties->formatProperties, props3); physical_dev, entry, &pFormatProperties->formatProperties, props3);