From 3fefb6b2abbc1aa2d5af98b0dd81bd19778bde7a Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 16 Nov 2014 11:53:12 -0600 Subject: Correct a few OpenGL variable types Affectly no change for desktop OpenGL. Use correct types for OpenGLES support. --- src/renderergl1/tr_backend.c | 2 +- src/renderergl1/tr_shade.c | 4 ++-- src/renderergl1/tr_surface.c | 3 ++- src/renderergl2/tr_backend.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/renderergl1/tr_backend.c b/src/renderergl1/tr_backend.c index 46284bfa..18a033b6 100644 --- a/src/renderergl1/tr_backend.c +++ b/src/renderergl1/tr_backend.c @@ -475,7 +475,7 @@ void RB_BeginDrawingView (void) { // clip to the plane of the portal if ( backEnd.viewParms.isPortal ) { 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/src/renderergl1/tr_shade.c b/src/renderergl1/tr_shade.c index b6d6dbaf..7d3ac8da 100644 --- a/src/renderergl1/tr_shade.c +++ b/src/renderergl1/tr_shade.c @@ -422,7 +422,7 @@ static void ProjectDlightTexture_altivec( void ) { byte clipBits[SHADER_MAX_VERTEXES]; float texCoordsArray[SHADER_MAX_VERTEXES][2]; byte colorArray[SHADER_MAX_VERTEXES][4]; - unsigned hitIndexes[SHADER_MAX_INDEXES]; + glIndex_t hitIndexes[SHADER_MAX_INDEXES]; int numIndexes; float scale; float radius; @@ -594,7 +594,7 @@ static void ProjectDlightTexture_scalar( void ) { byte clipBits[SHADER_MAX_VERTEXES]; float texCoordsArray[SHADER_MAX_VERTEXES][2]; byte colorArray[SHADER_MAX_VERTEXES][4]; - unsigned hitIndexes[SHADER_MAX_INDEXES]; + glIndex_t hitIndexes[SHADER_MAX_INDEXES]; int numIndexes; float scale; float radius; diff --git a/src/renderergl1/tr_surface.c b/src/renderergl1/tr_surface.c index 8bb01229..b3041f4c 100644 --- a/src/renderergl1/tr_surface.c +++ b/src/renderergl1/tr_surface.c @@ -908,7 +908,8 @@ RB_SurfaceFace */ static void RB_SurfaceFace( srfSurfaceFace_t *surf ) { int i; - unsigned *indices, *tessIndexes; + unsigned *indices; + glIndex_t *tessIndexes; float *v; float *normal; int ndx; diff --git a/src/renderergl2/tr_backend.c b/src/renderergl2/tr_backend.c index 8f82a6a2..4810ba2d 100644 --- a/src/renderergl2/tr_backend.c +++ b/src/renderergl2/tr_backend.c @@ -549,7 +549,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]; -- cgit