From a6597771009ef4832b6027b3b8835d3bd2613228 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 26 Jul 2004 06:11:23 +0000
Subject: [PATCH] removed gl_delayfinish cvar as it's now a speed loss with
 gl_finish 0

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4289 d7cf8633-e32d-0410-b094-e92efae38249
---
 gl_backend.c | 28 ++++------------------------
 menu.c       |  6 +-----
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/gl_backend.c b/gl_backend.c
index 89f20175..a06484bc 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -7,7 +7,6 @@
 cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1"};
 cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0"};
 cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0"};
-cvar_t gl_delayfinish = {CVAR_SAVE, "gl_delayfinish", "0"};
 cvar_t gl_paranoid = {0, "gl_paranoid", "0"};
 cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0"};
 
@@ -210,7 +209,6 @@ void gl_backend_init(void)
 	Cvar_RegisterVariable(&gl_polyblend);
 	Cvar_RegisterVariable(&gl_dither);
 	Cvar_RegisterVariable(&gl_lockarrays);
-	Cvar_RegisterVariable(&gl_delayfinish);
 	Cvar_RegisterVariable(&gl_paranoid);
 	Cvar_RegisterVariable(&gl_printcheckerror);
 #ifdef NORENDER
@@ -1262,14 +1260,6 @@ text to the screen.
 */
 void SCR_UpdateScreen (void)
 {
-	if (gl_delayfinish.integer)
-	{
-		R_Mesh_Finish();
-		R_TimeReport("meshfinish");
-		VID_Finish();
-		R_TimeReport("finish");
-	}
-
 	R_Mesh_Start();
 
 	if (r_textureunits.integer > gl_textureunits)
@@ -1380,20 +1370,10 @@ showtris:
 		goto showtris;
 	}
 
-	if (gl_delayfinish.integer)
-	{
-		// tell driver to commit it's partially full geometry queue to the rendering queue
-		// (this doesn't wait for the commands themselves to complete)
-		if (gl_finish.integer)
-			qglFlush();
-	}
-	else
-	{
-		R_Mesh_Finish();
-		R_TimeReport("meshfinish");
-		VID_Finish();
-		R_TimeReport("finish");
-	}
+	R_Mesh_Finish();
+	R_TimeReport("meshfinish");
+	VID_Finish();
+	R_TimeReport("finish");
 }
 
 
diff --git a/menu.c b/menu.c
index 8cf8ca2e..caaf255d 100644
--- a/menu.c
+++ b/menu.c
@@ -1171,7 +1171,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 38
+#define OPTIONS_ITEMS 37
 
 int options_cursor;
 
@@ -1183,7 +1183,6 @@ void M_Menu_Options_f (void)
 }
 
 extern cvar_t snd_staticvolume;
-extern cvar_t gl_delayfinish;
 extern cvar_t slowmo;
 extern dllhandle_t jpeg_dll;
 extern cvar_t gl_texture_anisotropy;
@@ -1218,8 +1217,6 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
 	else if (options_cursor == optnum++)
@@ -1343,7 +1340,6 @@ void M_Options_Draw (void)
 	M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
 	M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
 	M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
-	M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
 	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
 	M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
 	M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
-- 
2.39.2