Revert "winemac.drv: Actually make the GL context current even if no drawables were given.".
This reverts commits38f579f9ba
and02416314ab
. No extant application uses this, nor are the wined3d maintainers interested in using it. Signed-off-by: Charles Davis <cdavis5x@gmail.com> Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1bccc8b027
commit
1eeec9513c
|
@ -227,18 +227,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
|
||||||
{
|
{
|
||||||
WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext];
|
WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext];
|
||||||
|
|
||||||
[context removeFromViews:YES];
|
if ([currentContext isKindOfClass:[WineOpenGLContext class]])
|
||||||
|
|
||||||
if (currentContext != context)
|
|
||||||
{
|
{
|
||||||
if (context)
|
[WineOpenGLContext clearCurrentContext];
|
||||||
[context makeCurrentContext];
|
if (currentContext != context)
|
||||||
else
|
|
||||||
[WineOpenGLContext clearCurrentContext];
|
|
||||||
|
|
||||||
if ([currentContext isKindOfClass:[WineOpenGLContext class]])
|
|
||||||
[currentContext removeFromViews:YES];
|
[currentContext removeFromViews:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (context)
|
||||||
|
[context removeFromViews:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
[pool release];
|
[pool release];
|
||||||
|
|
|
@ -3057,13 +3057,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!draw_hdc && !read_hdc)
|
if ((hwnd = WindowFromDC(draw_hdc)))
|
||||||
{
|
|
||||||
context->draw_hwnd = NULL;
|
|
||||||
context->draw_view = NULL;
|
|
||||||
context->draw_pbuffer = NULL;
|
|
||||||
}
|
|
||||||
else if ((hwnd = WindowFromDC(draw_hdc)))
|
|
||||||
{
|
{
|
||||||
if (!(data = get_win_data(hwnd)))
|
if (!(data = get_win_data(hwnd)))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue