Mesa (master): glx: Don't use current context in __glXSendError
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Aug 17 08:25:07 UTC 2016
Module: Mesa
Branch: master
Commit: 4ac640e3d207ab84ee4468c7017e5410b7a05d7a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ac640e3d207ab84ee4468c7017e5410b7a05d7a
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Aug 16 15:35:44 2016 +0900
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 at glx-fbconfig-bad
glx at glx_ext_import_context@import context, multi process
glx at 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 at lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/glx/glx_error.c | 4 +---
1 file changed, 1 insertion(+), 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);
More information about the mesa-commit
mailing list