ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Consolidate code paths for clearing the OpenGL context. 

We clear it if the context or the view is NULL.  If the context is non-NULL,
we want to disassociate the views of both the current and passed-in contexts,
if they differ.
This commit is contained in:
Ken Thomases 2014-01-14 01:25:03 -06:00 committed by Alexandre Julliard
parent d57a99b482
commit 2cc5337940
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/winemac.drv/cocoa_opengl.m
View File

@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
WineOpenGLContext *context = (WineOpenGLContext*)c;
NSView* view = (NSView*)v;
if (context)
if (context && view)
{
[context removeFromViews:NO];
if (view)
macdrv_add_view_opengl_context(v, c);
if (context.needsUpdate)
{
macdrv_add_view_opengl_context(v, c);
if (context.needsUpdate)
{
context.needsUpdate = FALSE;
[context setView:view];
[context setLatentView:nil];
}
else
{
if ([context view])
[context clearDrawableLeavingSurfaceOnScreen];
[context setLatentView:view];
}
[context makeCurrentContext];
if ([context view])
[context clearToBlackIfNeeded];
context.needsUpdate = FALSE;
[context setView:view];
[context setLatentView:nil];
}
else
{
[WineOpenGLContext clearCurrentContext];
[context removeFromViews:YES];
if ([context view])
[context clearDrawableLeavingSurfaceOnScreen];
[context setLatentView:view];
}
[context makeCurrentContext];
if ([context view])
[context clearToBlackIfNeeded];
}
else
{
@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
if ([currentContext isKindOfClass:[WineOpenGLContext class]])
{
[WineOpenGLContext clearCurrentContext];
[currentContext removeFromViews:YES];
if (currentContext != context)
[currentContext removeFromViews:YES];
}
if (context)
[context removeFromViews:YES];
}
[pool release];