Module: Mesa Branch: master Commit: be905b74f7425935b3ca1be26fd8bf04833c73de URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be905b74f7425935b3ca1be26fd8bf04833c73de
Author: Marek Olšák <[email protected]> Date: Wed Nov 11 13:10:06 2020 -0500 radeonsi: don't add num_vbos_in_user_sgprs to the shader cache key for non-VS Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542> --- src/gallium/drivers/radeonsi/si_state_shaders.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index e40fe5d67fc..8ea69056240 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -78,11 +78,11 @@ void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es, sel->info.base.fs.uses_discard && sel->screen->debug_flags & DBG(FS_CORRECT_DERIVS_AFTER_KILL)) shader_variant_flags |= 1 << 3; - - /* This varies depending on whether compute-based culling is enabled. */ - assert(sel->screen->num_vbos_in_user_sgprs <= 7); - shader_variant_flags |= MIN2(sel->screen->num_vbos_in_user_sgprs, 7) << 4; - + if (sel->info.stage == MESA_SHADER_VERTEX) { + /* This varies depending on whether compute-based culling is enabled. */ + assert(sel->screen->num_vbos_in_user_sgprs <= 7); + shader_variant_flags |= MIN2(sel->screen->num_vbos_in_user_sgprs, 7) << 4; + } if (sel->screen->options.no_infinite_interp) shader_variant_flags |= 1 << 7; if (sel->screen->options.clamp_div_by_zero) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
