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

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

This reverts commits 38f579f9ba and
02416314ab.

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:
Charles Davis 2016-02-29 01:39:07 -07:00 committed by Alexandre Julliard
parent 1bccc8b027
commit 1eeec9513c
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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];

8
dlls/winemac.drv/opengl.c
View File

@ -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)))
{