Commit 1eeec951 authored by Charles Davis's avatar Charles Davis Committed by Alexandre Julliard

Revert "winemac.drv: Actually make the GL context current even if no drawables were given.".

This reverts commits 38f579f9 and 02416314. No extant application uses this, nor are the wined3d maintainers interested in using it. Signed-off-by: 's avatarCharles Davis <cdavis5x@gmail.com> Signed-off-by: 's avatarKen Thomases <ken@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1bccc8b0
......@@ -227,18 +227,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
{
WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext];
[context removeFromViews:YES];
if (currentContext != context)
if ([currentContext isKindOfClass:[WineOpenGLContext class]])
{
if (context)
[context makeCurrentContext];
else
[WineOpenGLContext clearCurrentContext];
if ([currentContext isKindOfClass:[WineOpenGLContext class]])
[WineOpenGLContext clearCurrentContext];
if (currentContext != context)
[currentContext removeFromViews:YES];
}
if (context)
[context removeFromViews:YES];
}
[pool release];
......
......@@ -3057,13 +3057,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w
return TRUE;
}
if (!draw_hdc && !read_hdc)
{
context->draw_hwnd = NULL;
context->draw_view = NULL;
context->draw_pbuffer = NULL;
}
else if ((hwnd = WindowFromDC(draw_hdc)))
if ((hwnd = WindowFromDC(draw_hdc)))
{
if (!(data = get_win_data(hwnd)))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment