summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.com>2016-04-21 15:02:53 +0200
committerEmil Velikov <emil.l.velikov@gmail.com>2016-04-27 13:03:11 +0100
commit4d9b518ad2a03232bf8162b05c6504d06c47eb91 (patch)
tree7c3e6843ee4e1cb21e00874da2a364c043d9be5b /src/glx
parent6d1a59d15b31a0d03b8e741784dfc8b433435ba8 (diff)
dri2: 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://bugzilla.opensuse.org/show_bug.cgi?id=962609 Tested-by: Olaf Hering <ohering@suse.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/dri2_glx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 5c5630dbb4d..af388d97d31 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -514,7 +514,7 @@ dri2GetCurrentContext()
struct glx_context *gc = __glXGetCurrentContext();
struct dri2_context *dri2Ctx = (struct dri2_context *)gc;
- return dri2Ctx ? dri2Ctx->driContext : NULL;
+ return (gc != &dummyContext) ? dri2Ctx->driContext : NULL;
}
/**