Skip to content
Snippets Groups Projects
Commit 7d25ed70 authored by Stefan Dirsch's avatar Stefan Dirsch Committed by Emil Velikov
Browse files

dri3: Check for dummyContext to see if the glx_context is valid

According to the comments in src/glx/glxcurrent.c __glXGetCurrentContext()
always returns a valid pointer. If no context is made current, it will
contain dummyContext. Thus a test for NULL will always fail.

https://lists.freedesktop.org/archives/mesa-dev/2016-April/113962.html



Signed-off-by: default avatarStefan Dirsch <sndirsch@suse.de>
Reviewed-by: default avatarEgbert Eich <eich@freedesktop.org>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 4d9b518a
No related branches found
No related tags found
No related merge requests found
......@@ -127,13 +127,9 @@ static __DRIcontext *
glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
{
struct glx_context *gc = __glXGetCurrentContext();
struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
if (gc) {
struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
return dri3Ctx->driContext;
}
return NULL;
return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
}
static void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment