From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 13 Mar 2004 23:12:35 +0000 (+0000)
Subject: fixed gl_paranoid warnings caused by gl_texture_anisotropy being less than 1, it... 
X-Git-Tag: xonotic-v0.1.0preview~5998
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=924528ec4b469b662254228e7993fa6af35efddd;p=xonotic%2Fdarkplaces.git

fixed gl_paranoid warnings caused by gl_texture_anisotropy being less than 1, it is now bound to 1-128 range


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

diff --git a/gl_textures.c b/gl_textures.c
index ad9a4ca9..0b03b0a4 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -8,7 +8,7 @@ cvar_t	r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"};
 cvar_t	r_picmip = {CVAR_SAVE, "r_picmip", "0"};
 cvar_t	r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
 cvar_t	r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
-cvar_t  gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "0"};
+cvar_t  gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1"};
 
 int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
 int		gl_filter_mag = GL_LINEAR;
@@ -571,40 +571,62 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 	CHECKGLERROR
 
 	if (gl_support_anisotropy)
-		qglTexParameterf(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_texture_anisotropy.value);
-	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);
-	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);
+	{
+		int aniso = bound(1, gl_texture_anisotropy.integer, 128);
+		if (gl_texture_anisotropy.integer != aniso)
+			Cvar_SetValueQuick(&gl_texture_anisotropy, aniso);
+		qglTexParameteri(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso);CHECKGLERROR
+	}
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR
 	if (gltexturetypedimensions[texturetype] >= 3)
-		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);
+	{
+		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);CHECKGLERROR
+	}
 
+	CHECKGLERROR
 	if (flags & TEXF_FORCENEAREST)
 	{
 		if (flags & TEXF_MIPMAP)
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR
+		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);CHECKGLERROR
 	}
 	else if (flags & TEXF_FORCELINEAR)
 	{
 		if (flags & TEXF_MIPMAP)
 		{
 			if (gl_filter_min == GL_NEAREST_MIPMAP_LINEAR || gl_filter_min == GL_LINEAR_MIPMAP_LINEAR)
-				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);CHECKGLERROR
+			}
 			else
-				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR
+			}
 		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR
 	}
 	else
 	{
 		if (flags & TEXF_MIPMAP)
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
+		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
 	}
 
 	CHECKGLERROR
diff --git a/menu.c b/menu.c
index fd3bee90..180fb135 100644
--- a/menu.c
+++ b/menu.c
@@ -1212,7 +1212,7 @@ void M_Menu_Options_AdjustSliders (int dir)
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
 	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8));
+		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value + dir, 8));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
 	else if (options_cursor == optnum++)
@@ -1337,7 +1337,7 @@ void M_Options_Draw (void)
 	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.value, 0, 8);
+	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 1, 8);
 	M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
 	M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
 	M_Options_PrintSlider(  "      Sound Volume", snd_initialized.integer, volume.value, 0, 1);