diff options
Diffstat (limited to 'xorg-server/glx/glxext.c')
| -rw-r--r-- | xorg-server/glx/glxext.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index 9cfc096c3..88e109c88 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -30,6 +30,10 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#else + +#include "glheader.h" + #endif #include <string.h> @@ -44,6 +48,9 @@ #include "glxext.h" #include "indirect_table.h" #include "indirect_util.h" +#include "glapi.h" + +extern void FlushContext(__GLXcontext *cx); /* ** The last context used by the server. It is the context that is current @@ -132,6 +139,8 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) for (c = glxAllContexts; c; c = next) { next = c->next; if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) { + if (GET_DISPATCH()) FlushContext(c); /* Only flush if we still have a context */ + (*c->loseCurrent)(c); c->isCurrent = GL_FALSE; if (c == __glXLastContext) @@ -411,7 +420,7 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag, if (cx->wait && (*cx->wait)(cx, cl, error)) return NULL; - if (cx == __glXLastContext) { + if (cx == __glXLastContext && GET_DISPATCH()) { /* No need to re-bind */ return cx; } |