diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-02 13:08:23 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-02 13:08:23 -0700 |
| commit | b5526141f78df15bc5df2497bc4b4a17f1a6368d (patch) | |
| tree | 65dd253b939dfdbe54392af50ca632e23999e694 /hw | |
| parent | dc8d0688471695ec5a8db5fef93fbcfc064891d5 (diff) | |
| parent | a205ec3ab77c6765d44f77c526a832345fef77b0 (diff) | |
Merge remote-tracking branch 'jturney/master'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xwin/glx/indirect.c | 13 |
1 files changed, 1 insertions, 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", |