Skip to content

Commit e6d6cb5

Browse files
committed
NUKE assert that doesn't really make sense
`deluxeMode` cannot have 2 different values at the same time.
1 parent d50f74a commit e6d6cb5

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

src/engine/renderer/Material.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,6 @@ void ProcessMaterialLightMapping( Material* material, shaderStage_t* pStage, Mat
10271027
bool enableGridLighting = ( lightMode == lightMode_t::GRID );
10281028
bool enableGridDeluxeMapping = ( deluxeMode == deluxeMode_t::GRID );
10291029

1030-
DAEMON_ASSERT( !( enableDeluxeMapping && enableGridDeluxeMapping ) );
1031-
10321030
material->enableDeluxeMapping = enableDeluxeMapping;
10331031
material->enableGridLighting = enableGridLighting;
10341032
material->enableGridDeluxeMapping = enableGridDeluxeMapping;

src/engine/renderer/tr_shade.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,6 @@ void ProcessShaderLightMapping( const shaderStage_t* pStage ) {
846846
bool enableGridLighting = ( lightMode == lightMode_t::GRID );
847847
bool enableGridDeluxeMapping = ( deluxeMode == deluxeMode_t::GRID );
848848

849-
DAEMON_ASSERT( !( enableDeluxeMapping && enableGridDeluxeMapping ) );
850-
851849
// Not implemented yet in PBR code.
852850
bool enableReflectiveSpecular =
853851
pStage->enableSpecularMapping && glConfig2.reflectionMapping
@@ -1058,12 +1056,9 @@ void Render_lightMapping( shaderStage_t *pStage )
10581056
stateBits &= ~( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS | GLS_ATEST_BITS );
10591057
}
10601058

1061-
bool enableDeluxeMapping = ( deluxeMode == deluxeMode_t::MAP );
10621059
bool enableGridLighting = ( lightMode == lightMode_t::GRID );
10631060
bool enableGridDeluxeMapping = ( deluxeMode == deluxeMode_t::GRID );
10641061

1065-
DAEMON_ASSERT( !( enableDeluxeMapping && enableGridDeluxeMapping ) );
1066-
10671062
// Not implemented yet in PBR code.
10681063
bool enableReflectiveSpecular =
10691064
pStage->enableSpecularMapping && glConfig2.reflectionMapping

0 commit comments

Comments
 (0)