Skip to content

Commit

Permalink
tr_shader,tr_local: delete leftovers
Browse files Browse the repository at this point in the history
collapseTextureEnv is not used at all

colorMap stage is by definition a map that is not collapsed
so this keyword is absolutely useless
  • Loading branch information
illwieckz committed Dec 9, 2019
1 parent 9c58332 commit df516c0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 0 additions & 2 deletions src/engine/renderer/tr_local.h
Expand Up @@ -1222,8 +1222,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
float portalRange; // distance to fog out at
bool isPortal;

int collapseTextureEnv; // 0, GL_MODULATE, GL_ADD (FIXME: put in stage)

cullType_t cullType; // CT_FRONT_SIDED, CT_BACK_SIDED, or CT_TWO_SIDED
bool polygonOffset; // set for decals and other items that must be offset
float polygonOffsetValue;
Expand Down
6 changes: 1 addition & 5 deletions src/engine/renderer/tr_shader.cpp
Expand Up @@ -2293,11 +2293,7 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
continue;
}

if ( !Q_stricmp( token, "colorMap" ) )
{
stage->type = stageType_t::ST_COLORMAP;
}
else if ( !Q_stricmp( token, "diffuseMap" ) )
if ( !Q_stricmp( token, "diffuseMap" ) )
{
Log::Warn("deprecated stage parameter '%s' in shader '%s'", token, shader.name );
stage->type = stageType_t::ST_DIFFUSEMAP;
Expand Down

0 comments on commit df516c0

Please sign in to comment.