Module: Mesa Branch: staging/23.3 Commit: 78b48817d1b2f9ce672a72c521c659a02ca7b206 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=78b48817d1b2f9ce672a72c521c659a02ca7b206
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Mon Sep 25 11:14:20 2023 +0200 radeonsi/sqtt: fix RGP pm4 state emit function It was missing in c3129b2b839. Fixes: c3129b2b839 ("radeonsi: add a simple version of si_pm4_emit_state for non-shader states") Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774> (cherry picked from commit 77098ec467fae56d3e3885d8e84137ac410e15cc) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 08e8966ac91..7f15a8855a1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -204,7 +204,7 @@ "description": "radeonsi/sqtt: fix RGP pm4 state emit function", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c3129b2b83955277f9dc73f4acb0dfb0ad50e566", "notes": null diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index b33626fb690..6329e3218ea 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -5441,6 +5441,7 @@ void si_init_state_functions(struct si_context *sctx) sctx->atoms.s.pm4_states[SI_STATE_IDX(rasterizer)].emit = si_pm4_emit_state; sctx->atoms.s.pm4_states[SI_STATE_IDX(dsa)].emit = si_pm4_emit_state; sctx->atoms.s.pm4_states[SI_STATE_IDX(poly_offset)].emit = si_pm4_emit_state; + sctx->atoms.s.pm4_states[SI_STATE_IDX(sqtt_pipeline)].emit = si_pm4_emit_state; sctx->atoms.s.pm4_states[SI_STATE_IDX(ls)].emit = si_pm4_emit_shader; sctx->atoms.s.pm4_states[SI_STATE_IDX(hs)].emit = si_pm4_emit_shader; sctx->atoms.s.pm4_states[SI_STATE_IDX(es)].emit = si_pm4_emit_shader;
