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

hw/xwin: Update for __glXLastContext -> lastGLContext 

Update for __glXLastContext -> lastGLContext.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2014-04-27 20:55:51 +01:00
parent db2e708f31
commit aaaa413456
1 changed files with 1 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",