summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2012-10-26 03:56:45 +0000
committerTim Angus <tim@ngus.net>2013-01-12 21:20:53 +0000
commitd8b61a45b7b6a862bb072b503148a85c39c35608 (patch)
tree9b2de123e3b67f173e3ff91707debbd9f7849a0d
parent1d5ebd69d319132b1ca48af02d917d58b12d4e23 (diff)
Fix gcc warnings in Rend2.
-rw-r--r--src/rend2/tr_backend.c2
-rw-r--r--src/rend2/tr_bsp.c2
-rw-r--r--src/rend2/tr_shade.c5
3 files changed, 5 insertions, 4 deletions
diff --git a/src/rend2/tr_backend.c b/src/rend2/tr_backend.c
index 1a9bdccd..8c481e61 100644
--- a/src/rend2/tr_backend.c
+++ b/src/rend2/tr_backend.c
@@ -763,7 +763,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
{
depth[0] = 0;
depth[1] = 0.3f;
- qglDepthRange (0, 0.3);
+ qglDepthRange (depth[0], depth[1]);
}
#endif
}
diff --git a/src/rend2/tr_bsp.c b/src/rend2/tr_bsp.c
index de9a47af..2512f01d 100644
--- a/src/rend2/tr_bsp.c
+++ b/src/rend2/tr_bsp.c
@@ -2172,7 +2172,7 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
{
//ri.Printf(PRINT_ALL, "Found!\n");
if (size != sizeof(float) * 3 * (verts->filelen / sizeof(*dv)))
- ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)(sizeof(float)) * 3 * (verts->filelen / sizeof(*dv)));
+ ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)((sizeof(float)) * 3 * (verts->filelen / sizeof(*dv))));
}
}
diff --git a/src/rend2/tr_shade.c b/src/rend2/tr_shade.c
index 4717c956..c74409e4 100644
--- a/src/rend2/tr_shade.c
+++ b/src/rend2/tr_shade.c
@@ -1342,7 +1342,8 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
for ( stage2 = stage + 1; stage2 < MAX_SHADER_STAGES; stage2++ )
{
shaderStage_t *pStage2 = input->xstages[stage2];
- unsigned int srcBlendBits, dstBlendBits;
+ unsigned int srcBlendBits;
+ //unsigned int dstBlendBits;
if ( !pStage2 )
{
@@ -1350,7 +1351,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
}
srcBlendBits = pStage2->stateBits & GLS_SRCBLEND_BITS;
- dstBlendBits = pStage2->stateBits & GLS_DSTBLEND_BITS;
+ //dstBlendBits = pStage2->stateBits & GLS_DSTBLEND_BITS;
if (srcBlendBits == GLS_SRCBLEND_DST_COLOR)
{