radv: avoid GPU hangs if someone does a resolve with non-multisample src (v2)

[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 b740a1a5d9bf6fc5f02a7e9f067ff98cb318cf34..57bde9e7cdc072ace2e04b19e3b0618fd0416378 100644 (file)
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -977,6 +977,27 @@ bool radv_format_pack_clear_color(VkFormat format,
                clear_vals[0] = float3_to_r11g11b10f(value->float32);
                clear_vals[1] = 0;
                break;
+       case VK_FORMAT_R32G32B32A32_SFLOAT:
+               if (value->float32[0] != value->float32[1] ||
+                   value->float32[0] != value->float32[2])
+                       return false;
+               clear_vals[0] = fui(value->float32[0]);
+               clear_vals[1] = fui(value->float32[3]);
+               break;
+       case VK_FORMAT_R32G32B32A32_UINT:
+               if (value->uint32[0] != value->uint32[1] ||
+                   value->uint32[0] != value->uint32[2])
+                       return false;
+               clear_vals[0] = value->uint32[0];
+               clear_vals[1] = value->uint32[3];
+               break;
+       case VK_FORMAT_R32G32B32A32_SINT:
+               if (value->int32[0] != value->int32[1] ||
+                   value->int32[0] != value->int32[2])
+                       return false;
+               clear_vals[0] = value->int32[0];
+               clear_vals[1] = value->int32[3];
+               break;
        default:
                fprintf(stderr, "failed to fast clear %d\n", format);
                return false;
@@ -1142,12 +1163,37 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties(
                                                pImageFormatProperties);
 }
 
+static void
+get_external_image_format_properties(const VkPhysicalDeviceImageFormatInfo2KHR *pImageFormatInfo,
+                                    VkExternalMemoryPropertiesKHR *external_properties)
+{
+       VkExternalMemoryFeatureFlagBitsKHR flags = 0;
+       VkExternalMemoryHandleTypeFlagsKHR export_flags = 0;
+       VkExternalMemoryHandleTypeFlagsKHR compat_flags = 0;
+       switch (pImageFormatInfo->type) {
+       case VK_IMAGE_TYPE_2D:
+               flags = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
+               compat_flags = export_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;
+               break;
+       default:
+               break;
+       }
+
+       *external_properties = (VkExternalMemoryPropertiesKHR) {
+               .externalMemoryFeatures = flags,
+               .exportFromImportedHandleTypes = export_flags,
+               .compatibleHandleTypes = compat_flags,
+       };
+}
+
 VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceImageFormatInfo2KHR  *base_info,
        VkImageFormatProperties2KHR                *base_props)
 {
        RADV_FROM_HANDLE(radv_physical_device, physical_device, physicalDevice);
+       const VkPhysicalDeviceExternalImageFormatInfoKHR *external_info = NULL;
+       VkExternalImageFormatPropertiesKHR *external_props = NULL;
        VkResult result;
 
        result = radv_get_image_format_properties(physical_device, base_info,
@@ -1155,7 +1201,69 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
        if (result != VK_SUCCESS)
                return result;
 
+          /* Extract input structs */
+       vk_foreach_struct_const(s, base_info->pNext) {
+               switch (s->sType) {
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR:
+                       external_info = (const void *) s;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       /* Extract output structs */
+       vk_foreach_struct(s, base_props->pNext) {
+               switch (s->sType) {
+               case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR:
+                       external_props = (void *) s;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       /* From the Vulkan 1.0.42 spec:
+        *
+        *    If handleType is 0, vkGetPhysicalDeviceImageFormatProperties2KHR will
+        *    behave as if VkPhysicalDeviceExternalImageFormatInfoKHR was not
+        *    present and VkExternalImageFormatPropertiesKHR will be ignored.
+        */
+       if (external_info && external_info->handleType != 0) {
+               switch (external_info->handleType) {
+               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
+                       get_external_image_format_properties(base_info, &external_props->externalMemoryProperties);
+                       break;
+               default:
+                       /* From the Vulkan 1.0.42 spec:
+                        *
+                        *    If handleType is not compatible with the [parameters] specified
+                        *    in VkPhysicalDeviceImageFormatInfo2KHR, then
+                        *    vkGetPhysicalDeviceImageFormatProperties2KHR returns
+                        *    VK_ERROR_FORMAT_NOT_SUPPORTED.
+                        */
+                       result = vk_errorf(VK_ERROR_FORMAT_NOT_SUPPORTED,
+                                          "unsupported VkExternalMemoryTypeFlagBitsKHR 0x%x",
+                                          external_info->handleType);
+                       goto fail;
+               }
+       }
+
        return VK_SUCCESS;
+
+fail:
+       if (result == VK_ERROR_FORMAT_NOT_SUPPORTED) {
+               /* From the Vulkan 1.0.42 spec:
+                *
+                *    If the combination of parameters to
+                *    vkGetPhysicalDeviceImageFormatProperties2KHR is not supported by
+                *    the implementation for use in vkCreateImage, then all members of
+                *    imageFormatProperties will be filled with zero.
+                */
+               base_props->imageFormatProperties = (VkImageFormatProperties) {0};
+       }
+
+       return result;
 }
 
 void radv_GetPhysicalDeviceSparseImageFormatProperties(
@@ -1181,3 +1289,27 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
        /* Sparse images are not yet supported. */
        *pPropertyCount = 0;
 }
+
+void radv_GetPhysicalDeviceExternalBufferPropertiesKHR(
+       VkPhysicalDevice                            physicalDevice,
+       const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo,
+       VkExternalBufferPropertiesKHR               *pExternalBufferProperties)
+{
+       VkExternalMemoryFeatureFlagBitsKHR flags = 0;
+       VkExternalMemoryHandleTypeFlagsKHR export_flags = 0;
+       VkExternalMemoryHandleTypeFlagsKHR compat_flags = 0;
+       switch(pExternalBufferInfo->handleType) {
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
+               flags = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR |
+                       VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
+               compat_flags = export_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;
+               break;
+       default:
+               break;
+       }
+       pExternalBufferProperties->externalMemoryProperties = (VkExternalMemoryPropertiesKHR) {
+               .externalMemoryFeatures = flags,
+               .exportFromImportedHandleTypes = export_flags,
+               .compatibleHandleTypes = compat_flags,
+       };
+}