From ae0e09aba9630c3ff10a464806453c5d6d615938 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sat, 2 Nov 2013 02:59:31 -0500 Subject: [PATCH] Remove vertexLightmap from textureBundle_t, it's never qtrue --- code/renderergl1/tr_local.h | 1 - code/renderergl1/tr_shade.c | 9 ++------- code/renderergl2/tr_local.h | 1 - code/renderergl2/tr_shade.c | 9 ++------- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h index 6e8b595b..6f54b956 100644 --- a/code/renderergl1/tr_local.h +++ b/code/renderergl1/tr_local.h @@ -262,7 +262,6 @@ typedef struct { int videoMapHandle; qboolean isLightmap; - qboolean vertexLightmap; qboolean isVideoMap; } textureBundle_t; diff --git a/code/renderergl1/tr_shade.c b/code/renderergl1/tr_shade.c index 04cef08b..08648b2e 100644 --- a/code/renderergl1/tr_shade.c +++ b/code/renderergl1/tr_shade.c @@ -1145,12 +1145,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) // // set state // - if ( pStage->bundle[0].vertexLightmap && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) && r_lightmap->integer ) - { - GL_Bind( tr.whiteImage ); - } - else - R_BindAnimatedImage( &pStage->bundle[0] ); + R_BindAnimatedImage( &pStage->bundle[0] ); GL_State( pStage->stateBits ); @@ -1160,7 +1155,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) R_DrawElements( input->numIndexes, input->indexes ); } // allow skipping out to show just lightmaps during development - if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap ) ) + if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) ) { break; } diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h index ec676c2d..0cc1f491 100644 --- a/code/renderergl2/tr_local.h +++ b/code/renderergl2/tr_local.h @@ -350,7 +350,6 @@ typedef struct { int videoMapHandle; qboolean isLightmap; - qboolean vertexLightmap; qboolean isVideoMap; } textureBundle_t; diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c index 6ccbacf1..74b8fe1f 100644 --- a/code/renderergl2/tr_shade.c +++ b/code/renderergl2/tr_shade.c @@ -1325,12 +1325,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) // // set state // - if ( pStage->bundle[0].vertexLightmap && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) && r_lightmap->integer ) - { - GL_BindToTMU( tr.whiteImage, 0 ); - } - else - R_BindAnimatedImageToTMU( &pStage->bundle[0], 0 ); + R_BindAnimatedImageToTMU( &pStage->bundle[0], 0 ); GLSL_SetUniformInt(sp, UNIFORM_TEXTURE1ENV, 0); } @@ -1354,7 +1349,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) } // allow skipping out to show just lightmaps during development - if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap ) ) + if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) ) { break; }