diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-08-16 15:35:44 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-08-17 17:16:34 +0900 |
| commit | 4ac640e3d207ab84ee4468c7017e5410b7a05d7a (patch) | |
| tree | 49967f6673e9fa1f419e283dae34c8e7b14717da /src/glx/glx_error.c | |
| parent | e988999791c32fd2594986fde742367d7f71c724 (diff) | |
| download | external_mesa3d-4ac640e3d207ab84ee4468c7017e5410b7a05d7a.zip external_mesa3d-4ac640e3d207ab84ee4468c7017e5410b7a05d7a.tar.gz external_mesa3d-4ac640e3d207ab84ee4468c7017e5410b7a05d7a.tar.bz2 | |
glx: Don't use current context in __glXSendError
There's no guarantee that there is one, and we don't need one anyway.
Fixes piglit tests:
glx@glx-fbconfig-bad
glx@glx_ext_import_context@import context, multi process
glx@glx_ext_import_context@import context, single process
Fixes: 2e3f067458e4 ("glx: fix error code when there is no context bound")
Cc: "11.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/glx/glx_error.c')
| -rw-r--r-- | src/glx/glx_error.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/glx/glx_error.c b/src/glx/glx_error.c index e098682..653cbeb 100644 --- a/src/glx/glx_error.c +++ b/src/glx/glx_error.c @@ -39,11 +39,9 @@ __glXSendError(Display * dpy, int_fast8_t errorCode, uint_fast32_t resourceID, uint_fast16_t minorCode, bool coreX11error) { struct glx_display *glx_dpy = __glXInitialize(dpy); - struct glx_context *gc = __glXGetCurrentContext(); xError error; assert(glx_dpy); - assert(gc != &dummyContext); LockDisplay(dpy); @@ -59,7 +57,7 @@ __glXSendError(Display * dpy, int_fast8_t errorCode, uint_fast32_t resourceID, error.sequenceNumber = dpy->request; error.resourceID = resourceID; error.minorCode = minorCode; - error.majorCode = gc ? gc->majorOpcode : 0; + error.majorCode = glx_dpy->majorOpcode; _XError(dpy, &error); |