commit 0a3935057263543f9199f01ed6bf09ca440c539b
author Dylan Baker <dylan.c.baker@intel.com> Thu Nov 19 16:09:22 2020 -0800
committer Dylan Baker <dylan.c.baker@intel.com> Tue Nov 24 22:08:17 2020 -0800
tree c7d359763d12e584b494caa6a3920f3bc2f0ceeb
parent f998d5bddbd46d99b6c218b2d85b4bb1d7cdd8a8

meson: Don't add extra values to shader-cache

We're trying to move to using a feature here, adding more values breaks
that.

Fixes: 5de56937a3d009659076dc67de6a57379fc7a31b
       ("disk_cache: build option for disabled-by-default")

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7699>
(cherry picked from commit 7ca4a478ad307e3e706e86b2786929a6a3b7dff8)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index c29fc1f..a69bc80 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -769,7 +769,7 @@
         "description": "meson: Don't add extra values to shader-cache",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "5de56937a3d009659076dc67de6a57379fc7a31b"
     },