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

winemac: Add a new registry setting, OpenGLSurfaceMode, to control how GL surfaces relate to the window. 

The default behavior is that GL surfaces are on top of all non-GL content in
the window.  This maximizes the performance for the common case of games, but
clipping by parents, siblings, and child windows isn't respected.

Setting OpenGLSurfaceMode to "behind" pushes the GL surface to be behind the
Mac window.  The window has transparent holes punched through it so that the GL
surface shows through.  USER32 and the wineserver take care of making sure the
holes are only where the GL windows would be unclipped and unoccluded.  Because
the OS X window server has to composite the GL surface with the window, this
limits the framerate.

Since the Mac driver has no server-side rendering path, GDI rendering to a
window which has a GL surface doesn't work.  As a partial workaround, mostly
for cases where a GL surface is created but never used, setting
OpenGLSurfaceMode to "transparent" allows the GDI rendering to show through the
transparent parts of the GL surface.  The GDI rendering is drawn to the
top-level window's surface as normal.  (The behavior of user32 to exclude the
portion covered by a GL window from GDI rendering is disabled.)  The GL surface
is in front of the window but potentially wholly or partially transparent.  It
is composited with the window behind it.

The GL surface is initially cleared to be completely transparent.  So, if
no GL rendering is done, the window will appear as though the GL surface didn't
exist.
This commit is contained in:
Ken Thomases 2015-09-14 20:35:25 -05:00 committed by Alexandre Julliard
parent 7e7b4de4b2
commit 47708c2635
5 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ - (void) clearToBlackIfNeeded
glDrawBuffer(GL_FRONT_AND_BACK);
glDisable(GL_SCISSOR_TEST);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearColor(0, 0, 0, 1);
glClearColor(0, 0, 0, gl_surface_mode == GL_SURFACE_IN_FRONT_TRANSPARENT ? 0 : 1);
glClear(GL_COLOR_BUFFER_BIT);

31
dlls/winemac.drv/cocoa_window.m
View File

@ -198,6 +198,7 @@ @interface WineWindow ()
@property (readonly, copy, nonatomic) NSArray* childWineWindows;
- (void) updateColorSpace;
- (void) updateForGLSubviews;
- (BOOL) becameEligibleParentOrChild;
- (void) becameIneligibleChild;
@ -334,14 +335,14 @@ - (void) addGLContext:(WineOpenGLContext*)context
[self setNeedsDisplay:YES];
}
[(WineWindow*)[self window] updateColorSpace];
[(WineWindow*)[self window] updateForGLSubviews];
}
- (void) removeGLContext:(WineOpenGLContext*)context
{
[glContexts removeObjectIdenticalTo:context];
[pendingGlContexts removeObjectIdenticalTo:context];
[(WineWindow*)[self window] updateColorSpace];
[(WineWindow*)[self window] updateForGLSubviews];
}
- (void) updateGLContexts
@ -1402,7 +1403,8 @@ - (void) setDisabled:(BOOL)newValue
- (BOOL) needsTransparency
{
return self.shape || self.colorKeyed || self.usePerPixelAlpha;
return self.shape || self.colorKeyed || self.usePerPixelAlpha ||
(gl_surface_mode == GL_SURFACE_BEHIND && [[self.contentView valueForKeyPath:@"subviews.@max.hasGLContext"] boolValue]);
}
- (void) checkTransparency
@ -1775,6 +1777,13 @@ - (void) updateColorSpace
[self setColorSpace:[NSColorSpace genericRGBColorSpace]];
}
- (void) updateForGLSubviews
{
[self updateColorSpace];
if (gl_surface_mode == GL_SURFACE_BEHIND)
[self checkTransparency];
}
/*
* ---------- NSResponder method overrides ----------
@ -2683,7 +2692,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect)
name:NSApplicationDidChangeScreenParametersNotification
object:NSApp];
[[window contentView] addSubview:view];
[window updateColorSpace];
[window updateForGLSubviews];
});
[pool release];
@ -2712,7 +2721,7 @@ void macdrv_dispose_view(macdrv_view v)
object:NSApp];
[view removeFromSuperview];
[view release];
[window updateColorSpace];
[window updateForGLSubviews];
});
[pool release];
@ -2737,15 +2746,15 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec
BOOL changedWindow = (window && window != [view window]);
NSRect newFrame = NSRectFromCGRect(rect);
NSRect oldFrame = [view frame];
BOOL needUpdateWindowColorSpace = FALSE;
BOOL needUpdateWindowForGLSubviews = FALSE;
if (changedWindow)
{
WineWindow* oldWindow = (WineWindow*)[view window];
[view removeFromSuperview];
[oldWindow updateColorSpace];
[oldWindow updateForGLSubviews];
[[window contentView] addSubview:view];
needUpdateWindowColorSpace = TRUE;
needUpdateWindowForGLSubviews = TRUE;
}
if (!NSEqualRects(oldFrame, newFrame))
@ -2759,11 +2768,11 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec
else
[view setFrame:newFrame];
[view setNeedsDisplay:YES];
needUpdateWindowColorSpace = TRUE;
needUpdateWindowForGLSubviews = TRUE;
}
if (needUpdateWindowColorSpace)
[(WineWindow*)[view window] updateColorSpace];
if (needUpdateWindowForGLSubviews)
[(WineWindow*)[view window] updateForGLSubviews];
});
[pool release];

7
dlls/winemac.drv/macdrv_cocoa.h
View File

@ -117,6 +117,12 @@
TOPMOST_FLOAT_INACTIVE_ALL,
};
enum {
GL_SURFACE_IN_FRONT_OPAQUE,
GL_SURFACE_IN_FRONT_TRANSPARENT,
GL_SURFACE_BEHIND,
};
enum {
MACDRV_HOTKEY_SUCCESS,
MACDRV_HOTKEY_ALREADY_REGISTERED,
@ -149,6 +155,7 @@
extern int allow_immovable_windows DECLSPEC_HIDDEN;
extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN;
extern int use_precise_scrolling DECLSPEC_HIDDEN;
extern int gl_surface_mode DECLSPEC_HIDDEN;
extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN;
extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN;

11
dlls/winemac.drv/macdrv_main.c
View File

@ -57,6 +57,7 @@ BOOL disable_window_decorations = FALSE;
int allow_immovable_windows = TRUE;
int cursor_clipping_locks_windows = TRUE;
int use_precise_scrolling = TRUE;
int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE;
HMODULE macdrv_module = 0;
@ -183,6 +184,16 @@ static void setup_options(void)
if (!get_config_key(hkey, appkey, "UsePreciseScrolling", buffer, sizeof(buffer)))
use_precise_scrolling = IS_OPTION_TRUE(buffer[0]);
if (!get_config_key(hkey, appkey, "OpenGLSurfaceMode", buffer, sizeof(buffer)))
{
if (!strcmp(buffer, "transparent"))
gl_surface_mode = GL_SURFACE_IN_FRONT_TRANSPARENT;
else if (!strcmp(buffer, "behind"))
gl_surface_mode = GL_SURFACE_BEHIND;
else
gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE;
}
if (appkey) RegCloseKey(appkey);
if (hkey) RegCloseKey(hkey);
}

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

@ -1480,6 +1480,21 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns
return FALSE;
}
if (gl_surface_mode == GL_SURFACE_IN_FRONT_TRANSPARENT)
{
GLint opacity = 0;
err = CGLSetParameter(context->cglcontext, kCGLCPSurfaceOpacity, &opacity);
if (err != kCGLNoError)
WARN("CGLSetParameter(kCGLCPSurfaceOpacity) failed with error %d %s; leaving opaque\n", err, CGLErrorString(err));
}
else if (gl_surface_mode == GL_SURFACE_BEHIND)
{
GLint order = -1;
err = CGLSetParameter(context->cglcontext, kCGLCPSurfaceOrder, &order);
if (err != kCGLNoError)
WARN("CGLSetParameter(kCGLCPSurfaceOrder) failed with error %d %s; leaving in front\n", err, CGLErrorString(err));
}
context->context = macdrv_create_opengl_context(context->cglcontext);
CGLReleaseContext(context->cglcontext);
if (!context->context)
@ -1638,7 +1653,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset)
done:
release_win_data(data);
if (ret) __wine_set_pixel_format(hwnd, fmt);
if (ret && gl_surface_mode == GL_SURFACE_BEHIND) __wine_set_pixel_format(hwnd, fmt);
return ret;
}