Skip to content

tr_shader: do not load heatHaze map when heatHaze is disabled #1737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2025
Merged

tr_shader: do not load heatHaze map when heatHaze is disabled #1737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e66b52a
tr_shader: do not load heatHaze map when heatHaze is disabled
illwieckz Aug 6, 2025
d74522b
tr_shader: do not re-enable stages after parsing
illwieckz Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/engine/renderer/tr_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3277,6 +3277,13 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
// compute state bits
stage->stateBits = colorMaskBits | depthMaskBits | blendSrcBits | blendDstBits | atestBits | depthFuncBits | polyModeBits;

// Do not load heatHaze maps when r_heatHaze is disabled.
if ( stage->type == stageType_t::ST_HEATHAZEMAP && !r_heatHaze->integer )
{
stage->active = false;
return true;
}

// load image
if ( loadMap && !LoadMap( stage, buffer, stage->type ) )
{
Expand Down Expand Up @@ -3866,8 +3873,6 @@ static bool ParseShader( const char *_text )
return false;
}

stage->active = true;

/* Examples of shaders with light styles, those
shaders are generated by the q3map2 map compiler.

Expand Down Expand Up @@ -5181,7 +5186,6 @@ static void FinishStages()
switch ( stage->type )
{
case stageType_t::ST_HEATHAZEMAP:
stage->active = r_heatHaze->integer;
stage->stateBits &= ~( GLS_ATEST_BITS | GLS_DEPTHMASK_TRUE );
break;

Expand Down