radv: gather info about PS inputs in the shader info pass

[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 d1cfda5dc48c170ce1eb5291dfd0ad8213f06215..ea3d26c8d4c83cdabac4b3a419093eef8ada7ec5 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -330,10 +330,12 @@ enum radv_resolve_method {
        RESOLVE_FRAGMENT,
 };
 
-static void radv_pick_resolve_method_images(struct radv_image *src_image,
+static void radv_pick_resolve_method_images(struct radv_device *device,
+                                           struct radv_image *src_image,
                                            VkFormat src_format,
                                            struct radv_image *dest_image,
                                            VkImageLayout dest_image_layout,
+                                           bool dest_render_loop,
                                            struct radv_cmd_buffer *cmd_buffer,
                                            enum radv_resolve_method *method)
 
@@ -352,7 +354,8 @@ static void radv_pick_resolve_method_images(struct radv_image *src_image,
                         dest_image->info.array_size > 1)
                        *method = RESOLVE_COMPUTE;
        
-               if (radv_layout_dcc_compressed(dest_image, dest_image_layout, queue_mask)) {
+               if (radv_layout_dcc_compressed(device, dest_image, dest_image_layout,
+                                              dest_render_loop, queue_mask)) {
                        *method = RESOLVE_FRAGMENT;
                } else if (dest_image->planes[0].surface.micro_tile_mode !=
                           src_image->planes[0].surface.micro_tile_mode) {
@@ -431,9 +434,10 @@ void radv_CmdResolveImage(
        } else
                resolve_method = RESOLVE_COMPUTE;
 
-       radv_pick_resolve_method_images(src_image, src_image->vk_format,
-                                       dest_image, dest_image_layout,
-                                       cmd_buffer, &resolve_method);
+       radv_pick_resolve_method_images(cmd_buffer->device, src_image,
+                                       src_image->vk_format, dest_image,
+                                       dest_image_layout, false, cmd_buffer,
+                                       &resolve_method);
 
        if (resolve_method == RESOLVE_FRAGMENT) {
                radv_meta_resolve_fragment_image(cmd_buffer,
@@ -549,7 +553,7 @@ void radv_CmdResolveImage(
                                                             .baseArrayLayer = src_base_layer + layer,
                                                             .layerCount = 1,
                                                     },
-                                            });
+                                            }, NULL);
 
                        struct radv_image_view dest_iview;
                        radv_image_view_init(&dest_iview, cmd_buffer->device,
@@ -565,7 +569,7 @@ void radv_CmdResolveImage(
                                                             .baseArrayLayer = dest_base_layer + layer,
                                                             .layerCount = 1,
                                                     },
-                                             });
+                                             }, NULL);
 
                        VkFramebuffer fb_h;
                        radv_CreateFramebuffer(device_h,
@@ -641,14 +645,16 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
                struct radv_subpass_attachment src_att = *subpass->depth_stencil_attachment;
                struct radv_subpass_attachment dst_att = *subpass->ds_resolve_attachment;
                struct radv_image_view *src_iview =
-                       cmd_buffer->state.framebuffer->attachments[src_att.attachment].attachment;
+                       cmd_buffer->state.attachments[src_att.attachment].iview;
                struct radv_image_view *dst_iview =
-                       cmd_buffer->state.framebuffer->attachments[dst_att.attachment].attachment;
+                       cmd_buffer->state.attachments[dst_att.attachment].iview;
 
-               radv_pick_resolve_method_images(src_iview->image,
+               radv_pick_resolve_method_images(cmd_buffer->device,
+                                               src_iview->image,
                                                src_iview->vk_format,
                                                dst_iview->image,
                                                dst_att.layout,
+                                               dst_att.in_render_loop,
                                                cmd_buffer,
                                                &resolve_method);
 
@@ -694,12 +700,14 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
                /* Make sure to not clear color attachments after resolves. */
                cmd_buffer->state.attachments[dest_att.attachment].pending_clear_aspects = 0;
 
-               struct radv_image *dst_img = cmd_buffer->state.framebuffer->attachments[dest_att.attachment].attachment->image;
-               struct radv_image_view *src_iview= cmd_buffer->state.framebuffer->attachments[src_att.attachment].attachment;
+               struct radv_image *dst_img = cmd_buffer->state.attachments[dest_att.attachment].iview->image;
+               struct radv_image_view *src_iview= cmd_buffer->state.attachments[src_att.attachment].iview;
                struct radv_image *src_img = src_iview->image;
 
-               radv_pick_resolve_method_images(src_img, src_iview->vk_format,
-                                               dst_img, dest_att.layout,
+               radv_pick_resolve_method_images(cmd_buffer->device, src_img,
+                                               src_iview->vk_format, dst_img,
+                                               dest_att.layout,
+                                               dest_att.in_render_loop,
                                                cmd_buffer, &resolve_method);
 
                if (resolve_method == RESOLVE_FRAGMENT) {
@@ -725,7 +733,7 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
                if (dest_att.attachment == VK_ATTACHMENT_UNUSED)
                        continue;
 
-               struct radv_image_view *dest_iview = cmd_buffer->state.framebuffer->attachments[dest_att.attachment].attachment;
+               struct radv_image_view *dest_iview = cmd_buffer->state.attachments[dest_att.attachment].iview;
                struct radv_image *dst_img = dest_iview->image;
 
                if (radv_dcc_enabled(dst_img, dest_iview->base_mip)) {
@@ -787,8 +795,7 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
                if (dest_att.attachment == VK_ATTACHMENT_UNUSED)
                        continue;
 
-               struct radv_image_view *src_iview =
-                       fb->attachments[src_att.attachment].attachment;
+               struct radv_image_view *src_iview = cmd_buffer->state.attachments[src_att.attachment].iview;
                struct radv_image *src_image = src_iview->image;
 
                VkImageResolve region = {};
@@ -803,8 +810,7 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
 
        if (subpass->ds_resolve_attachment) {
                struct radv_subpass_attachment src_att = *subpass->depth_stencil_attachment;
-               struct radv_image_view *src_iview =
-                       fb->attachments[src_att.attachment].attachment;
+               struct radv_image_view *src_iview = fb->attachments[src_att.attachment];
                struct radv_image *src_image = src_iview->image;
 
                VkImageResolve region = {};
@@ -818,6 +824,20 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
        }
 }
 
+static struct radv_sample_locations_state *
+radv_get_resolve_sample_locations(struct radv_cmd_buffer *cmd_buffer)
+{
+       struct radv_cmd_state *state = &cmd_buffer->state;
+       uint32_t subpass_id = radv_get_subpass_id(cmd_buffer);
+
+       for (uint32_t i = 0; i < state->num_subpass_sample_locs; i++) {
+               if (state->subpass_sample_locs[i].subpass_idx == subpass_id)
+                       return &state->subpass_sample_locs[i].sample_location;
+       }
+
+       return NULL;
+}
+
 /**
  * Decompress CMask/FMask before resolving a multisampled source image.
  */
@@ -848,6 +868,22 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
                        .layerCount = region->srcSubresource.layerCount,
                };
 
+               if (src_image->flags & VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT) {
+                       /* If the depth/stencil image uses different sample
+                        * locations, we need them during HTILE decompressions.
+                        */
+                       struct radv_sample_locations_state *sample_locs =
+                               radv_get_resolve_sample_locations(cmd_buffer);
+
+                       barrier.pNext = &(VkSampleLocationsInfoEXT) {
+                               .sType = VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT,
+                               .sampleLocationsPerPixel = sample_locs->per_pixel,
+                               .sampleLocationGridSize = sample_locs->grid_size,
+                               .sampleLocationsCount = sample_locs->count,
+                               .pSampleLocations = sample_locs->locations,
+                       };
+               }
+
                radv_CmdPipelineBarrier(radv_cmd_buffer_to_handle(cmd_buffer),
                                        VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
                                        VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,