got rid of node->contents, leaf->contents kept (only needed temporarily during loadin...

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 4df6fb707ab1a0bf7afcf2181f9e1f2804ddcf9c..70336a9c216c1fa2b2c49e77f700b2bb56df114d 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -619,7 +619,8 @@ void VID_Finish (void)
        if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
        {
                vid_usingvsync = vid_usevsync;
-               qglXSwapIntervalSGI (vid_usevsync);
+               if (qglXSwapIntervalSGI (vid_usevsync))
+                       Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n");
        }
 
 // handle the mouse state when windowed if that's changed
@@ -877,6 +878,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
 
        vid_usingmouse = false;
+       vid_usingvsync = false;
        ignoremousemove = true;
        vid_hidden = false;
        vid_activewindow = true;