radv: Add EXT_acquire_xlib_display to radv driver [v2]
[mesa.git] / src / amd / vulkan / radv_formats.c
index 5c79ea74069f847c1e50007fe50d6ec7217e284f..958f2a2c821f0e7e1fe8063b4dbd5bd0697e4d74 100644 (file)
@@ -321,10 +321,8 @@ uint32_t radv_translate_tex_dataformat(VkFormat format,
                        return V_008F14_IMG_DATA_FORMAT_32;
                case 2:
                        return V_008F14_IMG_DATA_FORMAT_32_32;
-#if 0 /* Not supported for render targets */
                case 3:
                        return V_008F14_IMG_DATA_FORMAT_32_32_32;
-#endif
                case 4:
                        return V_008F14_IMG_DATA_FORMAT_32_32_32_32;
                }
@@ -541,6 +539,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 +605,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 +619,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;
@@ -602,13 +636,17 @@ radv_physical_device_get_format_properties(struct radv_physical_device *physical
                                tiled |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT;
                        }
                }
-               if (tiled && util_is_power_of_two(vk_format_get_blocksize(format)) && !scaled) {
+               if (tiled && !scaled) {
                        tiled |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR |
                                 VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR;
                }
+
+               /* Tiled formatting does not support NPOT pixel sizes */
+               if (!util_is_power_of_two_or_zero(vk_format_get_blocksize(format)))
+                       tiled = 0;
        }
 
-       if (linear && util_is_power_of_two(vk_format_get_blocksize(format)) && !scaled) {
+       if (linear && !scaled) {
                linear |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR |
                          VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR;
        }
@@ -619,6 +657,25 @@ radv_physical_device_get_format_properties(struct radv_physical_device *physical
                tiled |= VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT;
        }
 
+       switch(format) {
+       case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
+       case VK_FORMAT_A2B10G10R10_SNORM_PACK32:
+       case VK_FORMAT_A2R10G10B10_SSCALED_PACK32:
+       case VK_FORMAT_A2B10G10R10_SSCALED_PACK32:
+       case VK_FORMAT_A2R10G10B10_SINT_PACK32:
+       case VK_FORMAT_A2B10G10R10_SINT_PACK32:
+               if (physical_device->rad_info.chip_class <= VI &&
+                   physical_device->rad_info.family != CHIP_STONEY) {
+                       buffer &= ~(VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
+                                   VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT);
+                       linear = 0;
+                       tiled = 0;
+               }
+               break;
+       default:
+               break;
+       }
+
        out_properties->linearTilingFeatures = linear;
        out_properties->optimalTilingFeatures = tiled;
        out_properties->bufferFeatures = buffer;
@@ -823,194 +880,87 @@ bool radv_format_pack_clear_color(VkFormat format,
                                  uint32_t clear_vals[2],
                                  VkClearColorValue *value)
 {
-       uint8_t r = 0, g = 0, b = 0, a = 0;
        const struct vk_format_description *desc = vk_format_description(format);
 
-       if (vk_format_get_component_bits(format, VK_FORMAT_COLORSPACE_RGB, 0) <= 8) {
-               if (desc->colorspace == VK_FORMAT_COLORSPACE_RGB) {
-                       r = float_to_ubyte(value->float32[0]);
-                       g = float_to_ubyte(value->float32[1]);
-                       b = float_to_ubyte(value->float32[2]);
-                       a = float_to_ubyte(value->float32[3]);
-               } else if (desc->colorspace == VK_FORMAT_COLORSPACE_SRGB) {
-                       r = util_format_linear_float_to_srgb_8unorm(value->float32[0]);
-                       g = util_format_linear_float_to_srgb_8unorm(value->float32[1]);
-                       b = util_format_linear_float_to_srgb_8unorm(value->float32[2]);
-                       a = float_to_ubyte(value->float32[3]);
-               }
-       }
-       switch (format) {
-       case VK_FORMAT_R8_UNORM:
-       case VK_FORMAT_R8_SRGB:
-               clear_vals[0] = r;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8_UNORM:
-       case VK_FORMAT_R8G8_SRGB:
-               clear_vals[0] = r | g << 8;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8B8A8_SRGB:
-       case VK_FORMAT_R8G8B8A8_UNORM:
-               clear_vals[0] = r | g << 8 | b << 16 | a << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_B8G8R8A8_SRGB:
-       case VK_FORMAT_B8G8R8A8_UNORM:
-               clear_vals[0] = b | g << 8 | r << 16 | a << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_A8B8G8R8_UNORM_PACK32:
-       case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
-               clear_vals[0] = r | g << 8 | b << 16 | a << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8_UINT:
-               clear_vals[0] = value->uint32[0] & 0xff;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8_SINT:
-               clear_vals[0] = value->int32[0] & 0xff;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16_UINT:
-               clear_vals[0] = value->uint32[0] & 0xffff;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8_UINT:
-               clear_vals[0] = value->uint32[0] & 0xff;
-               clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8_SINT:
-               clear_vals[0] = value->int32[0] & 0xff;
-               clear_vals[0] |= (value->int32[1] & 0xff) << 8;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8B8A8_UINT:
-               clear_vals[0] = value->uint32[0] & 0xff;
-               clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
-               clear_vals[0] |= (value->uint32[2] & 0xff) << 16;
-               clear_vals[0] |= (value->uint32[3] & 0xff) << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R8G8B8A8_SINT:
-               clear_vals[0] = value->int32[0] & 0xff;
-               clear_vals[0] |= (value->int32[1] & 0xff) << 8;
-               clear_vals[0] |= (value->int32[2] & 0xff) << 16;
-               clear_vals[0] |= (value->int32[3] & 0xff) << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_A8B8G8R8_UINT_PACK32:
-               clear_vals[0] = value->uint32[0] & 0xff;
-               clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
-               clear_vals[0] |= (value->uint32[2] & 0xff) << 16;
-               clear_vals[0] |= (value->uint32[3] & 0xff) << 24;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16_UINT:
-               clear_vals[0] = value->uint32[0] & 0xffff;
-               clear_vals[0] |= (value->uint32[1] & 0xffff) << 16;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16B16A16_UINT:
-               clear_vals[0] = value->uint32[0] & 0xffff;
-               clear_vals[0] |= (value->uint32[1] & 0xffff) << 16;
-               clear_vals[1] = value->uint32[2] & 0xffff;
-               clear_vals[1] |= (value->uint32[3] & 0xffff) << 16;
-               break;
-       case VK_FORMAT_R32_UINT:
-               clear_vals[0] = value->uint32[0];
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R32G32_UINT:
-               clear_vals[0] = value->uint32[0];
-               clear_vals[1] = value->uint32[1];
-               break;
-       case VK_FORMAT_R32_SINT:
-               clear_vals[0] = value->int32[0];
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16_SFLOAT:
-               clear_vals[0] = util_float_to_half(value->float32[0]);
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16_SFLOAT:
-               clear_vals[0] = util_float_to_half(value->float32[0]);
-               clear_vals[0] |= (uint32_t)util_float_to_half(value->float32[1]) << 16;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16B16A16_SFLOAT:
-               clear_vals[0] = util_float_to_half(value->float32[0]);
-               clear_vals[0] |= (uint32_t)util_float_to_half(value->float32[1]) << 16;
-               clear_vals[1] = util_float_to_half(value->float32[2]);
-               clear_vals[1] |= (uint32_t)util_float_to_half(value->float32[3]) << 16;
-               break;
-       case VK_FORMAT_R16_UNORM:
-               clear_vals[0] = ((uint16_t)util_iround(CLAMP(value->float32[0], 0.0f, 1.0f) * 0xffff)) & 0xffff;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16_UNORM:
-               clear_vals[0] = ((uint16_t)util_iround(CLAMP(value->float32[0], 0.0f, 1.0f) * 0xffff)) & 0xffff;
-               clear_vals[0] |= ((uint16_t)util_iround(CLAMP(value->float32[1], 0.0f, 1.0f) * 0xffff)) << 16;
-               clear_vals[1] = 0;
-               break;
-       case VK_FORMAT_R16G16B16A16_UNORM:
-               clear_vals[0] = ((uint16_t)util_iround(CLAMP(value->float32[0], 0.0f, 1.0f) * 0xffff)) & 0xffff;
-               clear_vals[0] |= ((uint16_t)util_iround(CLAMP(value->float32[1], 0.0f, 1.0f) * 0xffff)) << 16;
-               clear_vals[1] = ((uint16_t)util_iround(CLAMP(value->float32[2], 0.0f, 1.0f) * 0xffff)) & 0xffff;
-               clear_vals[1] |= ((uint16_t)util_iround(CLAMP(value->float32[3], 0.0f, 1.0f) * 0xffff)) << 16;
-               break;
-       case VK_FORMAT_R16G16B16A16_SNORM:
-               clear_vals[0] = ((uint16_t)util_iround(CLAMP(value->float32[0], -1.0f, 1.0f) * 0x7fff)) & 0xffff;
-               clear_vals[0] |= ((uint16_t)util_iround(CLAMP(value->float32[1], -1.0f, 1.0f) * 0x7fff)) << 16;
-               clear_vals[1] = ((uint16_t)util_iround(CLAMP(value->float32[2], -1.0f, 1.0f) * 0x7fff)) & 0xffff;
-               clear_vals[1] |= ((uint16_t)util_iround(CLAMP(value->float32[3], -1.0f, 1.0f) * 0x7fff)) << 16;
-               break;
-       case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
-               clear_vals[0] = ((uint16_t)util_iround(CLAMP(value->float32[0], 0.0f, 1.0f) * 0x3ff)) & 0x3ff;
-               clear_vals[0] |= (((uint16_t)util_iround(CLAMP(value->float32[1], 0.0f, 1.0f) * 0x3ff)) & 0x3ff) << 10;
-               clear_vals[0] |= (((uint16_t)util_iround(CLAMP(value->float32[2], 0.0f, 1.0f) * 0x3ff)) & 0x3ff) << 20;
-               clear_vals[0] |= (((uint16_t)util_iround(CLAMP(value->float32[3], 0.0f, 1.0f) * 0x3)) & 0x3) << 30;
-               clear_vals[1] = 0;
-               return true;
-       case VK_FORMAT_R32G32_SFLOAT:
-               clear_vals[0] = fui(value->float32[0]);
-               clear_vals[1] = fui(value->float32[1]);
-               break;
-       case VK_FORMAT_R32_SFLOAT:
-               clear_vals[1] = 0;
-               clear_vals[0] = fui(value->float32[0]);
-               break;
-       case VK_FORMAT_B10G11R11_UFLOAT_PACK32:
+       if (format == VK_FORMAT_B10G11R11_UFLOAT_PACK32) {
                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;
+               return true;
+       }
+
+       if (desc->layout != VK_FORMAT_LAYOUT_PLAIN) {
+               fprintf(stderr, "failed to fast clear for non-plain format %d\n", format);
+               return false;
+       }
+
+       if (!util_is_power_of_two_or_zero(desc->block.bits)) {
+               fprintf(stderr, "failed to fast clear for NPOT format %d\n", format);
+               return false;
+       }
+
+       if (desc->block.bits > 64) {
+               /*
+                * We have a 128 bits format, check if the first 3 components are the same.
+                * Every elements has to be 32 bits since we don't support 64-bit formats,
+                * and we can skip swizzling checks as alpha always comes last for these and
+                * we do not care about the rest as they have to be the same.
+                */
+               if (desc->channel[0].type == VK_FORMAT_TYPE_FLOAT) {
+                       if (value->float32[0] != value->float32[1] ||
+                           value->float32[0] != value->float32[2])
+                               return false;
+               } else {
+                       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 true;
+       }
+       uint64_t clear_val = 0;
+
+       for (unsigned c = 0; c < 4; ++c) {
+               if (desc->swizzle[c] >= 4)
+                       continue;
+
+               const struct vk_format_channel_description *channel = &desc->channel[desc->swizzle[c]];
+               assert(channel->size);
+
+               uint64_t v = 0;
+               if (channel->pure_integer) {
+                       v = value->uint32[c]  & ((1ULL << channel->size) - 1);
+               } else if (channel->normalized) {
+                       if (channel->type == VK_FORMAT_TYPE_UNSIGNED &&
+                           desc->swizzle[c] < 3 &&
+                           desc->colorspace == VK_FORMAT_COLORSPACE_SRGB) {
+                               assert(channel->size == 8);
+
+                               v = util_format_linear_float_to_srgb_8unorm(value->float32[c]);
+                       } else if (channel->type == VK_FORMAT_TYPE_UNSIGNED) {
+                               v = MAX2(MIN2(value->float32[c], 1.0f), 0.0f) * ((1ULL << channel->size) - 1);
+                       } else  {
+                               v = MAX2(MIN2(value->float32[c], 1.0f), -1.0f) * ((1ULL << (channel->size - 1)) - 1);
+                       }
+               } else if (channel->type == VK_FORMAT_TYPE_FLOAT) {
+                       if (channel->size == 32) {
+                               memcpy(&v, &value->float32[c], 4);
+                       } else if(channel->size == 16) {
+                               v = util_float_to_half(value->float32[c]);
+                       } else {
+                               fprintf(stderr, "failed to fast clear for unhandled float size in format %d\n", format);
+                               return false;
+                       }
+               } else {
+                       fprintf(stderr, "failed to fast clear for unhandled component type in format %d\n", format);
                        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;
+               }
+               clear_val |= (v & ((1ULL << channel->size) - 1)) << channel->shift;
        }
+
+       clear_vals[0] = clear_val;
+       clear_vals[1] = clear_val >> 32;
+
        return true;
 }
 
@@ -1026,7 +976,7 @@ void radv_GetPhysicalDeviceFormatProperties(
                                                   pFormatProperties);
 }
 
-void radv_GetPhysicalDeviceFormatProperties2KHR(
+void radv_GetPhysicalDeviceFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        VkFormat                                    format,
        VkFormatProperties2KHR*                         pFormatProperties)
@@ -1063,6 +1013,9 @@ static VkResult radv_get_image_format_properties(struct radv_physical_device *ph
        if (format_feature_flags == 0)
                goto unsupported;
 
+       if (info->type != VK_IMAGE_TYPE_2D && vk_format_is_depth_or_stencil(info->format))
+               goto unsupported;
+
        switch (info->type) {
        default:
                unreachable("bad vkimage type\n");
@@ -1174,15 +1127,28 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties(
 
 static void
 get_external_image_format_properties(const VkPhysicalDeviceImageFormatInfo2KHR *pImageFormatInfo,
+                                    VkExternalMemoryHandleTypeFlagBitsKHR handleType,
                                     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;
+       switch (handleType) {
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
+               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 |
+                                                     VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
+               flags = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
+               compat_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT;
                break;
        default:
                break;
@@ -1195,7 +1161,7 @@ get_external_image_format_properties(const VkPhysicalDeviceImageFormatInfo2KHR *
        };
 }
 
-VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
+VkResult radv_GetPhysicalDeviceImageFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceImageFormatInfo2KHR  *base_info,
        VkImageFormatProperties2KHR                *base_props)
@@ -1241,7 +1207,10 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
        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);
+               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
+               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
+                       get_external_image_format_properties(base_info, external_info->handleType,
+                                                            &external_props->externalMemoryProperties);
                        break;
                default:
                        /* From the Vulkan 1.0.42 spec:
@@ -1251,7 +1220,7 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
                         *    vkGetPhysicalDeviceImageFormatProperties2KHR returns
                         *    VK_ERROR_FORMAT_NOT_SUPPORTED.
                         */
-                       result = vk_errorf(VK_ERROR_FORMAT_NOT_SUPPORTED,
+                       result = vk_errorf(physical_device->instance, VK_ERROR_FORMAT_NOT_SUPPORTED,
                                           "unsupported VkExternalMemoryTypeFlagBitsKHR 0x%x",
                                           external_info->handleType);
                        goto fail;
@@ -1289,7 +1258,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties(
        *pNumProperties = 0;
 }
 
-void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
+void radv_GetPhysicalDeviceSparseImageFormatProperties2(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
        uint32_t                                   *pPropertyCount,
@@ -1299,7 +1268,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
        *pPropertyCount = 0;
 }
 
-void radv_GetPhysicalDeviceExternalBufferPropertiesKHR(
+void radv_GetPhysicalDeviceExternalBufferProperties(
        VkPhysicalDevice                            physicalDevice,
        const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo,
        VkExternalBufferPropertiesKHR               *pExternalBufferProperties)
@@ -1309,9 +1278,15 @@ void radv_GetPhysicalDeviceExternalBufferPropertiesKHR(
        VkExternalMemoryHandleTypeFlagsKHR compat_flags = 0;
        switch(pExternalBufferInfo->handleType) {
        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
                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;
+               compat_flags = export_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR |
+                                             VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
+               break;
+       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
+               flags = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
+               compat_flags = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT;
                break;
        default:
                break;