commit f8476769902b6c39eafb517d4412e3e52d46147b
author Dave Airlie <airlied@redhat.com> Mon Nov 28 00:33:39 2016 +0000
committer Dave Airlie <airlied@redhat.com> Wed Dec 07 23:25:15 2016 +0000
tree bed74f4a79633ad4f713236169609a1351479cff
parent eb2ba5c8df2149f92298e090508f1193026811a9

radv: pass pipeline to constant flush function

I'll need this later rather than just the layout.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>

src/amd/vulkan/radv_cmd_buffer.c

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index ea5b62e..89eef57 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -896,8 +896,10 @@
 
 static void
 radv_flush_constants(struct radv_cmd_buffer *cmd_buffer,
-		     struct radv_pipeline_layout *layout,
-		     VkShaderStageFlags stages) {
+		     struct radv_pipeline *pipeline,
+		     VkShaderStageFlags stages)
+{
+	struct radv_pipeline_layout *layout = pipeline->layout;
 	unsigned offset;
 	void *ptr;
 	uint64_t va;
@@ -1026,7 +1028,7 @@
 
 	radv_cmd_buffer_flush_dynamic_state(cmd_buffer);
 
-	radv_flush_constants(cmd_buffer, cmd_buffer->state.pipeline->layout,
+	radv_flush_constants(cmd_buffer, cmd_buffer->state.pipeline,
 			     VK_SHADER_STAGE_ALL_GRAPHICS);
 
 	assert(cmd_buffer->cs->cdw <= cdw_max);
@@ -2005,7 +2007,7 @@
 radv_flush_compute_state(struct radv_cmd_buffer *cmd_buffer)
 {
 	radv_emit_compute_pipeline(cmd_buffer);
-	radv_flush_constants(cmd_buffer, cmd_buffer->state.compute_pipeline->layout,
+	radv_flush_constants(cmd_buffer, cmd_buffer->state.compute_pipeline,
 			     VK_SHADER_STAGE_COMPUTE_BIT);
 	si_emit_cache_flush(cmd_buffer);
 }