From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 21 Mar 2020 01:12:38 +0000 (-0400)
Subject: radeonsi: add num_vbos_in_user_sgprs into the shader cache key
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65e9239977963c5caaef12cfd6b6c6e285f86381;p=mesa.git

radeonsi: add num_vbos_in_user_sgprs into the shader cache key

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4269>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 21299563777..ce7e791be3d 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -79,6 +79,9 @@ void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es,
 	    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. */
+	shader_variant_flags |= sel->screen->num_vbos_in_user_sgprs << 4;
+
 	struct mesa_sha1 ctx;
 	_mesa_sha1_init(&ctx);
 	_mesa_sha1_update(&ctx, &shader_variant_flags, 4);