rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-02 14:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing all compiler warnings in the new renderer

Browse source
This commit is contained in:
Richard Allen 2011-03-13 15:34:59 +00:00
parent 95ec01d160
commit e0ed1aa618
4 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/code/renderer/tr_backend.c
View file

@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
backEndData_t *backEndData[SMP_FRAMES]; backEndData_t *backEndData[SMP_FRAMES];
backEndState_t backEnd; backEndState_t backEnd;
void RB_InstantQuad(vec4_t quadVerts[4]);
static float s_flipMatrix[16] = { static float s_flipMatrix[16] = {
// convert from our coordinate system (looking down X) // convert from our coordinate system (looking down X)

14
reaction/code/renderer/tr_bsp.c
View file

@ -40,7 +40,7 @@ int c_subdivisions;
int c_gridVerts; int c_gridVerts;
//=============================================================================== //===============================================================================
/*
static void HSVtoRGB( float h, float s, float v, float rgb[3] ) static void HSVtoRGB( float h, float s, float v, float rgb[3] )
{ {
int i; int i;
@ -90,7 +90,7 @@ static void HSVtoRGB( float h, float s, float v, float rgb[3] )
break; break;
} }
} }
*/
/* /*
=============== ===============
R_ColorShiftLightingBytes R_ColorShiftLightingBytes
@ -130,6 +130,7 @@ static void R_ColorShiftLightingBytes( byte in[4], byte out[4] ) {
R_ColorShiftLightingFloats R_ColorShiftLightingFloats
=============== ===============
*/ */
/*
static void R_ColorShiftLightingFloats(const vec4_t in, vec4_t out) static void R_ColorShiftLightingFloats(const vec4_t in, vec4_t out)
{ {
int shift, r, g, b; int shift, r, g, b;
@ -159,7 +160,7 @@ static void R_ColorShiftLightingFloats(const vec4_t in, vec4_t out)
out[2] = b * (1.0f / 255.0f); out[2] = b * (1.0f / 255.0f);
out[3] = in[3]; out[3] = in[3];
} }
*/
/* /*
=============== ===============
R_LoadLightmaps R_LoadLightmaps
@ -1540,7 +1541,7 @@ static void CopyVert(const srfVert_t * in, srfVert_t * out)
R_CreateWorldVBO R_CreateWorldVBO
=============== ===============
*/ */
static void R_CreateWorldVBO() static void R_CreateWorldVBO(void)
{ {
int i, j, k; int i, j, k;
@ -2500,7 +2501,7 @@ R_MergeLeafSurfaces
Merges surfaces that share a common leaf Merges surfaces that share a common leaf
================= =================
*/ */
void R_MergeLeafSurfaces() void R_MergeLeafSurfaces(void)
{ {
int i, j, k; int i, j, k;
int numWorldSurfaces; int numWorldSurfaces;
@ -2777,6 +2778,9 @@ void R_MergeLeafSurfaces()
} }
} }
break; break;
default:
break;
} }
} }

20
reaction/code/renderer/tr_shade.c
View file

@ -318,7 +318,7 @@ static void DrawTris (shaderCommands_t *input) {
if (input->multiDrawPrimitives) if (input->multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes);
} }
else else
{ {
@ -732,7 +732,7 @@ static void DrawMultitexturedVBO( shaderCommands_t *input, int stage ) {
if (input->multiDrawPrimitives) if (input->multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes);
} }
else else
{ {
@ -1167,7 +1167,7 @@ static void ProjectDlightTextureVBOGLSL( void ) {
if (tess.multiDrawPrimitives) if (tess.multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(tess.multiDrawPrimitives, tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); R_DrawMultiElementsVBO(tess.multiDrawPrimitives, (const GLvoid **) tess.multiDrawFirstIndex, tess.multiDrawNumIndexes);
} }
else else
{ {
@ -1295,7 +1295,7 @@ static void RB_FogPassVBOGLSL( void ) {
if (tess.multiDrawPrimitives) if (tess.multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(tess.multiDrawPrimitives, tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); R_DrawMultiElementsVBO(tess.multiDrawPrimitives, (const GLvoid **) tess.multiDrawFirstIndex, tess.multiDrawNumIndexes);
} }
else else
{ {
@ -1628,6 +1628,8 @@ static void ComputeHelperColor( shaderStage_t *pStage, vec4_t color)
color[3] = 0.0f; color[3] = 0.0f;
} }
break; break;
default:
break;
} }
// //
@ -2082,6 +2084,8 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
break; break;
case TCGEN_BAD: case TCGEN_BAD:
return; return;
default:
break;
} }
// //
@ -2285,7 +2289,7 @@ static void RB_IterateStagesGenericVBO( shaderCommands_t *input )
if (input->multiDrawPrimitives) if (input->multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes);
} }
else else
{ {
@ -2348,7 +2352,7 @@ static void DrawMultitexturedVBOGLSL( shaderProgram_t *sp, shaderCommands_t *inp
if (input->multiDrawPrimitives) if (input->multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes);
} }
else else
{ {
@ -2495,6 +2499,8 @@ static void RB_IterateStagesGenericVBOGLSL( shaderCommands_t *input )
{ {
vec4_t color; vec4_t color;
// JBravo: silincing a compiler warning about color being uninitialized
MAKERGBA(color, 1.f, 1.f, 1.f, 1.f);
ComputeHelperColor (pStage, color); ComputeHelperColor (pStage, color);
GLSL_SetUniform_Color(sp, color); GLSL_SetUniform_Color(sp, color);
} }
@ -2571,7 +2577,7 @@ static void RB_IterateStagesGenericVBOGLSL( shaderCommands_t *input )
if (input->multiDrawPrimitives) if (input->multiDrawPrimitives)
{ {
R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes);
} }
else else
{ {

2
reaction/code/renderer/tr_shader.c
View file

@ -1724,7 +1724,7 @@ Check which vertex attributes we only need, so we
don't need to submit/copy all of them. don't need to submit/copy all of them.
=================== ===================
*/ */
static void ComputeVertexAttribs() static void ComputeVertexAttribs(void)
{ {
int i, stage; int i, stage;