diff --git a/reaction/code/renderer/tr_backend.c b/reaction/code/renderer/tr_backend.c index a3bb0ea4..413641ac 100644 --- a/reaction/code/renderer/tr_backend.c +++ b/reaction/code/renderer/tr_backend.c @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA backEndData_t *backEndData[SMP_FRAMES]; backEndState_t backEnd; +void RB_InstantQuad(vec4_t quadVerts[4]); static float s_flipMatrix[16] = { // convert from our coordinate system (looking down X) diff --git a/reaction/code/renderer/tr_bsp.c b/reaction/code/renderer/tr_bsp.c index 9be4014f..dc051643 100644 --- a/reaction/code/renderer/tr_bsp.c +++ b/reaction/code/renderer/tr_bsp.c @@ -40,7 +40,7 @@ int c_subdivisions; int c_gridVerts; //=============================================================================== - +/* static void HSVtoRGB( float h, float s, float v, float rgb[3] ) { int i; @@ -90,7 +90,7 @@ static void HSVtoRGB( float h, float s, float v, float rgb[3] ) break; } } - +*/ /* =============== R_ColorShiftLightingBytes @@ -130,6 +130,7 @@ static void R_ColorShiftLightingBytes( byte in[4], byte out[4] ) { R_ColorShiftLightingFloats =============== */ +/* static void R_ColorShiftLightingFloats(const vec4_t in, vec4_t out) { 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[3] = in[3]; } - +*/ /* =============== R_LoadLightmaps @@ -1540,7 +1541,7 @@ static void CopyVert(const srfVert_t * in, srfVert_t * out) R_CreateWorldVBO =============== */ -static void R_CreateWorldVBO() +static void R_CreateWorldVBO(void) { int i, j, k; @@ -2500,7 +2501,7 @@ R_MergeLeafSurfaces Merges surfaces that share a common leaf ================= */ -void R_MergeLeafSurfaces() +void R_MergeLeafSurfaces(void) { int i, j, k; int numWorldSurfaces; @@ -2777,6 +2778,9 @@ void R_MergeLeafSurfaces() } } break; + + default: + break; } } diff --git a/reaction/code/renderer/tr_shade.c b/reaction/code/renderer/tr_shade.c index 13a43286..ee76d8c9 100644 --- a/reaction/code/renderer/tr_shade.c +++ b/reaction/code/renderer/tr_shade.c @@ -318,7 +318,7 @@ static void DrawTris (shaderCommands_t *input) { if (input->multiDrawPrimitives) { - R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); + R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes); } else { @@ -732,7 +732,7 @@ static void DrawMultitexturedVBO( shaderCommands_t *input, int stage ) { if (input->multiDrawPrimitives) { - R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); + R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes); } else { @@ -1167,7 +1167,7 @@ static void ProjectDlightTextureVBOGLSL( void ) { if (tess.multiDrawPrimitives) { - R_DrawMultiElementsVBO(tess.multiDrawPrimitives, tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); + R_DrawMultiElementsVBO(tess.multiDrawPrimitives, (const GLvoid **) tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); } else { @@ -1295,7 +1295,7 @@ static void RB_FogPassVBOGLSL( void ) { if (tess.multiDrawPrimitives) { - R_DrawMultiElementsVBO(tess.multiDrawPrimitives, tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); + R_DrawMultiElementsVBO(tess.multiDrawPrimitives, (const GLvoid **) tess.multiDrawFirstIndex, tess.multiDrawNumIndexes); } else { @@ -1628,6 +1628,8 @@ static void ComputeHelperColor( shaderStage_t *pStage, vec4_t color) color[3] = 0.0f; } break; + default: + break; } // @@ -2082,6 +2084,8 @@ static void ComputeTexCoords( shaderStage_t *pStage ) { break; case TCGEN_BAD: return; + default: + break; } // @@ -2285,7 +2289,7 @@ static void RB_IterateStagesGenericVBO( shaderCommands_t *input ) if (input->multiDrawPrimitives) { - R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); + R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes); } else { @@ -2348,7 +2352,7 @@ static void DrawMultitexturedVBOGLSL( shaderProgram_t *sp, shaderCommands_t *inp if (input->multiDrawPrimitives) { - R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); + R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes); } else { @@ -2495,6 +2499,8 @@ static void RB_IterateStagesGenericVBOGLSL( shaderCommands_t *input ) { 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); GLSL_SetUniform_Color(sp, color); } @@ -2571,7 +2577,7 @@ static void RB_IterateStagesGenericVBOGLSL( shaderCommands_t *input ) if (input->multiDrawPrimitives) { - R_DrawMultiElementsVBO(input->multiDrawPrimitives, input->multiDrawFirstIndex, input->multiDrawNumIndexes); + R_DrawMultiElementsVBO(input->multiDrawPrimitives, (const GLvoid **) input->multiDrawFirstIndex, input->multiDrawNumIndexes); } else { diff --git a/reaction/code/renderer/tr_shader.c b/reaction/code/renderer/tr_shader.c index 63daffa9..daff3e35 100644 --- a/reaction/code/renderer/tr_shader.c +++ b/reaction/code/renderer/tr_shader.c @@ -1724,7 +1724,7 @@ Check which vertex attributes we only need, so we don't need to submit/copy all of them. =================== */ -static void ComputeVertexAttribs() +static void ComputeVertexAttribs(void) { int i, stage;