frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jturney/master'

This commit is contained in:
Keith Packard 2014-06-02 13:08:23 -07:00
parent dc8d068847 a205ec3ab7
commit b5526141f7
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xwin/glx/indirect.c
View File

@ -929,17 +929,6 @@ glxWinDrawableDestroy(__GLXdrawable * base)
{ {
__GLXWinDrawable *glxPriv = (__GLXWinDrawable *) 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 (glxPriv->hPbuffer)
if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer)) { if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer)) {
ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage()); 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 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 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 */ ret = wglMakeCurrent(NULL, NULL); /* We don't need a DC when setting no current context */
if (!ret) if (!ret)
ErrorF("glxWinContextLoseCurrent error: %s\n", ErrorF("glxWinContextLoseCurrent error: %s\n",

3
include/xwin-config.h.in
View File

@ -26,5 +26,8 @@
/* Vendor web address for support */ /* Vendor web address for support */
#undef __VENDORDWEBSUPPORT__ #undef __VENDORDWEBSUPPORT__
/* Default log location */
#undef DEFAULT_LOGDIR
/* Whether we should re-locate the root to where the executable lives */ /* Whether we should re-locate the root to where the executable lives */
#undef RELOCATE_PROJECTROOT #undef RELOCATE_PROJECTROOT