diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
| commit | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch) | |
| tree | a4b168a1b2c686548550719b094e982124696f3d /xorg-server/glx/glxext.c | |
| parent | 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff) | |
| parent | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff) | |
| download | vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2 vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxext.c')
| -rw-r--r-- | xorg-server/glx/glxext.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index a3b5b62dd..c1fedf3b9 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -273,6 +273,7 @@ GLboolean __glXErrorOccured(void) } static int __glXErrorBase; +int __glXEventBase; int __glXError(int error) { @@ -409,6 +410,7 @@ void GlxExtensionInit(void) } __glXErrorBase = extEntry->errorBase; + __glXEventBase = extEntry->eventBase; } /************************************************************************/ @@ -452,6 +454,9 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag, } } + if (cx->wait && (*cx->wait)(cx, cl, error)) + return NULL; + if (cx == __glXLastContext) { /* No need to re-bind */ return cx; |