diff options
| author | Bernard Kilarski <bernard.r.kilarski@intel.com> | 2016-06-07 13:33:33 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2016-08-15 09:24:10 +0300 |
| commit | 2e3f067458e4a70da91b27fab61ef3d292ded4cf (patch) | |
| tree | 2c281b1bc75c9b14ae64c672e9c2aa26298577c9 /src/glx/glx_pbuffer.c | |
| parent | 312ece9cd773553a8a45a5d81edc7c09032ff4f1 (diff) | |
| download | external_mesa3d-2e3f067458e4a70da91b27fab61ef3d292ded4cf.zip external_mesa3d-2e3f067458e4a70da91b27fab61ef3d292ded4cf.tar.gz external_mesa3d-2e3f067458e4a70da91b27fab61ef3d292ded4cf.tar.bz2 | |
glx: fix error code when there is no context bound
v2: change all related NULL checks to check against dummyContext
v3: really check for dummyContext *only* when ctx was from
__glXGetCurrentContext
v4: cover more checks, add dummyBuffer, dummyVtable (Emil)
Signed-off-by: Bernard Kilarski <bernard.r.kilarski@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Cc: "11.2" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/glx/glx_pbuffer.c')
| -rw-r--r-- | src/glx/glx_pbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index a0c1e3d..24c073c 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -328,7 +328,7 @@ GetDrawableAttribute(Display * dpy, GLXDrawable drawable, * the calling thread's current context a GLXBadDrawable error is * generated." */ - if (pdraw == NULL || gc == NULL || gc->currentDpy != dpy || + if (pdraw == NULL || gc == &dummyContext || gc->currentDpy != dpy || (gc->currentDrawable != drawable && gc->currentReadable != drawable)) { __glXSendError(dpy, GLXBadDrawable, drawable, |