Bind lightgrid/deluxegrid to separate slots from lightmap/deluxemap

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -828,12 +828,12 @@ void BindShaderLightMapping( Material* material ) {
 
 	// bind u_LightGrid1
 	if ( material->enableGridLighting ) {
-		gl_lightMappingShaderMaterial->SetUniform_LightGrid1Bindless( GL_BindToTMU( BIND_LIGHTMAP, tr.lightGrid1Image ) );
+		gl_lightMappingShaderMaterial->SetUniform_LightGrid1Bindless( GL_BindToTMU( BIND_LIGHTGRID1, tr.lightGrid1Image ) );
 	}
 
 	// bind u_LightGrid2
 	if ( material->enableGridDeluxeMapping ) {
-		gl_lightMappingShaderMaterial->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_DELUXEMAP, tr.lightGrid2Image ) );
+		gl_lightMappingShaderMaterial->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_LIGHTGRID2, tr.lightGrid2Image ) );
 	}
 
 	if ( glConfig2.realtimeLighting ) {

src/engine/renderer/gl_shader.cpp

@@ -2455,9 +2455,9 @@ void GLShader_lightMapping::SetShaderProgramUniforms( ShaderProgramDescriptor *s
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), BIND_HEIGHTMAP );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_MaterialMap" ), BIND_MATERIALMAP );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightMap" ), BIND_LIGHTMAP );
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid1" ), BIND_LIGHTMAP );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid1" ), BIND_LIGHTGRID1 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DeluxeMap" ), BIND_DELUXEMAP );
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid2" ), BIND_DELUXEMAP );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_LightGrid2" ), BIND_LIGHTGRID2 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_GlowMap" ), BIND_GLOWMAP );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_EnvironmentMap0" ), BIND_ENVIRONMENTMAP0 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_EnvironmentMap1" ), BIND_ENVIRONMENTMAP1 );

src/engine/renderer/tr_local.h

@@ -448,6 +448,8 @@ enum class ssaoMode {
 		BIND_LIGHTMAP,
 		BIND_DELUXEMAP,
 		BIND_GLOWMAP,
+		BIND_LIGHTGRID1,
+		BIND_LIGHTGRID2,
 		BIND_ENVIRONMENTMAP0,
 		BIND_ENVIRONMENTMAP1,
 		BIND_LIGHTTILES,

src/engine/renderer/tr_shade.cpp

@@ -1188,7 +1188,7 @@ void Render_lightMapping( shaderStage_t *pStage )
 			GL_BindToTMU( BIND_LIGHTMAP, lightmap )
 		);
 	} else {
-		gl_lightMappingShader->SetUniform_LightGrid1Bindless( GL_BindToTMU( BIND_LIGHTMAP, lightmap ) );
+		gl_lightMappingShader->SetUniform_LightGrid1Bindless( GL_BindToTMU( BIND_LIGHTGRID1, lightmap ) );
 	}
 
 	// bind u_DeluxeMap
@@ -1197,7 +1197,7 @@ void Render_lightMapping( shaderStage_t *pStage )
 			GL_BindToTMU( BIND_DELUXEMAP, deluxemap )
 		);
 	} else {
-		gl_lightMappingShader->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_DELUXEMAP, deluxemap ) );
+		gl_lightMappingShader->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_LIGHTGRID2, deluxemap ) );
 	}
 
 	// bind u_GlowMap