winex11.drv: Allow disabling vertical sync using EXT_swap_control.

EXT_swap_control redefines glXSwapIntervalSGI() as glXSwapIntervalEXT() on the current drawable (if any), and glXSwapIntervalEXT() supports disabling vsync.

winex11.drv: Allow disabling vertical sync using EXT_swap_control.
727ecc17 · Henri Verbeet · Alexandre Julliard · 015ad93d · 727ecc17
Commit 727ecc17 authored Mar 07, 2011 by Henri Verbeet Committed by Alexandre Julliard Mar 08, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

opengl.c dlls/winex11.drv/opengl.c +5 -1

No files found.
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -150,6 +150,7 @@ static Wine_GLContext *context_list;
 static struct WineGLInfo WineGLInfo = { 0 };
 static int use_render_texture_emulation = 1;
 static int use_render_texture_ati = 0;
+static BOOL has_swap_control;
 static int swap_interval = 1;

 #define MAX_EXTENSIONS 16
@@ -3424,7 +3425,7 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) {
        SetLastError(ERROR_INVALID_DATA);
        return FALSE;
    }
-    else if (interval == 0)
+    else if (!has_swap_control && interval == 0)
    {
        /* wglSwapIntervalEXT considers an interval value of zero to mean that
         * vsync should be disabled, but glXSwapIntervalSGI considers such a
@@ -3738,6 +3739,9 @@ static void X11DRV_WineGL_LoadExtensions(void)
    if(glxRequireExtension("GLX_EXT_fbconfig_packed_float"))
        register_extension_string("WGL_EXT_pixel_format_packed_float");

+    if (glxRequireExtension("GLX_EXT_swap_control"))
+        has_swap_control = TRUE;
+
    /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */
    if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL)
        register_extension(&WGL_NV_vertex_array_range);