radv: Make fs key exemplars ordered to be a reverse fs_key lookup.

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

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index e932976df280ebdffe9edb8dc3c77dc8ae3c581b..30fed97441478ceebfc597b429d39721a15e72c1 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -251,21 +251,6 @@ radv_device_finish_meta_resolve_state(struct radv_device *device)
 
 }
 
-static VkFormat pipeline_formats[] = {
-       VK_FORMAT_R8G8B8A8_UNORM,
-       VK_FORMAT_R8G8B8A8_UINT,
-       VK_FORMAT_R8G8B8A8_SINT,
-       VK_FORMAT_A2R10G10B10_UINT_PACK32,
-       VK_FORMAT_A2R10G10B10_SINT_PACK32,
-       VK_FORMAT_R16G16B16A16_UNORM,
-       VK_FORMAT_R16G16B16A16_SNORM,
-       VK_FORMAT_R16G16B16A16_UINT,
-       VK_FORMAT_R16G16B16A16_SINT,
-       VK_FORMAT_R32_SFLOAT,
-       VK_FORMAT_R32G32_SFLOAT,
-       VK_FORMAT_R32G32B32A32_SFLOAT
-};
-
 VkResult
 radv_device_init_meta_resolve_state(struct radv_device *device)
 {
@@ -278,8 +263,8 @@ radv_device_init_meta_resolve_state(struct radv_device *device)
                goto fail;
        }
 
-       for (uint32_t i = 0; i < ARRAY_SIZE(pipeline_formats); ++i) {
-               VkFormat format = pipeline_formats[i];
+       for (uint32_t i = 0; i < NUM_META_FS_KEYS; ++i) {
+               VkFormat format = radv_fs_key_format_exemplars[i];
                unsigned fs_key = radv_format_meta_fs_key(format);
                res = create_pass(device, format, &state->resolve.pass[fs_key]);
                if (res != VK_SUCCESS)
@@ -358,6 +343,8 @@ static void radv_pick_resolve_method_images(struct radv_image *src_image,
                *method = RESOLVE_COMPUTE;
        else if (vk_format_is_int(src_image->vk_format))
                *method = RESOLVE_COMPUTE;
+       else if (src_image->info.array_size > 1)
+               *method = RESOLVE_COMPUTE;
        
        if (radv_layout_dcc_compressed(dest_image, dest_image_layout, queue_mask)) {
                *method = RESOLVE_FRAGMENT;
@@ -611,8 +598,8 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
                return;
 
        for (uint32_t i = 0; i < subpass->color_count; ++i) {
-               VkAttachmentReference src_att = subpass->color_attachments[i];
-               VkAttachmentReference dest_att = subpass->resolve_attachments[i];
+               struct radv_subpass_attachment src_att = subpass->color_attachments[i];
+               struct radv_subpass_attachment dest_att = subpass->resolve_attachments[i];
 
                if (src_att.attachment == VK_ATTACHMENT_UNUSED ||
                    dest_att.attachment == VK_ATTACHMENT_UNUSED)
@@ -639,8 +626,8 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
                       RADV_META_SAVE_GRAPHICS_PIPELINE);
 
        for (uint32_t i = 0; i < subpass->color_count; ++i) {
-               VkAttachmentReference src_att = subpass->color_attachments[i];
-               VkAttachmentReference dest_att = subpass->resolve_attachments[i];
+               struct radv_subpass_attachment src_att = subpass->color_attachments[i];
+               struct radv_subpass_attachment dest_att = subpass->resolve_attachments[i];
 
                if (src_att.attachment == VK_ATTACHMENT_UNUSED ||
                    dest_att.attachment == VK_ATTACHMENT_UNUSED)
@@ -655,7 +642,7 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
 
                struct radv_subpass resolve_subpass = {
                        .color_count = 2,
-                       .color_attachments = (VkAttachmentReference[]) { src_att, dest_att },
+                       .color_attachments = (struct radv_subpass_attachment[]) { src_att, dest_att },
                        .depth_stencil_attachment = { .attachment = VK_ATTACHMENT_UNUSED },
                };
 
@@ -670,3 +657,71 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
        cmd_buffer->state.subpass = subpass;
        radv_meta_restore(&saved_state, cmd_buffer);
 }
+
+/**
+ * Decompress CMask/FMask before resolving a multisampled source image inside a
+ * subpass.
+ */
+void
+radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
+{
+       const struct radv_subpass *subpass = cmd_buffer->state.subpass;
+       struct radv_framebuffer *fb = cmd_buffer->state.framebuffer;
+
+       for (uint32_t i = 0; i < subpass->color_count; ++i) {
+               struct radv_subpass_attachment src_att = subpass->color_attachments[i];
+               struct radv_subpass_attachment dest_att = subpass->resolve_attachments[i];
+
+               if (src_att.attachment == VK_ATTACHMENT_UNUSED ||
+                   dest_att.attachment == VK_ATTACHMENT_UNUSED)
+                       continue;
+
+               struct radv_image *src_image =
+                       fb->attachments[src_att.attachment].attachment->image;
+
+               VkImageResolve region = {};
+               region.srcSubresource.baseArrayLayer = 0;
+               region.srcSubresource.mipLevel = 0;
+               region.srcSubresource.layerCount = src_image->info.array_size;
+
+               radv_decompress_resolve_src(cmd_buffer, src_image,
+                                           src_att.layout, 1, &region);
+       }
+}
+
+/**
+ * Decompress CMask/FMask before resolving a multisampled source image.
+ */
+void
+radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
+                           struct radv_image *src_image,
+                           VkImageLayout src_image_layout,
+                           uint32_t region_count,
+                           const VkImageResolve *regions)
+{
+       for (uint32_t r = 0; r < region_count; ++r) {
+               const VkImageResolve *region = &regions[r];
+               const uint32_t src_base_layer =
+                       radv_meta_get_iview_layer(src_image, &region->srcSubresource,
+                                                 &region->srcOffset);
+               VkImageSubresourceRange range;
+               range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+               range.baseMipLevel = region->srcSubresource.mipLevel;
+               range.levelCount = 1;
+               range.baseArrayLayer = src_base_layer;
+               range.layerCount = region->srcSubresource.layerCount;
+
+               uint32_t queue_mask =
+                       radv_image_queue_family_mask(src_image,
+                                                    cmd_buffer->queue_family_index,
+                                                    cmd_buffer->queue_family_index);
+
+               if (radv_layout_dcc_compressed(src_image, src_image_layout,
+                                              queue_mask)) {
+                       radv_decompress_dcc(cmd_buffer, src_image, &range);
+               } else {
+                       radv_fast_clear_flush_image_inplace(cmd_buffer,
+                                                           src_image, &range);
+               }
+       }
+}