From ade70712df729cc665c3e80d7bb18a50967359d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 14 May 2023 21:01:00 -0400 Subject: [PATCH] radeonsi: rename the msaa_sample_locs state to sample locations Reviewed-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/si_gfx_cs.c | 2 +- src/gallium/drivers/radeonsi/si_state.c | 4 ++-- src/gallium/drivers/radeonsi/si_state.h | 4 ++-- src/gallium/drivers/radeonsi/si_state_draw.cpp | 2 +- src/gallium/drivers/radeonsi/si_state_msaa.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c index 0539a74dc7c..243142bc547 100644 --- a/src/gallium/drivers/radeonsi/si_gfx_cs.c +++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c @@ -487,7 +487,7 @@ void si_begin_new_gfx_cs(struct si_context *ctx, bool first_cs) if (!has_clear_state || ctx->clip_state_any_nonzeros) si_mark_atom_dirty(ctx, &ctx->atoms.s.clip_state); ctx->sample_locs_num_samples = 0; - si_mark_atom_dirty(ctx, &ctx->atoms.s.msaa_sample_locs); + si_mark_atom_dirty(ctx, &ctx->atoms.s.sample_locations); si_mark_atom_dirty(ctx, &ctx->atoms.s.msaa_config); /* CLEAR_STATE sets 0xffff. */ if (!has_clear_state || ctx->sample_mask != 0xffff) diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 2eb3509ea39..74e856018a9 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1161,7 +1161,7 @@ static void si_bind_rs_state(struct pipe_context *ctx, void *state) /* Update the small primitive filter workaround if necessary. */ if (sctx->screen->info.has_small_prim_filter_sample_loc_bug && sctx->framebuffer.nr_samples > 1) - si_mark_atom_dirty(sctx, &sctx->atoms.s.msaa_sample_locs); + si_mark_atom_dirty(sctx, &sctx->atoms.s.sample_locations); /* NGG cull state uses multisample_enable. */ if (sctx->screen->use_ngg_culling) @@ -3068,7 +3068,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, constbuf.buffer_size = sctx->framebuffer.nr_samples * 2 * 4; si_set_internal_const_buffer(sctx, SI_PS_CONST_SAMPLE_POSITIONS, &constbuf); - si_mark_atom_dirty(sctx, &sctx->atoms.s.msaa_sample_locs); + si_mark_atom_dirty(sctx, &sctx->atoms.s.sample_locations); } si_ps_key_update_framebuffer(sctx); diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index e0085694fe2..8050100463e 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -190,7 +190,7 @@ union si_state_atoms { struct si_atom streamout_begin; struct si_atom streamout_enable; /* must be after streamout_begin */ struct si_atom framebuffer; - struct si_atom msaa_sample_locs; + struct si_atom sample_locations; struct si_atom db_render_state; struct si_atom dpbb_state; struct si_atom msaa_config; @@ -220,7 +220,7 @@ union si_state_atoms { static inline unsigned si_atoms_that_always_roll_context(void) { return (SI_ATOM_BIT(streamout_begin) | SI_ATOM_BIT(streamout_enable) | SI_ATOM_BIT(framebuffer) | - SI_ATOM_BIT(msaa_sample_locs) | SI_ATOM_BIT(sample_mask) | SI_ATOM_BIT(blend_color) | + SI_ATOM_BIT(sample_locations) | SI_ATOM_BIT(sample_mask) | SI_ATOM_BIT(blend_color) | SI_ATOM_BIT(clip_state) | SI_ATOM_BIT(scissors) | SI_ATOM_BIT(viewports) | SI_ATOM_BIT(stencil_ref) | SI_ATOM_BIT(scratch_state) | SI_ATOM_BIT(window_rectangles)); } diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index e2a39ef6401..9b0cb7970a8 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -292,7 +292,7 @@ static bool si_update_shaders(struct si_context *sctx) si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state); if (sctx->framebuffer.nr_samples <= 1) - si_mark_atom_dirty(sctx, &sctx->atoms.s.msaa_sample_locs); + si_mark_atom_dirty(sctx, &sctx->atoms.s.sample_locations); } if (GFX_VERSION >= GFX9 && unlikely(sctx->sqtt)) { diff --git a/src/gallium/drivers/radeonsi/si_state_msaa.c b/src/gallium/drivers/radeonsi/si_state_msaa.c index 69d8cb00d98..e39bcb3e610 100644 --- a/src/gallium/drivers/radeonsi/si_state_msaa.c +++ b/src/gallium/drivers/radeonsi/si_state_msaa.c @@ -232,7 +232,7 @@ void si_init_msaa_functions(struct si_context *sctx) { int i; - sctx->atoms.s.msaa_sample_locs.emit = si_emit_sample_locations; + sctx->atoms.s.sample_locations.emit = si_emit_sample_locations; sctx->b.get_sample_position = si_get_sample_position; si_get_sample_position(&sctx->b, 1, 0, sctx->sample_positions.x1[0]);