From 2783f4d98ea67899dabedb453a6f4c68b542dbfe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 16 Jul 2023 13:20:01 -0400 Subject: [PATCH] radeonsi: rename shader_pointers state -> gfx_shader_pointers Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_blit.c | 2 +- src/gallium/drivers/radeonsi/si_descriptors.c | 10 +++++----- src/gallium/drivers/radeonsi/si_state.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 63c959a..230ea7b 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -99,7 +99,7 @@ void si_blitter_end(struct si_context *sctx) si_mark_atom_dirty(sctx, &sctx->atoms.s.ngg_cull_state); sctx->vertex_buffers_dirty = sctx->num_vertex_elements > 0; - si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers); + si_mark_atom_dirty(sctx, &sctx->atoms.s.gfx_shader_pointers); /* We force-disabled fbfetch for u_blitter, so recompute the state. */ si_update_ps_colorbuf0_slot(sctx); diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9c60419..a591ac5 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -2062,14 +2062,14 @@ static void si_mark_shader_pointers_dirty(struct si_context *sctx, unsigned shad if (shader == PIPE_SHADER_VERTEX) sctx->vertex_buffers_dirty = sctx->num_vertex_elements > 0; - si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers); + si_mark_atom_dirty(sctx, &sctx->atoms.s.gfx_shader_pointers); } void si_shader_pointers_mark_dirty(struct si_context *sctx) { sctx->shader_pointers_dirty = u_bit_consecutive(0, SI_NUM_DESCS); sctx->vertex_buffers_dirty = sctx->num_vertex_elements > 0; - si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers); + si_mark_atom_dirty(sctx, &sctx->atoms.s.gfx_shader_pointers); sctx->graphics_bindless_pointer_dirty = sctx->bindless_descriptors.buffer != NULL; sctx->compute_bindless_pointer_dirty = sctx->bindless_descriptors.buffer != NULL; sctx->compute_shaderbuf_sgprs_dirty = true; @@ -2402,7 +2402,7 @@ static unsigned si_create_bindless_descriptor(struct si_context *sctx, uint32_t /* Make sure to re-emit the shader pointers for all stages. */ sctx->graphics_bindless_pointer_dirty = true; sctx->compute_bindless_pointer_dirty = true; - si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers); + si_mark_atom_dirty(sctx, &sctx->atoms.s.gfx_shader_pointers); return desc_slot; } @@ -2817,7 +2817,7 @@ void si_init_all_descriptors(struct si_context *sctx) sctx->b.set_polygon_stipple = si_set_polygon_stipple; /* Shader user data. */ - sctx->atoms.s.shader_pointers.emit = si_emit_graphics_shader_pointers; + sctx->atoms.s.gfx_shader_pointers.emit = si_emit_graphics_shader_pointers; /* Set default and immutable mappings. */ si_set_user_data_base(sctx, PIPE_SHADER_VERTEX, @@ -2848,7 +2848,7 @@ static void si_upload_shader_descriptors(struct si_context *sctx, unsigned mask) sctx->descriptors_dirty &= ~dirty; sctx->shader_pointers_dirty |= dirty; - si_mark_atom_dirty(sctx, &sctx->atoms.s.shader_pointers); + si_mark_atom_dirty(sctx, &sctx->atoms.s.gfx_shader_pointers); } si_upload_bindless_descriptors(sctx); diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 7322e04..ba23670 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -195,7 +195,7 @@ union si_state_atoms { struct si_atom blend_color; struct si_atom clip_regs; struct si_atom clip_state; - struct si_atom shader_pointers; + struct si_atom gfx_shader_pointers; struct si_atom guardband; struct si_atom scissors; struct si_atom viewports; -- 2.7.4