From d9835a6541d8ae9485eb86c1a79ea14f90edcffc Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 30 Apr 2002 06:28:21 +0000
Subject: [PATCH] more cleaning - glTexParameterf replaced with glTexParameteri

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1800 d7cf8633-e32d-0410-b094-e92efae38249
---
 gl_draw.c     |  8 ++++----
 gl_textures.c | 18 +++++++++---------
 r_clip.c      | 14 ++++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/gl_draw.c b/gl_draw.c
index 7ff921e1..a82e009e 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -343,16 +343,16 @@ void R_DrawQueue(void)
 	/*
 	if (vid.realwidth <= (int) vid.conwidth)
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		CHECKGLERROR
 	}
 	else
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		CHECKGLERROR
 	}
 	*/
diff --git a/gl_textures.c b/gl_textures.c
index 7c1d44c3..f8f1fa38 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -362,10 +362,10 @@ static void GL_TextureMode_f (void)
 			{
 				glBindTexture(GL_TEXTURE_2D, image->texnum);
 				if (image->flags & TEXF_MIPMAP)
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 				else
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 			}
 		}
 	}
@@ -554,9 +554,9 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
 			memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->bytesperpixel);
 			glTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
 			CHECKGLERROR
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
 			CHECKGLERROR
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 			CHECKGLERROR
 		}
 
@@ -647,16 +647,16 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
 			CHECKGLERROR
 		}
 
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 		CHECKGLERROR
 	}
 	else
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 		CHECKGLERROR
 	}
 }
diff --git a/r_clip.c b/r_clip.c
index cca91702..ee67e2b2 100644
--- a/r_clip.c
+++ b/r_clip.c
@@ -871,6 +871,7 @@ void ScanEdges (void)
 
 void R_Clip_DisplayBuffer(void)
 {
+	/*
 #if CLIPTEST
 	int i;
 	static int firstupload = true;
@@ -887,12 +888,12 @@ void R_Clip_DisplayBuffer(void)
 		glTexImage2D(GL_TEXTURE_2D, 0, 1, 256, 256, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, clipbuffertex);
 	}
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	if (lighthalf)
-		glColor3f(0.5, 0.5, 0.5);
+		glColor4ub(0.5, 0.5, 0.5);
 	else
-		glColor3f(1, 1, 1);
+		glColor4ub(1, 1, 1);
 	firstupload = false;
 	b = clipbuffertex;
 	for (i = 0;i < clipwidth*clipheight;i++)
@@ -910,9 +911,10 @@ void R_Clip_DisplayBuffer(void)
 	glTexCoord2f (0                 , clipheight / 256.0f);glVertex2f (0           , vid.conheight);
 	glEnd ();
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-//	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+//	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+//	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 #endif
+	*/
 }
 
 float boxpoints[4*3];
-- 
2.39.2