From 73c82570cbfc305adbe734ae5e723ca5dba3fce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 11 Aug 2021 12:53:46 -0400 Subject: [PATCH] radeonsi: move setting one GS shader key field out of si_shader_selector_key Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_pipe.h | 1 - src/gallium/drivers/radeonsi/si_state_draw.cpp | 4 ++-- src/gallium/drivers/radeonsi/si_state_shaders.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index c03f7ac6b2e..60a58957375 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -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; diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index f9c60eaba7b..021f309691d 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -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; } } diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 9effd12b63a..75b382d0312 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -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);