Use separate binds/uniforms for depthtile1/2 textures

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2950,7 +2950,7 @@ void GLShader_depthtile1::SetShaderProgramUniforms( ShaderProgramDescriptor *sha
 GLShader_depthtile2::GLShader_depthtile2() :
 	GLShader( "depthtile2", ATTR_POSITION,
 		false, "screenSpace", "depthtile2" ),
-	u_DepthMap( this ) {
+	u_DepthTile1( this ) {
 }
 
 void GLShader_depthtile2::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
@@ -2961,7 +2961,7 @@ void GLShader_depthtile2::SetShaderProgramUniforms( ShaderProgramDescriptor *sha
 GLShader_lighttile::GLShader_lighttile() :
 	GLShader( "lighttile", ATTR_POSITION | ATTR_TEXCOORD,
 		false, "lighttile", "lighttile" ),
-	u_DepthMap( this ),
+	u_DepthTile2( this ),
 	u_Lights( this ),
 	u_numLights( this ),
 	u_lightLayer( this ),

src/engine/renderer/gl_shader.h

@@ -1840,6 +1840,30 @@ class u_FogMap :
 	}
 };
 
+class u_DepthTile1 :
+	GLUniformSampler2D {
+	public:
+	u_DepthTile1( GLShader* shader ) :
+		GLUniformSampler2D( shader, "u_DepthTile1" ) {
+	}
+
+	void SetUniform_DepthTile1Bindless( GLuint64 bindlessHandle ) {
+		this->SetValueBindless( bindlessHandle );
+	}
+};
+
+class u_DepthTile2 :
+	GLUniformSampler2D {
+	public:
+	u_DepthTile2( GLShader* shader ) :
+		GLUniformSampler2D( shader, "u_DepthTile2" ) {
+	}
+
+	void SetUniform_DepthTile2Bindless( GLuint64 bindlessHandle ) {
+		this->SetValueBindless( bindlessHandle );
+	}
+};
+
 class u_LightTiles :
 	GLUniformSampler3D {
 	public:
@@ -3674,15 +3698,15 @@ class GLShader_depthtile1 :
 
 class GLShader_depthtile2 :
 	public GLShader,
-	public u_DepthMap {
+	public u_DepthTile1 {
 public:
 	GLShader_depthtile2();
 	void SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram ) override;
 };
 
 class GLShader_lighttile :
 	public GLShader,
-	public u_DepthMap,
+	public u_DepthTile2,
 	public u_Lights,
 	public u_numLights,
 	public u_lightLayer,

src/engine/renderer/glsl_source/depthtile2_fp.glsl

@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* depthtile2_fp.glsl */
 
-uniform sampler2D u_DepthMap;
+uniform sampler2D u_DepthTile1;
 
 #if __VERSION__ > 120
 out vec4 outputColor;
@@ -51,7 +51,7 @@ void	main()
 
   for( x = -0.375; x < 0.5; x += 0.25 ) {
     for( y = -0.375; y < 0.5; y += 0.25 ) {
-      vec4 data = texture2D( u_DepthMap, st + vec2(x, y) * r_tileStep );
+      vec4 data = texture2D( u_DepthTile1, st + vec2(x, y) * r_tileStep );
       if( data.y < 99999.0 ) {
 	accum.x = max( accum.x, data.x );
 	accum.y = min( accum.y, data.y );

src/engine/renderer/glsl_source/lighttile_fp.glsl

@@ -59,7 +59,7 @@ Light GetLight( in uint idx ) {
 
 uniform int u_numLights;
 uniform mat4 u_ModelMatrix;
-uniform sampler2D u_DepthMap;
+uniform sampler2D u_DepthTile2;
 uniform int u_lightLayer;
 uniform vec3 u_zFar;
 
@@ -96,7 +96,7 @@ vec3 ProjToView( vec2 inp ) {
 }
 
 void main() {
-	vec2 minmax = texture2D( u_DepthMap, 0.5 * vPosition + 0.5 ).xy;
+	vec2 minmax = texture2D( u_DepthTile2, 0.5 * vPosition + 0.5 ).xy;
 
 	float minx = vPosition.x - r_tileStep.x;
 	float maxx = vPosition.x + r_tileStep.x;

src/engine/renderer/tr_backend.cpp

@@ -1160,7 +1160,7 @@ void RB_RenderPostDepthLightTile()
 	GL_Scissor( 0, 0, w, h );
 	gl_depthtile2Shader->BindProgram( 0 );
 
-	gl_depthtile2Shader->SetUniform_DepthMapBindless(
+	gl_depthtile2Shader->SetUniform_DepthTile1Bindless(
 		GL_BindToTMU( 0, tr.depthtile1RenderImage )
 	);
 
@@ -1180,7 +1180,7 @@ void RB_RenderPostDepthLightTile()
 
 	gl_lighttileShader->SetUniformBlock_Lights( tr.dlightUBO );
 
-	gl_lighttileShader->SetUniform_DepthMapBindless(
+	gl_lighttileShader->SetUniform_DepthTile2Bindless(
 		GL_BindToTMU( 1, tr.depthtile2RenderImage ) 
 	);