Module: Mesa
Branch: master
Commit: 8f9f62c2db85a7fe394265154bce4c189eb295b1
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f9f62c2db85a7fe394265154bce4c189eb295b1

Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Date:   Thu Apr  5 11:34:57 2018 +0200

radv: don't pass the pipeline to radv_flush_constants()

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_cmd_buffer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 230b3e6f54..d9f12a351e 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -1438,9 +1438,11 @@ radv_flush_descriptors(struct radv_cmd_buffer 
*cmd_buffer,
 
 static void
 radv_flush_constants(struct radv_cmd_buffer *cmd_buffer,
-                    struct radv_pipeline *pipeline,
                     VkShaderStageFlags stages)
 {
+       struct radv_pipeline *pipeline = stages & VK_SHADER_STAGE_COMPUTE_BIT
+                                        ? cmd_buffer->state.compute_pipeline
+                                        : cmd_buffer->state.pipeline;
        struct radv_pipeline_layout *layout = pipeline->layout;
        unsigned offset;
        void *ptr;
@@ -1535,8 +1537,7 @@ radv_upload_graphics_shader_descriptors(struct 
radv_cmd_buffer *cmd_buffer, bool
 {
        radv_flush_vertex_descriptors(cmd_buffer, pipeline_is_dirty);
        radv_flush_descriptors(cmd_buffer, VK_SHADER_STAGE_ALL_GRAPHICS);
-       radv_flush_constants(cmd_buffer, cmd_buffer->state.pipeline,
-                            VK_SHADER_STAGE_ALL_GRAPHICS);
+       radv_flush_constants(cmd_buffer, VK_SHADER_STAGE_ALL_GRAPHICS);
 }
 
 static void
@@ -3392,8 +3393,7 @@ static void
 radv_upload_compute_shader_descriptors(struct radv_cmd_buffer *cmd_buffer)
 {
        radv_flush_descriptors(cmd_buffer, VK_SHADER_STAGE_COMPUTE_BIT);
-       radv_flush_constants(cmd_buffer, cmd_buffer->state.compute_pipeline,
-                            VK_SHADER_STAGE_COMPUTE_BIT);
+       radv_flush_constants(cmd_buffer, VK_SHADER_STAGE_COMPUTE_BIT);
 }
 
 static void

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

Reply via email to