From 51f3855cc4bd2b6402fd033bcceb6ff148cac09f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 16 Feb 2021 17:28:12 +0100 Subject: [PATCH] radv: only emit pipeline bind markers for application pipelines We don't want to emit markers for internal operations. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/layers/radv_sqtt_layer.c | 13 ++++++++++--- src/amd/vulkan/radv_private.h | 3 --- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 81214e921e6..f10b407e797 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -320,7 +320,7 @@ radv_describe_layout_transition(struct radv_cmd_buffer *cmd_buffer, cmd_buffer->state.num_layout_transitions++; } -void +static void radv_describe_pipeline_bind(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoint pipelineBindPoint, struct radv_pipeline *pipeline) @@ -329,6 +329,9 @@ radv_describe_pipeline_bind(struct radv_cmd_buffer *cmd_buffer, struct radeon_cmdbuf *cs = cmd_buffer->cs; uint64_t pipeline_idx = (uintptr_t)pipeline; + // TODO: Enable when PSO records & friends are dumped. + return; + if (likely(!cmd_buffer->device->thread_trace.bo)) return; @@ -710,9 +713,13 @@ void sqtt_CmdCopyQueryPoolResults( void sqtt_CmdBindPipeline( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, - VkPipeline pipeline) + VkPipeline _pipeline) { - API_MARKER(BindPipeline, commandBuffer, pipelineBindPoint, pipeline); + RADV_FROM_HANDLE(radv_pipeline, pipeline, _pipeline); + + API_MARKER(BindPipeline, commandBuffer, pipelineBindPoint, _pipeline); + + radv_describe_pipeline_bind(cmd_buffer, pipelineBindPoint, pipeline); } void sqtt_CmdBindDescriptorSets( diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 9ead1ef5282..125bf333f27 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -2601,9 +2601,6 @@ void radv_describe_barrier_end(struct radv_cmd_buffer *cmd_buffer); void radv_describe_barrier_end_delayed(struct radv_cmd_buffer *cmd_buffer); void radv_describe_layout_transition(struct radv_cmd_buffer *cmd_buffer, const struct radv_barrier_data *barrier); -void radv_describe_pipeline_bind(struct radv_cmd_buffer *cmd_buffer, - VkPipelineBindPoint pipelineBindPoint, - struct radv_pipeline *pipeline); struct radeon_winsys_sem;