fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/st: Convert st_cb_clear to use st_context_invalidate_state

Browse source 
Replace CSO save/restore of atom-backed states with
st_context_invalidate_state(). Only stream outputs and pause
queries (no atoms) still use CSO save/restore.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40592>
This commit is contained in:
Christian Gmeiner 2026-03-25 22:49:21 +01:00 • committed by Marge Bot
parent 8c13b4e097
commit 04f735c5a7
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/mesa/state_tracker/st_cb_clear.c
View file

@ -216,18 +216,9 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers)
x1, y1);
*/
cso_save_state(cso, (CSO_BIT_BLEND |
CSO_BIT_STENCIL_REF |
CSO_BIT_DEPTH_STENCIL_ALPHA |
CSO_BIT_RASTERIZER |
CSO_BIT_SAMPLE_MASK |
CSO_BIT_MIN_SAMPLES |
CSO_BIT_VIEWPORT |
CSO_BIT_STREAM_OUTPUTS |
CSO_BIT_VERTEX_ELEMENTS |
(st->active_queries ? CSO_BIT_PAUSE_QUERIES : 0) |
CSO_BIT_MESH_SHADER |
CSO_BITS_VERTEX_PIPE_SHADERS));
/* Save only states that have no st_atom — they can't be re-derived. */
cso_save_state(cso, (CSO_BIT_STREAM_OUTPUTS |
(st->active_queries ? CSO_BIT_PAUSE_QUERIES : 0)));
/* blend state: RGBA masking */
{
@ -324,10 +315,27 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers)
pipe_resource_release(cso->pipe, releasebuf);
/* Restore pipe state */
/* Restore atomless states via CSO. */
cso_restore_state(cso, 0);
ctx->Array.NewVertexElements = true;
ST_SET_STATE2(ctx->NewDriverState, ST_NEW_VERTEX_ARRAYS, ST_NEW_FS_CONSTANTS);
/* Invalidate all states this meta-op modified. The atoms will
* re-derive them from GL state before the next draw.
*/
st_context_invalidate_state(st,
ST_INVALIDATE_BLEND |
ST_INVALIDATE_DSA |
ST_INVALIDATE_RASTERIZER |
ST_INVALIDATE_SAMPLE_MASK |
ST_INVALIDATE_SAMPLE_SHADING |
ST_INVALIDATE_VIEWPORT |
ST_INVALIDATE_VERTEX_BUFFERS |
ST_INVALIDATE_FS_CONSTBUF0 |
ST_INVALIDATE_VS_STATE |
ST_INVALIDATE_FS_STATE |
ST_INVALIDATE_GS_STATE |
ST_INVALIDATE_TCS_STATE |
ST_INVALIDATE_TES_STATE |
ST_INVALIDATE_MESH_STATE);
}