[PATCH] Revert "winemac.drv: Actually make the GL context current even if no drawables were given."
Charles Davis
cdavis5x at gmail.com
Mon Feb 29 02:39:07 CST 2016
This reverts commits 38f579f9ba0aba49788c2ce84172ae5237929ef4 and
02416314ab6fb7238b28f0047089adfee4a52abd.
No extant application uses this, nor are the wined3d maintainers
interested in using it.
Signed-off-by: Charles Davis <cdavis5x at gmail.com>
---
dlls/winemac.drv/cocoa_opengl.m | 15 ++++++---------
dlls/winemac.drv/opengl.c | 8 +-------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m
index e1aca77..ec2b191 100644
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -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];
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index f0c7048..ab79a82 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -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)))
{
--
2.7.2
More information about the wine-patches
mailing list