aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxext.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/glx/glxext.c')
-rw-r--r--xorg-server/glx/glxext.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 2c3f5edf0..e690044a4 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>
@@ -46,6 +50,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
@@ -139,6 +146,8 @@ 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)
@@ -322,7 +331,7 @@ GlxExtensionInit(void)
int i;
__GLXprovider *p, **stack;
Bool glx_provided = False;
-
+
if (serverGeneration == 1) {
for (stack = &__glXProviderStack; *stack; stack = &(*stack)->next)
;
@@ -435,7 +444,7 @@ __glXForceCurrent(__GLXclientState * cl, GLXContextTag tag, int *error)
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;
}