diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-02-12 14:55:27 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-18 08:52:33 -0800 |
| commit | 406cf6560c067fc33d06fbe95b9f0619e1f55108 (patch) | |
| tree | 46b3a0594563bd77eb194e13dae3887f99fc01f2 | |
| parent | 7bc83a2e9f27dda443fa59942a7cfd1d53875d90 (diff) | |
| download | mesa-406cf6560c067fc33d06fbe95b9f0619e1f55108.tar.gz | |
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 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index e4a2281d8ab..ae35b953bfc 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 }, diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 116450f3379..01ca1b5761c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -166,9 +166,6 @@ static void si_destroy_context(struct pipe_context *context) struct si_context *sctx = (struct si_context *)context; int i; - util_queue_finish(&sctx->screen->shader_compiler_queue); - util_queue_finish(&sctx->screen->shader_compiler_queue_low_priority); - /* Unreference the framebuffer normally to disable related logic * properly. */ |