Mesa (master): radeonsi: add options.inline_uniforms to the shader cache key

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 025bc9e50e2489f9a312b92435409f58f4cd35f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=025bc9e50e2489f9a312b92435409f58f4cd35f7

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Nov 10 18:48:22 2020 -0500

radeonsi: add options.inline_uniforms to the shader cache key

It affects how shaders are finalized before caching.

Fixes: b7501184b90 ("radeonsi: implement inlinable uniforms")

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

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index a83ef01d4fa..e40fe5d67fc 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -95,6 +95,8 @@ void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es,
        !es &&
        sel->screen->options.vrs2x2)
       shader_variant_flags |= 1 << 10;
+   if (sel->screen->options.inline_uniforms)
+      shader_variant_flags |= 1 << 11;
 
    struct mesa_sha1 ctx;
    _mesa_sha1_init(&ctx);