winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control.

This was removed in e75bc622, but appears to mitigate lack of OML_sync_control in at least some setups. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control.
14ec499d · Henri Verbeet · Alexandre Julliard · 549934ee · 14ec499d · 14ec499d
Commit 14ec499d authored Mar 16, 2018 by Henri Verbeet Committed by Alexandre Julliard Mar 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

init.c dlls/winex11.drv/init.c +1 -0

opengl.c dlls/winex11.drv/opengl.c +3 -0

x11drv.h dlls/winex11.drv/x11drv.h +1 -0

No files found.
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -259,6 +259,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
                    RECT rect = physDev->dc_rect;

                    OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top );
+                    if (data->flush) XFlush( gdi_display );
                    XSetFunction( gdi_display, physDev->gc, GXcopy );
                    XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc,
                               0, 0, rect.right, rect.bottom,

--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1976,6 +1976,7 @@ static void wglFinish(void)

    escape.code = X11DRV_FLUSH_GL_DRAWABLE;
    escape.gl_drawable = 0;
+    escape.flush = FALSE;

    if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
    {
@@ -2001,6 +2002,7 @@ static void wglFlush(void)

    escape.code = X11DRV_FLUSH_GL_DRAWABLE;
    escape.gl_drawable = 0;
+    escape.flush = FALSE;

    if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
    {
@@ -3286,6 +3288,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc )

    escape.code = X11DRV_FLUSH_GL_DRAWABLE;
    escape.gl_drawable = 0;
+    escape.flush = !pglXWaitForSbcOML;

    if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc )))
    {

--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -304,6 +304,7 @@ struct x11drv_escape_flush_gl_drawable
 {
    enum x11drv_escape_codes code;         /* escape code (X11DRV_FLUSH_GL_DRAWABLE) */
    Drawable                 gl_drawable;  /* GL drawable */
+    BOOL                     flush;        /* flush X11 before copying */
 };

 /**************************************************************************