Mesa (staging/20.1): meson: Do not require shader cache for radv.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: cbf6002ba11fd68b916d6a8d883d49889a23a20b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbf6002ba11fd68b916d6a8d883d49889a23a20b

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Jun 25 18:06:42 2020 +0200

meson: Do not require shader cache for radv.

We fixed the compile error a while ago.

Fixes: cc10b34e9ed "util/disk_cache: Fix disk_cache_get_function_timestamp with disabled cache."
Reviewed-by: Drew Davenport <ddavenport at chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5649>
(cherry picked from commit 3b74e6fa28037ee2d3fc0824275a9e1c509a0e2c)

---

 .pick_status.json | 2 +-
 meson.build       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a394cf00b11..31c7c80d4a9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -193,7 +193,7 @@
         "description": "meson: Do not require shader cache for radv.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "cc10b34e9ed1104f4ceb88a49a42e1d6a743d52f"
     },
diff --git a/meson.build b/meson.build
index 92f1da12886..b57901303ad 100644
--- a/meson.build
+++ b/meson.build
@@ -834,9 +834,6 @@ if _shader_cache != 'false'
     with_shader_cache = true
   endif
 endif
-if with_amd_vk and not with_shader_cache
-  error('Radv requires shader cache support')
-endif
 
 # Check for GCC style builtins
 foreach b : ['bswap32', 'bswap64', 'clz', 'clzll', 'ctz', 'expect', 'ffs',