Skip to content

Commit 385156a

Browse files
slipherslipher
committed
Remove SetShaderProgramUniforms from material shaders
SetShaderProgramUniforms is an overridable function of GLShader used to configure texture mapping units. Material system implies bindless textures meaning TMUs are not used, so material system shaders should not implement that function.
1 parent 70f53c6 commit 385156a

File tree

2 files changed

+0
-61
lines changed

2 files changed

+0
-61
lines changed

‎src/engine/renderer/gl_shader.cpp‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,11 +2407,6 @@ GLShader_genericMaterial::GLShader_genericMaterial() :
24072407
GLCompileMacro_USE_DEPTH_FADE( this ) {
24082408
}
24092409

2410-
void GLShader_genericMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2411-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
2412-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthMap" ), 1 );
2413-
}
2414-
24152410
GLShader_lightMapping::GLShader_lightMapping() :
24162411
GLShader( "lightMapping", ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT | ATTR_COLOR,
24172412
false, "lightMapping", "lightMapping" ),
@@ -2525,19 +2520,6 @@ GLShader_lightMappingMaterial::GLShader_lightMappingMaterial() :
25252520
GLCompileMacro_USE_PHYSICAL_MAPPING( this ) {
25262521
}
25272522

2528-
void GLShader_lightMappingMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2529-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DiffuseMap" ), BIND_DIFFUSEMAP );
2530-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), BIND_NORMALMAP );
2531-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), BIND_HEIGHTMAP );
2532-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_MaterialMap" ), BIND_MATERIALMAP );
2533-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightMap" ), BIND_LIGHTMAP );
2534-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DeluxeMap" ), BIND_DELUXEMAP );
2535-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_GlowMap" ), BIND_GLOWMAP );
2536-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_EnvironmentMap0" ), BIND_ENVIRONMENTMAP0 );
2537-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_EnvironmentMap1" ), BIND_ENVIRONMENTMAP1 );
2538-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightTiles" ), BIND_LIGHTTILES );
2539-
}
2540-
25412523
GLShader_reflection::GLShader_reflection():
25422524
GLShader( "reflection", ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT,
25432525
false, "reflection_CB", "reflection_CB" ),
@@ -2588,12 +2570,6 @@ GLShader_reflectionMaterial::GLShader_reflectionMaterial() :
25882570
GLCompileMacro_USE_RELIEF_MAPPING( this ) {
25892571
}
25902572

2591-
void GLShader_reflectionMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2592-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
2593-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 1 );
2594-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), 15 );
2595-
}
2596-
25972573
GLShader_skybox::GLShader_skybox() :
25982574
GLShader( "skybox", ATTR_POSITION,
25992575
false, "skybox", "skybox" ),
@@ -2625,11 +2601,6 @@ GLShader_skyboxMaterial::GLShader_skyboxMaterial() :
26252601
u_ModelViewProjectionMatrix( this )
26262602
{}
26272603

2628-
void GLShader_skyboxMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2629-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
2630-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CloudMap" ), 1 );
2631-
}
2632-
26332604
GLShader_fogQuake3::GLShader_fogQuake3() :
26342605
GLShader( "fogQuake3", ATTR_POSITION | ATTR_QTANGENT,
26352606
false, "fogQuake3", "fogQuake3" ),
@@ -2667,10 +2638,6 @@ GLShader_fogQuake3Material::GLShader_fogQuake3Material() :
26672638
GLDeformStage( this ) {
26682639
}
26692640

2670-
void GLShader_fogQuake3Material::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2671-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_FogMap" ), 0 );
2672-
}
2673-
26742641
GLShader_fogGlobal::GLShader_fogGlobal() :
26752642
GLShader( "fogGlobal", ATTR_POSITION,
26762643
false, "screenSpace", "fogGlobal" ),
@@ -2730,11 +2697,6 @@ GLShader_heatHazeMaterial::GLShader_heatHazeMaterial() :
27302697
{
27312698
}
27322699

2733-
void GLShader_heatHazeMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2734-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 0 );
2735-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 1 );
2736-
}
2737-
27382700
GLShader_screen::GLShader_screen() :
27392701
GLShader( "screen", ATTR_POSITION,
27402702
false, "screen", "screen" ),
@@ -2755,10 +2717,6 @@ GLShader_screenMaterial::GLShader_screenMaterial() :
27552717
u_ModelViewProjectionMatrix( this ) {
27562718
}
27572719

2758-
void GLShader_screenMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
2759-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 0 );
2760-
}
2761-
27622720
GLShader_portal::GLShader_portal() :
27632721
GLShader( "portal", ATTR_POSITION,
27642722
false, "portal", "portal" ),
@@ -2899,17 +2857,6 @@ GLShader_liquidMaterial::GLShader_liquidMaterial() :
28992857
GLCompileMacro_USE_RELIEF_MAPPING( this ) {
29002858
}
29012859

2902-
void GLShader_liquidMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
2903-
{
2904-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 0 );
2905-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_PortalMap" ), 1 );
2906-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthMap" ), 2 );
2907-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 3 );
2908-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid1" ), 6 );
2909-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid2" ), 7 );
2910-
glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), 15 );
2911-
}
2912-
29132860
GLShader_motionblur::GLShader_motionblur() :
29142861
GLShader( "motionblur", ATTR_POSITION,
29152862
false, "screenSpace", "motionblur" ),

‎src/engine/renderer/gl_shader.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,7 +3276,6 @@ class GLShader_genericMaterial :
32763276
public GLCompileMacro_USE_DEPTH_FADE {
32773277
public:
32783278
GLShader_genericMaterial();
3279-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
32803279
};
32813280

32823281
class GLShader_lightMapping :
@@ -3377,7 +3376,6 @@ class GLShader_lightMappingMaterial :
33773376
public GLCompileMacro_USE_PHYSICAL_MAPPING {
33783377
public:
33793378
GLShader_lightMappingMaterial();
3380-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
33813379
};
33823380

33833381
class GLShader_reflection :
@@ -3424,7 +3422,6 @@ class GLShader_reflectionMaterial :
34243422
public GLCompileMacro_USE_RELIEF_MAPPING {
34253423
public:
34263424
GLShader_reflectionMaterial();
3427-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
34283425
};
34293426

34303427
class GLShader_skybox :
@@ -3453,7 +3450,6 @@ class GLShader_skyboxMaterial :
34533450
public u_ModelViewProjectionMatrix {
34543451
public:
34553452
GLShader_skyboxMaterial();
3456-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
34573453
};
34583454

34593455
class GLShader_fogQuake3 :
@@ -3489,7 +3485,6 @@ class GLShader_fogQuake3Material :
34893485
public GLDeformStage {
34903486
public:
34913487
GLShader_fogQuake3Material();
3492-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
34933488
};
34943489

34953490
class GLShader_fogGlobal :
@@ -3542,7 +3537,6 @@ class GLShader_heatHazeMaterial :
35423537
{
35433538
public:
35443539
GLShader_heatHazeMaterial();
3545-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
35463540
};
35473541

35483542
class GLShader_screen :
@@ -3561,7 +3555,6 @@ class GLShader_screenMaterial :
35613555
public u_ModelViewProjectionMatrix {
35623556
public:
35633557
GLShader_screenMaterial();
3564-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
35653558
};
35663559

35673560
class GLShader_portal :
@@ -3682,7 +3675,6 @@ class GLShader_liquidMaterial :
36823675
public GLCompileMacro_USE_RELIEF_MAPPING {
36833676
public:
36843677
GLShader_liquidMaterial();
3685-
void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
36863678
};
36873679

36883680
class GLShader_motionblur :

0 commit comments

Comments
 (0)