Mesa (master): radv: be smarter with pipelines when emitting secondary buffers

[Samuel Pitoiset]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Oct 11 15:54:40 2017 +0200

radv: be smarter with pipelines when emitting secondary buffers

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 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 397f0db26c..b01f1ee7ef 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;
 	}