From: Sergii Romantsov Date: Wed, 5 Jun 2019 11:33:58 +0000 (+0300) Subject: intel/dri: finish proper glthread X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1dce75c1839f08cfa78400367019f998c258eff5;p=mesa.git intel/dri: finish proper glthread KWin was able to get NULL-context in the call intelUnbindContext. But a call _mesa_glthread_finish is not resistent to such case. Case can be catched with steps: 1. Create both glx and egl contexts 2. Make glx as current 3. Make egl as current 4. Reset glx context 5. Make egl as current Solution adds proper finishing of glthread-context (context will be taken from the requested dri-context for unbinding, but not from the saved current context). Piglit-test: https://gitlab.freedesktop.org/mesa/piglit/merge_requests/87 Cc: 19.1 19.2 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110814 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111271 Fixes: dca36d5516d0 (i965: Implement threaded GL support) Signed-off-by: Sergii Romantsov Reviewed-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index cc53f403bf2..6cec836da5c 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -1236,7 +1236,7 @@ intelDestroyContext(__DRIcontext * driContextPriv) GLboolean intelUnbindContext(__DRIcontext * driContextPriv) { - GET_CURRENT_CONTEXT(ctx); + struct gl_context *ctx = driContextPriv->driverPrivate; _mesa_glthread_finish(ctx); /* Unset current context and dispath table */