[iortcw] 249/497: All: Correct a few OpenGL variable types

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit f4997de3580a927cc943e94419383f3618eb0e0d
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Nov 17 19:19:56 2014 +0000

    All: Correct a few OpenGL variable types
---
 MP/code/rend2/tr_backend.c    | 2 +-
 MP/code/renderer/tr_backend.c | 2 +-
 MP/code/renderer/tr_shade.c   | 8 --------
 MP/code/renderer/tr_surface.c | 6 +++---
 SP/code/rend2/tr_backend.c    | 2 +-
 SP/code/renderer/tr_backend.c | 2 +-
 SP/code/renderer/tr_shade.c   | 8 --------
 SP/code/renderer/tr_surface.c | 6 +++---
 8 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/MP/code/rend2/tr_backend.c b/MP/code/rend2/tr_backend.c
index dfdb0b7..8543e00 100644
--- a/MP/code/rend2/tr_backend.c
+++ b/MP/code/rend2/tr_backend.c
@@ -614,7 +614,7 @@ void RB_BeginDrawingView( void ) {
 	if ( backEnd.viewParms.isPortal ) {
 #if 0
 		float plane[4];
-		double plane2[4];
+		GLdouble plane2[4];
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
 		plane[1] = backEnd.viewParms.portalPlane.normal[1];
diff --git a/MP/code/renderer/tr_backend.c b/MP/code/renderer/tr_backend.c
index b0fa5e8..9356bac 100644
--- a/MP/code/renderer/tr_backend.c
+++ b/MP/code/renderer/tr_backend.c
@@ -556,7 +556,7 @@ void RB_BeginDrawingView( void ) {
 #ifdef VCMODS_OPENGLES
 		float	plane2[4];
 #else
-		double plane2[4];
+		GLdouble plane2[4];
 #endif
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
diff --git a/MP/code/renderer/tr_shade.c b/MP/code/renderer/tr_shade.c
index 69bf340..ae7d9e8 100644
--- a/MP/code/renderer/tr_shade.c
+++ b/MP/code/renderer/tr_shade.c
@@ -474,11 +474,7 @@ static void ProjectDlightTexture_altivec( void ) {
 	byte	clipBits[SHADER_MAX_VERTEXES];
 	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-#ifdef VCMODS_OPENGLES
 	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-#else
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-#endif
 	int		numIndexes;
 	float	scale;
 	float	radius;
@@ -678,11 +674,7 @@ static void ProjectDlightTexture_scalar( void ) {
 	byte	clipBits[SHADER_MAX_VERTEXES];
 	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-#ifdef VCMODS_OPENGLES
 	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-#else
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-#endif
 	int		numIndexes;
 	float	scale;
 	float	radius;
diff --git a/MP/code/renderer/tr_surface.c b/MP/code/renderer/tr_surface.c
index d9ea120..362a9ef 100644
--- a/MP/code/renderer/tr_surface.c
+++ b/MP/code/renderer/tr_surface.c
@@ -1172,11 +1172,11 @@ RB_SurfaceFace
 static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 	int i;
 #ifdef VCMODS_OPENGLES
-	unsigned int *indices;
-	glIndex_t	*tessIndexes;
+	unsigned int	*indices;
 #else
-	unsigned    *indices, *tessIndexes;
+	unsigned	*indices;
 #endif
+	glIndex_t	*tessIndexes;
 	float       *v;
 	float       *normal;
 	int ndx;
diff --git a/SP/code/rend2/tr_backend.c b/SP/code/rend2/tr_backend.c
index 641d365..b6086d2 100644
--- a/SP/code/rend2/tr_backend.c
+++ b/SP/code/rend2/tr_backend.c
@@ -619,7 +619,7 @@ void RB_BeginDrawingView( void ) {
 	if ( backEnd.viewParms.isPortal ) {
 #if 0
 		float plane[4];
-		double plane2[4];
+		GLdouble plane2[4];
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
 		plane[1] = backEnd.viewParms.portalPlane.normal[1];
diff --git a/SP/code/renderer/tr_backend.c b/SP/code/renderer/tr_backend.c
index 7d6c2b2..a9ecbf2 100644
--- a/SP/code/renderer/tr_backend.c
+++ b/SP/code/renderer/tr_backend.c
@@ -562,7 +562,7 @@ void RB_BeginDrawingView( void ) {
 #ifdef VCMODS_OPENGLES
 		float	plane2[4];
 #else
-		double plane2[4];
+		GLdouble plane2[4];
 #endif
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
diff --git a/SP/code/renderer/tr_shade.c b/SP/code/renderer/tr_shade.c
index f2e3b89..37de148 100644
--- a/SP/code/renderer/tr_shade.c
+++ b/SP/code/renderer/tr_shade.c
@@ -480,11 +480,7 @@ static void ProjectDlightTexture_altivec( void ) {
 	byte	clipBits[SHADER_MAX_VERTEXES];
 	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-#ifdef VCMODS_OPENGLES
 	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-#else
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-#endif
 	int		numIndexes;
 	float	scale;
 	float	radius;
@@ -684,11 +680,7 @@ static void ProjectDlightTexture_scalar( void ) {
 	byte	clipBits[SHADER_MAX_VERTEXES];
 	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-#ifdef VCMODS_OPENGLES
 	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-#else
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-#endif
 	int		numIndexes;
 	float	scale;
 	float	radius;
diff --git a/SP/code/renderer/tr_surface.c b/SP/code/renderer/tr_surface.c
index 6e28b44..f4a3ca6 100644
--- a/SP/code/renderer/tr_surface.c
+++ b/SP/code/renderer/tr_surface.c
@@ -1171,11 +1171,11 @@ RB_SurfaceFace
 void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 	int i;
 #ifdef VCMODS_OPENGLES
-	unsigned int *indices;
-	glIndex_t	*tessIndexes;
+	unsigned int	*indices;
 #else
-	unsigned    *indices, *tessIndexes;
+	unsigned	*indices;
 #endif
+	glIndex_t	*tessIndexes;
 	float       *v;
 	float       *normal;
 	int ndx;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git