radv: Use vk_features2_to_features

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22217>

diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index c05b040..6240ca1 100644 (file)
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -1222,12 +1222,6 @@ radv_get_modifier_flags(struct radv_physical_device *dev, VkFormat format, uint6
    return features;
 }
 
-static VkFormatFeatureFlags
-features2_to_features(VkFormatFeatureFlags2 features2)
-{
-   return features2 & VK_ALL_FORMAT_FEATURE_FLAG_BITS;
-}
-
 static void
 radv_list_drm_format_modifiers(struct radv_physical_device *dev, VkFormat format,
                                const VkFormatProperties3 *format_props,
@@ -1277,7 +1271,8 @@ radv_list_drm_format_modifiers(struct radv_physical_device *dev, VkFormat format
          *out_props = (VkDrmFormatModifierPropertiesEXT) {
             .drmFormatModifier = mods[i],
             .drmFormatModifierPlaneCount = planes,
-            .drmFormatModifierTilingFeatures = features2_to_features(features),
+            .drmFormatModifierTilingFeatures =
+               vk_format_features2_to_features(features),
          };
       };
    }
@@ -1433,11 +1428,11 @@ radv_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, VkForma
    radv_physical_device_get_format_properties(physical_device, format, &format_props);
 
    pFormatProperties->formatProperties.linearTilingFeatures =
-      features2_to_features(format_props.linearTilingFeatures);
+      vk_format_features2_to_features(format_props.linearTilingFeatures);
    pFormatProperties->formatProperties.optimalTilingFeatures =
-      features2_to_features(format_props.optimalTilingFeatures);
+      vk_format_features2_to_features(format_props.optimalTilingFeatures);
    pFormatProperties->formatProperties.bufferFeatures =
-      features2_to_features(format_props.bufferFeatures);
+      vk_format_features2_to_features(format_props.bufferFeatures);
 
    VkFormatProperties3 *format_props_extended =
       vk_find_struct(pFormatProperties, FORMAT_PROPERTIES_3);