diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-14 10:44:09 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-14 10:44:09 +0000 |
| commit | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (patch) | |
| tree | ca2990ba0e447003b16ef239d3bdb30fdd8dc792 /xorg-server/glx/glxext.c | |
| parent | 13863345017a14a9dcce2ea5d3833eb74bb3760f (diff) | |
| download | vcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.tar.gz vcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.tar.bz2 vcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.zip | |
Git update 14/1/2010
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 751ea7297..59bcfbed2 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -267,6 +267,7 @@ GLboolean __glXErrorOccured(void) } static int __glXErrorBase; +int __glXEventBase; int __glXError(int error) { @@ -403,6 +404,7 @@ void GlxExtensionInit(void) } __glXErrorBase = extEntry->errorBase; + __glXEventBase = extEntry->eventBase; } /************************************************************************/ @@ -446,6 +448,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; |