From 9da3d714b87ce237cf61de4403c5b6af12f1d79d Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 30 Jan 2022 14:41:00 +0200 Subject: [PATCH] anv: add dynamic rendering traces v2: Get rid of subpass_count Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: --- src/intel/ds/intel_tracepoints.py | 8 ++++++++ src/intel/vulkan/genX_cmd_buffer.c | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/intel/ds/intel_tracepoints.py b/src/intel/ds/intel_tracepoints.py index 42205a8e2cb..991c0fb347e 100644 --- a/src/intel/ds/intel_tracepoints.py +++ b/src/intel/ds/intel_tracepoints.py @@ -64,6 +64,14 @@ def define_tracepoints(args): Arg(type='uint8_t', var='msaa', c_format='%hhu'), Arg(type='uint32_t', var='subpass_count', c_format='%u'),]) + begin_end_tp('dyn_render_pass', + tp_args=[Arg(type='uint16_t', var='width', c_format='%hu'), + Arg(type='uint16_t', var='height', c_format='%hu'), + Arg(type='uint8_t', var='att_count', c_format='%hhu'), + Arg(type='uint8_t', var='msaa', c_format='%hhu'), + Arg(type='uint8_t', var='suspend', c_format='%hhu'), + Arg(type='uint8_t', var='resume', c_format='%hhu'),]) + begin_end_tp('blorp', tp_args=[Arg(type='uint32_t', name='width', var='width', c_format='%u'), Arg(type='uint32_t', name='height', var='height', c_format='%u'), diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 4ceaa2efc76..9e52f749ac4 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -7588,6 +7588,8 @@ void genX(CmdBeginRenderingKHR)( ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); VkResult result; + trace_intel_begin_dyn_render_pass(&cmd_buffer->trace, cmd_buffer); + cmd_buffer->state.framebuffer = &cmd_buffer->state.dynamic_render_pass.framebuffer; setup_dynamic_framebuffer(cmd_buffer->state.framebuffer, pRenderingInfo); @@ -7619,6 +7621,15 @@ void genX(CmdEndRenderingKHR)( cmd_buffer_end_rendering(cmd_buffer); + trace_intel_end_dyn_render_pass(&cmd_buffer->trace, cmd_buffer, + cmd_buffer->state.render_area.extent.width, + cmd_buffer->state.render_area.extent.height, + cmd_buffer->state.pass->attachment_count, + cmd_buffer->state.pass->attachment_count > 0 ? + cmd_buffer->state.pass->attachments[0].samples : 0, + cmd_buffer->state.dynamic_render_pass.suspending, + cmd_buffer->state.dynamic_render_pass.resuming); + cmd_buffer->state.framebuffer = NULL; cmd_buffer->state.pass = NULL; cmd_buffer->state.subpass = NULL;