radv: When importing an image, redo the layout based on the metadata.

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

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index d36f9a188d66e1297d9c4c3a76e8368ec561e29d..fd28343638d6409c79581ec275558f2bf94bf7c8 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -5079,6 +5079,26 @@ static VkResult radv_alloc_memory(struct radv_device *device,
                } else {
                        close(import_info->fd);
                }
+
+               if (mem->image && mem->image->plane_count == 1 &&
+                   !vk_format_is_depth_or_stencil(mem->image->vk_format)) {
+                       struct radeon_bo_metadata metadata;
+                       device->ws->buffer_get_metadata(mem->bo, &metadata);
+
+                       struct radv_image_create_info create_info = {
+                               .no_metadata_planes = true,
+                               .bo_metadata = &metadata
+                       };
+
+                       /* This gives a basic ability to import radeonsi images
+                        * that don't have DCC. This is not guaranteed by any
+                        * spec and can be removed after we support modifiers. */
+                       result = radv_image_create_layout(device, create_info, mem->image);
+                       if (result != VK_SUCCESS) {
+                               device->ws->buffer_destroy(mem->bo);
+                               goto fail;
+                       }
+               }
        } else if (host_ptr_info) {
                assert(host_ptr_info->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT);
                mem->bo = device->ws->buffer_from_ptr(device->ws, host_ptr_info->pHostPointer,