Skip to content

Commit b5fb9c9

Browse files
illwieckzillwieckz
committed
temp: remove some SetUniform_InverseLightFactor() calls in advance
1 parent 774b0f8 commit b5fb9c9

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

‎src/engine/renderer/Material.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ void UpdateSurfaceDataGeneric3D( uint32_t* materials, Material& material, drawSu
222222
// u_AlphaThreshold
223223
gl_generic3DShaderMaterial->SetUniform_AlphaTest( pStage->stateBits );
224224

225-
// u_InverseLightFactor
226-
float inverseLightFactor = pStage->cancelOverBright ? tr.mapInverseLightFactor : 1.0f;
227-
gl_genericShaderMaterial->SetUniform_InverseLightFactor( inverseLightFactor );
228-
229225
// u_ColorModulate
230226
colorGen_t rgbGen = SetRgbGen( pStage );
231227
alphaGen_t alphaGen = SetAlphaGen( pStage );

‎src/engine/renderer/tr_backend.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,6 @@ static void RB_SetupLightForLighting( trRefLight_t *light )
19151915
// set uniforms
19161916
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
19171917
gl_genericShader->SetUniform_Color( Color::Black );
1918-
// TODO: set u_InverseLightFactor!
19191918

19201919
GL_State( GLS_POLYMODE_LINE | GLS_DEPTHTEST_DISABLE );
19211920
GL_Cull( cullType_t::CT_TWO_SIDED );
@@ -2762,7 +2761,6 @@ void RB_RunVisTests( )
27622761
gl_genericShader->SetUniform_Color( Color::White );
27632762

27642763
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_CONST, alphaGen_t::AGEN_CONST );
2765-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
27662764
gl_genericShader->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
27672765
gl_genericShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );
27682766

@@ -3392,7 +3390,6 @@ static void RB_RenderDebugUtils()
33923390

33933391
// set uniforms
33943392
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_CUSTOM_RGB, alphaGen_t::AGEN_CUSTOM );
3395-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
33963393

33973394
// bind u_ColorMap
33983395
gl_genericShader->SetUniform_ColorMapBindless(
@@ -3529,7 +3526,6 @@ static void RB_RenderDebugUtils()
35293526
// set uniforms
35303527
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
35313528
gl_genericShader->SetUniform_Color( Color::Black );
3532-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
35333529

35343530
// bind u_ColorMap
35353531
gl_genericShader->SetUniform_ColorMapBindless(
@@ -3639,7 +3635,6 @@ static void RB_RenderDebugUtils()
36393635
// set uniforms
36403636
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
36413637
gl_genericShader->SetUniform_Color( Color::Black );
3642-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
36433638

36443639
// bind u_ColorMap
36453640
gl_genericShader->SetUniform_ColorMapBindless(
@@ -3699,7 +3694,6 @@ static void RB_RenderDebugUtils()
36993694
// set uniforms
37003695
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
37013696
gl_genericShader->SetUniform_Color( Color::Black );
3702-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
37033697

37043698
// bind u_ColorMap
37053699
gl_genericShader->SetUniform_ColorMapBindless(
@@ -3907,7 +3901,6 @@ static void RB_RenderDebugUtils()
39073901

39083902
// set uniforms
39093903
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_CUSTOM_RGB, alphaGen_t::AGEN_CUSTOM );
3910-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
39113904

39123905
// bind u_ColorMap
39133906
gl_genericShader->SetUniform_ColorMapBindless(
@@ -4038,7 +4031,6 @@ static void RB_RenderDebugUtils()
40384031
// set uniforms
40394032
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
40404033
gl_genericShader->SetUniform_Color( Color::Black );
4041-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
40424034

40434035
GL_State( GLS_DEFAULT );
40444036
GL_Cull( cullType_t::CT_TWO_SIDED );
@@ -4115,7 +4107,6 @@ static void RB_RenderDebugUtils()
41154107
// set uniforms
41164108
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
41174109
gl_genericShader->SetUniform_Color( Color::Black );
4118-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
41194110

41204111
GL_State( GLS_DEFAULT );
41214112
GL_Cull( cullType_t::CT_TWO_SIDED );
@@ -4200,7 +4191,6 @@ static void RB_RenderDebugUtils()
42004191

42014192
// set uniforms
42024193
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_CUSTOM_RGB, alphaGen_t::AGEN_CUSTOM );
4203-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
42044194

42054195
// bind u_ColorMap
42064196
gl_genericShader->SetUniform_ColorMapBindless(
@@ -4494,7 +4484,6 @@ void DebugDrawBegin( debugDrawMode_t mode, float size ) {
44944484
// set uniforms
44954485
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
44964486
gl_genericShader->SetUniform_Color( colorClear );
4497-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
44984487

44994488
// bind u_ColorMap
45004489
gl_genericShader->SetUniform_ColorMapBindless(
@@ -5609,7 +5598,6 @@ void RB_ShowImages()
56095598
// set uniforms
56105599
gl_genericShader->SetUniform_ColorModulate( colorGen_t::CGEN_VERTEX, alphaGen_t::AGEN_VERTEX );
56115600
gl_genericShader->SetUniform_TextureMatrix( matrixIdentity );
5612-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
56135601

56145602
GL_SelectTexture( 0 );
56155603

‎src/engine/renderer/tr_shade.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@ static void DrawTris()
695695
}
696696

697697
gl_generic3DShader->SetUniform_ColorModulate( colorGen_t::CGEN_CONST, alphaGen_t::AGEN_CONST );
698-
gl_genericShader->SetUniform_InverseLightFactor( tr.mapInverseLightFactor );
699698
gl_generic3DShader->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
700699
gl_generic3DShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );
701700

@@ -923,10 +922,6 @@ void Render_generic3D( shaderStage_t *pStage )
923922
// u_AlphaThreshold
924923
gl_generic3DShader->SetUniform_AlphaTest( pStage->stateBits );
925924

926-
// u_InverseLightFactor
927-
float inverseLightFactor = pStage->cancelOverBright ? tr.mapInverseLightFactor : 1.0f;
928-
gl_genericShader->SetUniform_InverseLightFactor( inverseLightFactor );
929-
930925
// u_ColorModulate
931926
colorGen_t rgbGen = SetRgbGen( pStage );
932927
alphaGen_t alphaGen = SetAlphaGen( pStage );

0 commit comments

Comments
 (0)