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

radeonsi: move setting one GS shader key field out of si_shader_selector_key

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12343>
This commit is contained in:
Marek Olšák 2021-08-11 12:53:46 -04:00 • committed by Marge Bot
parent 99c5e03986
commit 73c82570cb
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1077,7 +1077,6 @@ struct si_context {
bool allow_flat_shading : 1;
/* Emitted draw state. */
bool gs_tri_strip_adj_fix : 1;
bool ngg : 1;
uint8_t ngg_culling;
unsigned last_index_size;

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

@ -2028,8 +2028,8 @@ static void si_draw_vbo(struct pipe_context *ctx,
bool gs_tri_strip_adj_fix =
!HAS_TESS && prim == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY;
if (gs_tri_strip_adj_fix != sctx->gs_tri_strip_adj_fix) {
sctx->gs_tri_strip_adj_fix = gs_tri_strip_adj_fix;
if (gs_tri_strip_adj_fix != sctx->shader.gs.key.part.gs.prolog.tri_strip_adj_fix) {
sctx->shader.gs.key.part.gs.prolog.tri_strip_adj_fix = gs_tri_strip_adj_fix;
sctx->do_update_shaders = true;
}
}

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

@ -2173,7 +2173,6 @@ static inline void si_shader_selector_key(struct pipe_context *ctx, struct si_sh
else
si_clear_vs_key_outputs(sctx, sel, key);
}
key->part.gs.prolog.tri_strip_adj_fix = sctx->gs_tri_strip_adj_fix;
break;
case MESA_SHADER_FRAGMENT:
si_ps_key_update_primtype_shader_rasterizer_framebuffer(sctx);