diff options
Diffstat (limited to 'src/renderer/tr_shader.c')
| -rw-r--r-- | src/renderer/tr_shader.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/renderer/tr_shader.c b/src/renderer/tr_shader.c index bfcd47d3..22e340c6 100644 --- a/src/renderer/tr_shader.c +++ b/src/renderer/tr_shader.c @@ -31,7 +31,6 @@ static char *s_shaderText; static shaderStage_t stages[MAX_SHADER_STAGES]; static shader_t shader; static texModInfo_t texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS]; -static qboolean deferLoad; #define FILE_HASH_SIZE 1024 static shader_t* hashTable[FILE_HASH_SIZE]; @@ -1035,7 +1034,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) } // decide which agens we can skip - if ( stage->alphaGen == CGEN_IDENTITY ) { + if ( stage->alphaGen == AGEN_IDENTITY ) { if ( stage->rgbGen == CGEN_IDENTITY || stage->rgbGen == CGEN_LIGHTING_DIFFUSE ) { stage->alphaGen = AGEN_SKIP; @@ -1372,7 +1371,7 @@ surfaceparm <name> */ static void ParseSurfaceParm( char **text ) { char *token; - int numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]); + int numInfoParms = ARRAY_LEN( infoParms ); int i; token = COM_ParseExt( text, qfalse ); @@ -1825,7 +1824,7 @@ static qboolean CollapseMultitexture( void ) { return qfalse; } } - if ( stages[0].alphaGen == CGEN_WAVEFORM ) + if ( stages[0].alphaGen == AGEN_WAVEFORM ) { if ( memcmp( &stages[0].alphaWave, &stages[1].alphaWave, @@ -3071,8 +3070,6 @@ void R_InitShaders( void ) { Com_Memset(hashTable, 0, sizeof(hashTable)); - deferLoad = qfalse; - CreateInternalShaders(); ScanAndLoadShaderFiles(); |