summaryrefslogtreecommitdiff
path: root/.pick_status.json
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2020-11-10 09:38:45 +0100
committerDylan Baker <dylan.c.baker@intel.com>2020-11-13 10:05:33 -0800
commit46c08b73dea5c12f8fd7e3f2a404daf110d5df43 (patch)
tree89cd48da5d902dade824d2c59ff92aef6a9dff9c /.pick_status.json
parent23f4120491d44f96cb605a577edc9824702516c1 (diff)
softpipe: correct signature of get_compiler_options
This gets rid of a harmless but annoying compiler warning on MSVC. Fixes: 73bafb5ee38 ("gallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()") Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7524> (cherry picked from commit 7a1346b26a70a9d6000f4889ab4d594a6a445d6d)
Diffstat (limited to '.pick_status.json')
-rw-r--r--.pick_status.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index d336e969660..5b35ac1d24d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1453,7 +1453,7 @@
"description": "softpipe: correct signature of get_compiler_options",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "73bafb5ee38964019c3da2000095608a7fb4b554"
},