ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-24 05:01:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove vertexLightmap from textureBundle_t, it's never qtrue

Browse source
This commit is contained in:
Zack Middleton 2013-11-02 02:59:31 -05:00
parent 6bd52de44e
commit ae0e09aba9
4 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/renderergl1/tr_local.h
View file

@ -262,7 +262,6 @@ typedef struct {
int videoMapHandle; int videoMapHandle;
qboolean isLightmap; qboolean isLightmap;
qboolean vertexLightmap;
qboolean isVideoMap; qboolean isVideoMap;
} textureBundle_t; } textureBundle_t;

7
code/renderergl1/tr_shade.c
View file

@ -1145,11 +1145,6 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
// //
// set state // 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 ); GL_State( pStage->stateBits );
@ -1160,7 +1155,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
R_DrawElements( input->numIndexes, input->indexes ); R_DrawElements( input->numIndexes, input->indexes );
} }
// allow skipping out to show just lightmaps during development // 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; break;
} }

1
code/renderergl2/tr_local.h
View file

@ -350,7 +350,6 @@ typedef struct {
int videoMapHandle; int videoMapHandle;
qboolean isLightmap; qboolean isLightmap;
qboolean vertexLightmap;
qboolean isVideoMap; qboolean isVideoMap;
} textureBundle_t; } textureBundle_t;

7
code/renderergl2/tr_shade.c
View file

@ -1325,11 +1325,6 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
// //
// set state // 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); 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 // 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; break;
} }