Mesa (master): radv: add the trace BO to the BO list at submit time

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Feb 20 13:19:41 2020 +0100

radv: add the trace BO to the BO list at submit time

Instead of adding it in every command buffer.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3891>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3891>

---

 src/amd/vulkan/radv_cmd_buffer.c | 8 +-------
 src/amd/vulkan/radv_device.c     | 3 +++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 66c7d0721ba..b4fe37824b1 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -3433,14 +3433,8 @@ VkResult radv_BeginCommandBuffer(
 		radv_cmd_buffer_set_subpass(cmd_buffer, subpass);
 	}
 
-	if (unlikely(cmd_buffer->device->trace_bo)) {
-		struct radv_device *device = cmd_buffer->device;
-
-		radv_cs_add_buffer(device->ws, cmd_buffer->cs,
-				   device->trace_bo);
-
+	if (unlikely(cmd_buffer->device->trace_bo))
 		radv_cmd_buffer_trace_emit(cmd_buffer);
-	}
 
 	cmd_buffer->status = RADV_CMD_BUFFER_STATUS_RECORDING;
 
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 348104a186c..c9947592dd7 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3899,6 +3899,9 @@ radv_get_preamble_cs(struct radv_queue *queue,
 		if (gds_oa_bo)
 			radv_cs_add_buffer(queue->device->ws, cs, gds_oa_bo);
 
+		if (queue->device->trace_bo)
+			radv_cs_add_buffer(queue->device->ws, cs, queue->device->trace_bo);
+
 		if (i == 0) {
 			si_cs_emit_cache_flush(cs,
 			                       queue->device->physical_device->rad_info.chip_class,