removed gl_videosyncavailable variable because on all known platforms it

is always true, and its only purpose was to ghost a menu item

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9554 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/menu.c b/menu.c
index 9b17c584b76b6d4977076ffeb1efd907ff08d868..ddea4654a813cdcd9b756b12317ecf14caf72b00 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2918,7 +2918,7 @@ static void M_Video_Draw (void)
        t++;
 
        // Vertical Sync
-       M_ItemPrint(16, video_cursor_table[t], "         Vertical Sync", gl_videosyncavailable);
+       M_ItemPrint(16, video_cursor_table[t], "         Vertical Sync", true);
        M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
        t++;
 

diff --git a/vid.h b/vid.h
index af70fa56d441712186c0b661f7a9ad9e64ed2a3e..e824f152efd3108a5aaf7b0810fd8188c6f202d8 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -119,9 +119,6 @@ extern char gl_driver[256];
 extern qboolean isG200;
 extern qboolean isRagePro;
 
-// LordHavoc: GLX_SGI_swap_control and WGL_EXT_swap_control
-extern int gl_videosyncavailable;
-
 void *GL_GetProcAddress(const char *name);
 int GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, const char *disableparm, int silent);
 

diff --git a/vid_agl.c b/vid_agl.c
index af5c8b7f9d005c333d00dbce3abde1b37d414690..92341bcf5ac2af6c91ca0a172dc2a4adac45316a 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -701,7 +701,6 @@ qboolean VID_InitMode(viddef_mode_t *mode)
 
        gl_platformextensions = "";
        gl_platform = "AGL";
-       gl_videosyncavailable = true;
 
        multithreadedgl = false;
        vid_isfullscreen = mode->fullscreen;

diff --git a/vid_glx.c b/vid_glx.c
index 4fbb2d83592a81039c3bb56b82d05a2263a873ce..9202cffff1a7a066c8be57ba15874c6d7a9797db 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -689,8 +689,8 @@ void InitSig(void)
 
 void VID_Finish (void)
 {
-       vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
-       if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
+       vid_usevsync = vid_vsync.integer && !cls.timedemo && qglXSwapIntervalSGI;
+       if (vid_usingvsync != vid_usevsync)
        {
                vid_usingvsync = vid_usevsync;
                if (qglXSwapIntervalSGI (vid_usevsync))
@@ -1029,7 +1029,7 @@ qboolean VID_InitMode(viddef_mode_t *mode)
 // COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control
 // COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control
 // COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
-       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
+       GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
 
        vid_usingmousegrab = false;
        vid_usingmouse = false;

diff --git a/vid_sdl.c b/vid_sdl.c
index c368bbc126f650cd257891f824c096a6479a4d46..7a3076a3ce731600d2cefed39094fe3c29637936 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -761,7 +761,6 @@ qboolean VID_InitMode(viddef_mode_t *mode)
 
        gl_platform = "SDL";
        gl_platformextensions = "";
-       gl_videosyncavailable = true;
 
        GL_Init();
 

diff --git a/vid_shared.c b/vid_shared.c
index dcaf8a81b90ae631bff30c0f01057e538e764a45..89663070651717ace451a83f70229f6ab7be8ef1 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -27,8 +27,6 @@ int gl_textureunits = 1;
 int gl_combine_extension = false;
 // GL_EXT_compiled_vertex_array
 int gl_supportslockarrays = false;
-// GLX_SGI_swap_control or WGL_EXT_swap_control
-int gl_videosyncavailable = false;
 // 3D textures available
 int gl_texture3d = false;
 // GL_ARB_texture_cubemap

diff --git a/vid_wgl.c b/vid_wgl.c
index 1b6a27a1ef6624baac3a9d5b0acb1d4b1c7a37f2..0eebe7d098cf61cd1975c0e92cbb201b9e08f336 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -250,8 +250,8 @@ static void IN_StartupMouse (void);
 
 void VID_Finish (void)
 {
-       vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
-       if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
+       vid_usevsync = vid_vsync.integer && !cls.timedemo && qwglSwapIntervalEXT;
+       if (vid_usingvsync != vid_usevsync)
        {
                vid_usingvsync = vid_usevsync;
                qwglSwapIntervalEXT (vid_usevsync);
@@ -1223,7 +1223,7 @@ qboolean VID_InitMode(viddef_mode_t *mode)
        ClearAllStates ();
 
 // COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
-       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
+       GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
 
        GL_Init ();
 
@@ -1238,7 +1238,7 @@ qboolean VID_InitMode(viddef_mode_t *mode)
        IN_StartupMouse ();
        IN_StartupJoystick ();
 
-       if (gl_videosyncavailable)
+       if (qwglSwapIntervalEXT)
        {
                vid_usevsync = vid_vsync.integer != 0;
                vid_usingvsync = vid_vsync.integer != 0;