Skip to content

Fix specular mapping with linear blend regime #1941

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

Open
slipher wants to merge 1 commit into
base: for-0.56.0/sync
Choose a base branch
from
+0 −17
Open

Fix specular mapping with linear blend regime #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/engine/renderer/tr_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,6 @@ enum
enum {
LINEAR_RGBGEN = ( 1 << 0 ),
LINEAR_COLORMAP = ( 1 << 1 ),
LINEAR_SPECULARMAP = ( 1 << 2 ),
};

// *INDENT-ON*
Expand Down
16 changes: 0 additions & 16 deletions src/engine/renderer/tr_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,9 +1509,6 @@ static bool LoadMap( shaderStage_t *stage, const char *buffer, stageType_t type,
case stageType_t::ST_SKYBOXMAP:
imageParams.bits |= IF_SRGB;
break;
case stageType_t::ST_SPECULARMAP:
imageParams.bits |= stage->colorspaceBits & LINEAR_SPECULARMAP ? 0 : IF_SRGB;
break;
default:
break;
}
Expand Down Expand Up @@ -2679,19 +2676,6 @@ static bool ParseStage( shaderStage_t *stage, const char **text )

stage->colorspaceBits |= LINEAR_COLORMAP;
}
else if ( !Q_stricmp( token, "rawSpecularMap" ) )
{
stage->colorspaceBits |= LINEAR_SPECULARMAP;
}
else if ( !Q_stricmp( token, "linearSpecularMap" ) )
{
if ( !tr.worldLinearizeTexture )
{
Log::Warn("Usage of linearSpecularMap in naive pipeline, assuming rawSpecularMap");
}

stage->colorspaceBits |= LINEAR_SPECULARMAP;
}
// stage <type>
else if ( !Q_stricmp( token, "stage" ) )
{
Expand Down
Loading