[Mesa-dev] [PATCH 16/19] radv: select the pipeline outside of emit_fast_clear_flush()

[Samuel Pitoiset]

It can't change during the decompression pass.

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 src/amd/vulkan/radv_meta_fast_clear.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_fast_clear.c 
b/src/amd/vulkan/radv_meta_fast_clear.c
index 2371a6dc6f..29de159dae 100644
--- a/src/amd/vulkan/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/radv_meta_fast_clear.c
@@ -296,21 +296,13 @@ cleanup:
 static void
 emit_fast_clear_flush(struct radv_cmd_buffer *cmd_buffer,
                      const VkExtent2D *resolve_extent,
-                     bool fmask_decompress)
+                     VkPipeline pipeline)
 {
-       struct radv_device *device = cmd_buffer->device;
        VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
 
-       VkPipeline pipeline_h;
-       if (fmask_decompress)
-               pipeline_h = 
device->meta_state.fast_clear_flush.fmask_decompress_pipeline;
-       else
-               pipeline_h = 
device->meta_state.fast_clear_flush.cmask_eliminate_pipeline;
-       RADV_FROM_HANDLE(radv_pipeline, pipeline, pipeline_h);
-
-       if (cmd_buffer->state.pipeline != pipeline) {
+       if (cmd_buffer->state.pipeline != radv_pipeline_from_handle(pipeline)) {
                radv_CmdBindPipeline(cmd_buffer_h, 
VK_PIPELINE_BIND_POINT_GRAPHICS,
-                                    pipeline_h);
+                                    pipeline);
        }
 
        radv_CmdSetViewport(radv_cmd_buffer_to_handle(cmd_buffer), 0, 1, 
&(VkViewport) {
@@ -358,6 +350,7 @@ radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer 
*cmd_buffer,
        VkDevice device_h = radv_device_to_handle(cmd_buffer->device);
        VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
        uint32_t layer_count = radv_get_layerCount(image, subresourceRange);
+       VkPipeline pipeline;
 
        assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL);
        radv_meta_save_pass(&saved_pass_state, cmd_buffer);
@@ -366,6 +359,12 @@ radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer 
*cmd_buffer,
        if (!image->cmask.size && !image->fmask.size && !image->dcc_offset)
                return;
 
+       if (image->fmask.size) {
+               pipeline = 
cmd_buffer->device->meta_state.fast_clear_flush.fmask_decompress_pipeline;
+       } else {
+               pipeline = 
cmd_buffer->device->meta_state.fast_clear_flush.cmask_eliminate_pipeline;
+       }
+
        if (image->surface.dcc_size) {
                radv_emit_set_predication_state_from_image(cmd_buffer, image, 
true);
                cmd_buffer->state.predicating = true;
@@ -425,7 +424,7 @@ radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer 
*cmd_buffer,
 
                emit_fast_clear_flush(cmd_buffer,
                                      &(VkExtent2D) { image->info.width, 
image->info.height },
-                                     image->fmask.size > 0);
+                                     pipeline);
                radv_CmdEndRenderPass(cmd_buffer_h);
 
                radv_DestroyFramebuffer(device_h, fb_h,
-- 
2.14.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev