From 4e65b4ea4b28642dbf15e562cd7c845c060a0f0e Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 11 Oct 2017 15:54:40 +0200 Subject: [PATCH] radv: be smarter with pipelines when emitting secondary buffers Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_cmd_buffer.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 397f0db26c0..b01f1ee7efa 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2650,8 +2650,23 @@ void radv_CmdExecuteCommands( } primary->device->ws->cs_execute_secondary(primary->cs, secondary->cs); - primary->state.emitted_pipeline = secondary->state.emitted_pipeline; - primary->state.emitted_compute_pipeline = secondary->state.emitted_compute_pipeline; + + /* When the secondary command buffer is compute only we don't + * need to re-emit the current graphics pipeline. + */ + if (secondary->state.emitted_pipeline) { + primary->state.emitted_pipeline = + secondary->state.emitted_pipeline; + } + + /* When the secondary command buffer is graphics only we don't + * need to re-emit the current compute pipeline. + */ + if (secondary->state.emitted_compute_pipeline) { + primary->state.emitted_compute_pipeline = + secondary->state.emitted_compute_pipeline; + } + primary->state.last_primitive_reset_en = secondary->state.last_primitive_reset_en; primary->state.last_primitive_reset_index = secondary->state.last_primitive_reset_index; } -- 2.30.2