Mesa (master): radeonsi: don't wait for shader compilation to finish when destroying a context

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7e2b4bf256610cc016202893d7b4b4ef60b25b53
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e2b4bf256610cc016202893d7b4b4ef60b25b53

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Feb 12 14:55:27 2020 -0500

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 at lists.freedesktop.org>
Reviewed-by: Timothy Arceri <tarceri at 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>

---

 src/gallium/drivers/radeonsi/si_pipe.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index cb96645b9d2..ea4f1bf20b6 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -172,9 +172,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.
 	 */