From aaaa41345674a1c76a70836394cb5e57f82e9a26 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 27 Apr 2014 20:55:51 +0100 Subject: [PATCH 1/2] hw/xwin: Update for __glXLastContext -> lastGLContext Update for __glXLastContext -> lastGLContext. Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/glx/indirect.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 690611428..9bfaac03d 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -929,17 +929,6 @@ glxWinDrawableDestroy(__GLXdrawable * base) { __GLXWinDrawable *glxPriv = (__GLXWinDrawable *) base; - if (glxPriv->drawContext && - (__glXLastContext == &((glxPriv->drawContext)->base))) { - // if this context is current and has unflushed commands, say we have flushed them - // (don't actually flush them, the window is going away anyhow, and an implict flush occurs - // 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..) - __glXLastContext->hasUnflushedCommands = FALSE; - __glXLastContext = NULL; - } - if (glxPriv->hPbuffer) if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer)) { ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage()); @@ -1542,7 +1531,7 @@ glxWinContextLoseCurrent(__GLXcontext * base) An error seems to be reported if we try to make no context current if there is already no current context, so avoid doing that... */ - if (__glXLastContext != NULL) { + if (wglGetCurrentContext() != NULL) { ret = wglMakeCurrent(NULL, NULL); /* We don't need a DC when setting no current context */ if (!ret) ErrorF("glxWinContextLoseCurrent error: %s\n", From a205ec3ab77c6765d44f77c526a832345fef77b0 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sat, 5 Apr 2014 15:15:46 +0100 Subject: [PATCH 2/2] configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used Commit f37a46913489397d8628ffe578c8d4ed50b6ca72 removed this from xwin-config.h.in for some reason, but it is used. Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- include/xwin-config.h.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/xwin-config.h.in b/include/xwin-config.h.in index a5e6b17b3..176c01980 100644 --- a/include/xwin-config.h.in +++ b/include/xwin-config.h.in @@ -26,5 +26,8 @@ /* Vendor web address for support */ #undef __VENDORDWEBSUPPORT__ +/* Default log location */ +#undef DEFAULT_LOGDIR + /* Whether we should re-locate the root to where the executable lives */ #undef RELOCATE_PROJECTROOT