commit f396e154f1d75c9136f8e899ef499e06b1d19e9d
author Marek Olšák <marek.olsak@amd.com> Tue Nov 10 18:48:22 2020 -0500
committer Dylan Baker <dylan.c.baker@intel.com> Thu Nov 19 10:42:25 2020 -0800
tree becef004223d9bc704fac53ed33829ed08cd056f
parent d247a0720afdf829b519b2302b585edd59460545

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@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit 025bc9e50e2489f9a312b92435409f58f4cd35f7)

Conflicts:
	src/gallium/drivers/radeonsi/si_state_shaders.c

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 03a9d43..57121ea 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -643,7 +643,7 @@
         "description": "radeonsi: add options.inline_uniforms to the shader cache key",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "b7501184b90a20015885b3f2276a7a5ceaef31a7"
     },