radv: enable VK_AMD_shader_trinary_minmax extension

[mesa.git] / src / amd / vulkan / radv_formats.c

diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index a150f8c64f82b661e810947f56f701616b4ac15c..efb1d78790aa00e935ed4be7005b51a7c0a21532 100644 (file)
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -541,6 +541,35 @@ static bool radv_is_zs_format_supported(VkFormat format)
        return radv_translate_dbformat(format) != V_028040_Z_INVALID || format == VK_FORMAT_S8_UINT;
 }
 
+static bool radv_is_filter_minmax_format_supported(VkFormat format)
+{
+       /* From the Vulkan spec 1.1.71:
+        *
+        * "The following formats must support the
+        *  VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT feature with
+        *  VK_IMAGE_TILING_OPTIMAL, if they support
+        *  VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT."
+        */
+       /* TODO: enable more formats. */
+       switch (format) {
+       case VK_FORMAT_R8_UNORM:
+       case VK_FORMAT_R8_SNORM:
+       case VK_FORMAT_R16_UNORM:
+       case VK_FORMAT_R16_SNORM:
+       case VK_FORMAT_R16_SFLOAT:
+       case VK_FORMAT_R32_SFLOAT:
+       case VK_FORMAT_D16_UNORM:
+       case VK_FORMAT_X8_D24_UNORM_PACK32:
+       case VK_FORMAT_D32_SFLOAT:
+       case VK_FORMAT_D16_UNORM_S8_UINT:
+       case VK_FORMAT_D24_UNORM_S8_UINT:
+       case VK_FORMAT_D32_SFLOAT_S8_UINT:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static void
 radv_physical_device_get_format_properties(struct radv_physical_device *physical_device,
                                           VkFormat format,
@@ -578,6 +607,9 @@ radv_physical_device_get_format_properties(struct radv_physical_device *physical
                        tiled |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR |
                                 VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR;
 
+                       if (radv_is_filter_minmax_format_supported(format))
+                                tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT;
+
                        /* GFX9 doesn't support linear depth surfaces */
                        if (physical_device->rad_info.chip_class >= GFX9)
                                linear = 0;
@@ -589,6 +621,10 @@ radv_physical_device_get_format_properties(struct radv_physical_device *physical
                                VK_FORMAT_FEATURE_BLIT_SRC_BIT;
                        tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
                                VK_FORMAT_FEATURE_BLIT_SRC_BIT;
+
+                       if (radv_is_filter_minmax_format_supported(format))
+                                tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT;
+
                        if (linear_sampling) {
                                linear |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
                                tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
@@ -1026,7 +1062,7 @@ void radv_GetPhysicalDeviceFormatProperties(
                                                   pFormatProperties);
 }
 
-void radv_GetPhysicalDeviceFormatProperties2KHR(
+void radv_GetPhysicalDeviceFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        VkFormat                                    format,
        VkFormatProperties2KHR*                         pFormatProperties)
@@ -1211,7 +1247,7 @@ get_external_image_format_properties(const VkPhysicalDeviceImageFormatInfo2KHR *
        };
 }
 
-VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
+VkResult radv_GetPhysicalDeviceImageFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceImageFormatInfo2KHR  *base_info,
        VkImageFormatProperties2KHR                *base_props)
@@ -1308,7 +1344,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties(
        *pNumProperties = 0;
 }
 
-void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
+void radv_GetPhysicalDeviceSparseImageFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
        uint32_t                                   *pPropertyCount,
@@ -1318,7 +1354,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
        *pPropertyCount = 0;
 }
 
-void radv_GetPhysicalDeviceExternalBufferPropertiesKHR(
+void radv_GetPhysicalDeviceExternalBufferProperties(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo,
        VkExternalBufferPropertiesKHR               *pExternalBufferProperties)