summaryrefslogtreecommitdiffstats
path: root/.pick_status.json
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-02-12 14:55:27 -0500
committerDylan Baker <[email protected]>2020-02-18 11:21:41 -0800
commit5547fc53c04b7a6c7323066c4f6a711f4ec0fdb0 (patch)
tree9eb80faa921f53117c0308019025af369054991e /.pick_status.json
parent99d3ad1c71fa755baa3c81f27b05e792a29ea4ba (diff)
radeonsi: don't wait for shader compilation to finish when destroying a context
This was a hack for glsl_types deinitialization and it predates the proper fix, which was the addition of glsl_type_singleton_decref. This fixes a crash when the context is destroyed via the atexit handler. Cc: 19.3 20.0 <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3800> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3800> (cherry picked from commit 7e2b4bf256610cc016202893d7b4b4ef60b25b53)
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 6fd7ddef2e3..bc127e931bb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1057,7 +1057,7 @@
"description": "radeonsi: don't wait for shader compilation to finish when destroying a context",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},