diff options
| author | Stefan Dirsch <sndirsch@suse.de> | 2016-04-25 15:06:25 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-04-27 13:03:34 +0100 |
| commit | 7d25ed70362ee9362aeeadb00f5a4e2bea690827 (patch) | |
| tree | 2e4601bfbdcc4d934f454a8ff607d3d819709578 /src/glx | |
| parent | 4d9b518ad2a03232bf8162b05c6504d06c47eb91 (diff) | |
| download | external_mesa3d-7d25ed70362ee9362aeeadb00f5a4e2bea690827.zip external_mesa3d-7d25ed70362ee9362aeeadb00f5a4e2bea690827.tar.gz external_mesa3d-7d25ed70362ee9362aeeadb00f5a4e2bea690827.tar.bz2 | |
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: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/dri3_glx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 6729357..90d7bba 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -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 |