Module: Mesa Branch: staging/22.2 Commit: ab947b5778426254454e01f71a1d48d8803b7e64 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab947b5778426254454e01f71a1d48d8803b7e64
Author: Lionel Landwerlin <[email protected]> Date: Fri Jul 1 10:49:15 2022 +0300 anv: add missing tracepoint Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: 3501a3f9ed92 ("anv: Convert to 100% dynamic rendering") Reviewed-by: Ivan Briano <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17467> (cherry picked from commit b12d95f5132f0899cd77d4c5f4ac656261b5e76b) Conflicts: src/intel/vulkan/genX_cmd_buffer.c --- .pick_status.json | 2 +- src/intel/ds/intel_tracepoints.py | 3 +-- src/intel/vulkan/genX_cmd_buffer.c | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0a97f090f3f..f7d6d52cfb4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9940,7 +9940,7 @@ "description": "anv: add missing tracepoint", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3501a3f9ed92831ed039f0d54bf295af41ed0195" }, diff --git a/src/intel/ds/intel_tracepoints.py b/src/intel/ds/intel_tracepoints.py index 6efcb7ba48c..9085cc3de89 100644 --- a/src/intel/ds/intel_tracepoints.py +++ b/src/intel/ds/intel_tracepoints.py @@ -61,8 +61,7 @@ def define_tracepoints(args): 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='uint32_t', var='subpass_count', c_format='%u'),]) + Arg(type='uint8_t', var='msaa', c_format='%hhu'),]) begin_end_tp('dyn_render_pass', tp_args=[Arg(type='uint16_t', var='width', c_format='%hu'), diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 240630d8412..e2cc788a283 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -7182,6 +7182,12 @@ void genX(CmdEndRendering)( } #endif + trace_intel_end_render_pass(&cmd_buffer->trace, + gfx->render_area.extent.width, + gfx->render_area.extent.height, + gfx->color_att_count, + gfx->samples); + anv_cmd_buffer_reset_rendering(cmd_buffer); }
