From e596d336891db86a2fb84791f5db7de764e33c08 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 7 Dec 2009 16:04:50 +0000
Subject: [PATCH] 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
---
 menu.c       | 2 +-
 vid.h        | 3 ---
 vid_agl.c    | 1 -
 vid_glx.c    | 6 +++---
 vid_sdl.c    | 1 -
 vid_shared.c | 2 --
 vid_wgl.c    | 8 ++++----
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/menu.c b/menu.c
index 9b17c584..ddea4654 100644
--- 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 af70fa56..e824f152 100644
--- 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 af5c8b7f..92341bcf 100644
--- 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 4fbb2d83..9202cfff 100644
--- 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 c368bbc1..7a3076a3 100644
--- 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 dcaf8a81..89663070 100644
--- 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 1b6a27a1..0eebe7d0 100644
--- 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;
-- 
2.39.2