Module: wine Branch: stable Commit: bb168675f7a76452f1ef04cfaa100e320484fde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb168675f7a76452f1ef04cfa...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jan 26 13:35:38 2018 +0100
winex11: Use the correct colormap for the OpenGL parent window.
Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit d6332e0e57a7206e0caf5cf15b509c1ab4769a40) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/winex11.drv/opengl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc..27ff670 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1368,10 +1368,13 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XSetWindowAttributes attrib;
attrib.override_redirect = True; + attrib.border_pixel = 0; if (!dummy_parent) { + attrib.colormap = default_colormap; dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, - InputOutput, default_visual.visual, CWOverrideRedirect, &attrib ); + InputOutput, default_visual.visual, + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); XMapWindow( gdi_display, dummy_parent ); } gl->colormap = XCreateColormap(gdi_display, dummy_parent, gl->visual->visual, @@ -1386,7 +1389,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, gl->visual->depth, InputOutput, gl->visual->visual, - CWColormap | CWOverrideRedirect, &attrib ); + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) { gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL );