fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 15:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: rename tcs_tes_uses_prim_id for clarity

Browse source 
What we care about is whether PrimID is used while tessellation is
enabled; whether it's used in TCS/TES or further down the pipeline is
irrelevant.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2017-05-15 11:13:44 +02:00
parent f4dbe2efb7
commit 4ea67c1751
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -217,7 +217,7 @@ union si_vgt_param_key {
unsigned count_from_stream_output:1; unsigned count_from_stream_output:1;
unsigned line_stipple_enabled:1; unsigned line_stipple_enabled:1;
unsigned uses_tess:1; unsigned uses_tess:1;
unsigned tcs_tes_uses_prim_id:1; unsigned tess_uses_prim_id:1;
unsigned uses_gs:1; unsigned uses_gs:1;
unsigned _pad:32 - SI_NUM_VGT_PARAM_KEY_BITS; unsigned _pad:32 - SI_NUM_VGT_PARAM_KEY_BITS;
} u; } u;

4
src/gallium/drivers/radeonsi/si_state_draw.c
View file

@ -328,7 +328,7 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
if (key->u.uses_tess) { if (key->u.uses_tess) {
/* SWITCH_ON_EOI must be set if PrimID is used. */ /* SWITCH_ON_EOI must be set if PrimID is used. */
if (key->u.tcs_tes_uses_prim_id) if (key->u.tess_uses_prim_id)
ia_switch_on_eoi = true; ia_switch_on_eoi = true;
/* Bug with tessellation and GS on Bonaire and older 2 SE chips. */ /* Bug with tessellation and GS on Bonaire and older 2 SE chips. */
@ -459,7 +459,7 @@ void si_init_ia_multi_vgt_param_table(struct si_context *sctx)
key.u.count_from_stream_output = count_from_so; key.u.count_from_stream_output = count_from_so;
key.u.line_stipple_enabled = line_stipple; key.u.line_stipple_enabled = line_stipple;
key.u.uses_tess = uses_tess; key.u.uses_tess = uses_tess;
key.u.tcs_tes_uses_prim_id = tess_uses_primid; key.u.tess_uses_prim_id = tess_uses_primid;
key.u.uses_gs = uses_gs; key.u.uses_gs = uses_gs;
sctx->ia_multi_vgt_param[key.index] = sctx->ia_multi_vgt_param[key.index] =

12
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -2126,9 +2126,9 @@ static void si_bind_vs_shader(struct pipe_context *ctx, void *state)
r600_update_vs_writes_viewport_index(&sctx->b, si_get_vs_info(sctx)); r600_update_vs_writes_viewport_index(&sctx->b, si_get_vs_info(sctx));
} }
static void si_update_tcs_tes_uses_prim_id(struct si_context *sctx) static void si_update_tess_uses_prim_id(struct si_context *sctx)
{ {
sctx->ia_multi_vgt_param_key.u.tcs_tes_uses_prim_id = sctx->ia_multi_vgt_param_key.u.tess_uses_prim_id =
(sctx->tes_shader.cso && (sctx->tes_shader.cso &&
sctx->tes_shader.cso->info.uses_primid) || sctx->tes_shader.cso->info.uses_primid) ||
(sctx->tcs_shader.cso && (sctx->tcs_shader.cso &&
@ -2158,7 +2158,7 @@ static void si_bind_gs_shader(struct pipe_context *ctx, void *state)
if (enable_changed) { if (enable_changed) {
si_shader_change_notify(sctx); si_shader_change_notify(sctx);
if (sctx->ia_multi_vgt_param_key.u.uses_tess) if (sctx->ia_multi_vgt_param_key.u.uses_tess)
si_update_tcs_tes_uses_prim_id(sctx); si_update_tess_uses_prim_id(sctx);
} }
r600_update_vs_writes_viewport_index(&sctx->b, si_get_vs_info(sctx)); r600_update_vs_writes_viewport_index(&sctx->b, si_get_vs_info(sctx));
} }
@ -2174,7 +2174,7 @@ static void si_bind_tcs_shader(struct pipe_context *ctx, void *state)
sctx->tcs_shader.cso = sel; sctx->tcs_shader.cso = sel;
sctx->tcs_shader.current = sel ? sel->first_variant : NULL; sctx->tcs_shader.current = sel ? sel->first_variant : NULL;
si_update_tcs_tes_uses_prim_id(sctx); si_update_tess_uses_prim_id(sctx);
sctx->do_update_shaders = true; sctx->do_update_shaders = true;
if (enable_changed) if (enable_changed)
@ -2193,7 +2193,7 @@ static void si_bind_tes_shader(struct pipe_context *ctx, void *state)
sctx->tes_shader.cso = sel; sctx->tes_shader.cso = sel;
sctx->tes_shader.current = sel ? sel->first_variant : NULL; sctx->tes_shader.current = sel ? sel->first_variant : NULL;
sctx->ia_multi_vgt_param_key.u.uses_tess = sel != NULL; sctx->ia_multi_vgt_param_key.u.uses_tess = sel != NULL;
si_update_tcs_tes_uses_prim_id(sctx); si_update_tess_uses_prim_id(sctx);
sctx->do_update_shaders = true; sctx->do_update_shaders = true;
si_mark_atom_dirty(sctx, &sctx->clip_regs); si_mark_atom_dirty(sctx, &sctx->clip_regs);
sctx->last_rast_prim = -1; /* reset this so that it gets updated */ sctx->last_rast_prim = -1; /* reset this so that it gets updated */
@ -2218,7 +2218,7 @@ static void si_bind_ps_shader(struct pipe_context *ctx, void *state)
sctx->ps_shader.current = sel ? sel->first_variant : NULL; sctx->ps_shader.current = sel ? sel->first_variant : NULL;
sctx->do_update_shaders = true; sctx->do_update_shaders = true;
if (sel && sctx->ia_multi_vgt_param_key.u.uses_tess) if (sel && sctx->ia_multi_vgt_param_key.u.uses_tess)
si_update_tcs_tes_uses_prim_id(sctx); si_update_tess_uses_prim_id(sctx);
si_mark_atom_dirty(sctx, &sctx->cb_render_state); si_mark_atom_dirty(sctx, &sctx->cb_render_state);
} }