aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-30 19:15:38 +0000
committermarha <marha@users.sourceforge.net>2011-03-30 19:15:38 +0000
commit140242b0d4aed1d595d6565d088d9567c456d6b4 (patch)
tree2be8f8ce7a66c32ad440af80a236c071c01f5880 /xorg-server/hw/xwin
parentaee5cfef9a419ee2845d66b0c31e476880bea663 (diff)
downloadvcxsrv-140242b0d4aed1d595d6565d088d9567c456d6b4.tar.gz
vcxsrv-140242b0d4aed1d595d6565d088d9567c456d6b4.tar.bz2
vcxsrv-140242b0d4aed1d595d6565d088d9567c456d6b4.zip
xserver mesa git update 30 Mar 2011
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/glx/indirect.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 4877a9ac8..357029aa9 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -859,7 +859,7 @@ glxWinDrawableDestroy(__GLXdrawable *base)
// on the next context change)
// (GLX core considers it an error when we try to select a new current context if the old one
// has unflushed commands, but the window has disappeared..)
- __GLX_NOTE_FLUSHED_CMDS(__glXLastContext);
+ __glXLastContext->hasUnflushedCommands = FALSE;
__glXLastContext = NULL;
}
@@ -1480,13 +1480,6 @@ glxWinContextCopy(__GLXcontext *dst_base, __GLXcontext *src_base, unsigned long
return ret;
}
-static int
-glxWinContextForceCurrent(__GLXcontext *base)
-{
- /* wglMakeCurrent always flushes the previous context, so this is equivalent to glxWinContextMakeCurrent */
- return glxWinContextMakeCurrent(base);
-}
-
static void
glxWinContextDestroy(__GLXcontext *base)
{
@@ -1541,7 +1534,6 @@ glxWinCreateContext(__GLXscreen *screen,
context->base.makeCurrent = glxWinContextMakeCurrent;
context->base.loseCurrent = glxWinContextLoseCurrent;
context->base.copy = glxWinContextCopy;
- context->base.forceCurrent = glxWinContextForceCurrent;
context->base.textureFromPixmap = &glxWinTextureFromPixmap;
context->base.config = modes;
context->base.pGlxScreen = screen;