diff options
| author | Samuel Pitoiset <[email protected]> | 2017-09-11 17:52:24 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-09-11 21:56:58 +0200 |
| commit | fcab014f7ddfd660814bc4b4d18d25e8c0375b54 (patch) | |
| tree | 5b805191d853d39dfec665dc758a253f54c902e7 /src | |
| parent | 310fca375c13c52fbcb11cab148ca1bf0ddd2f69 (diff) | |
radv: do not pass a pipeline object to radv_emit_graphics_pipeline()
To be consistent with radv_emit_compute_pipeline().
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 532781bd0c8..c2e93d352c0 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -861,9 +861,10 @@ static void polaris_set_vgt_vertex_reuse(struct radv_cmd_buffer *cmd_buffer, } static void -radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer, - struct radv_pipeline *pipeline) +radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) { + struct radv_pipeline *pipeline = cmd_buffer->state.pipeline; + if (!pipeline || cmd_buffer->state.emitted_pipeline == pipeline) return; @@ -1610,7 +1611,6 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer, bool indirect_draw, uint32_t draw_vertex_count) { - struct radv_pipeline *pipeline = cmd_buffer->state.pipeline; uint32_t ia_multi_vgt_param; MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, @@ -1620,7 +1620,7 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer, return; if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PIPELINE) - radv_emit_graphics_pipeline(cmd_buffer, pipeline); + radv_emit_graphics_pipeline(cmd_buffer); if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_RENDER_TARGETS) radv_emit_framebuffer_state(cmd_buffer); |