Fix liquid shader compile error

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -1191,6 +1191,8 @@ void BindShaderLiquid( Material* material ) {
 	// Select shader permutation.
 	gl_liquidShaderMaterial->SetHeightMapInNormalMap( material->hasHeightMapInNormalMap );
 	gl_liquidShaderMaterial->SetReliefMapping( material->enableReliefMapping );
+	gl_liquidShaderMaterial->SetGridDeluxeMapping( material->enableGridDeluxeMapping );
+	gl_liquidShaderMaterial->SetGridLighting( material->enableGridLighting );
 
 	// Bind shader program.
 	gl_liquidShaderMaterial->BindProgram( material->deformIndex );
@@ -1372,17 +1374,27 @@ void ProcessMaterialHeatHaze( Material* material, shaderStage_t* pStage, drawSur
 	material->program = gl_heatHazeShaderMaterial->GetProgram( pStage->deformIndex );
 }
 
-void ProcessMaterialLiquid( Material* material, shaderStage_t* pStage, drawSurf_t* /* drawSurf */ ) {
+void ProcessMaterialLiquid( Material* material, shaderStage_t* pStage, drawSurf_t* drawSurf ) {
 	material->shader = gl_liquidShaderMaterial;
 
+	lightMode_t lightMode;
+	deluxeMode_t deluxeMode;
+	SetLightDeluxeMode( drawSurf, pStage->type, lightMode, deluxeMode );
+
 	material->hasHeightMapInNormalMap = pStage->hasHeightMapInNormalMap;
 	material->enableReliefMapping = pStage->enableReliefMapping;
 	material->deformIndex = pStage->deformIndex;
+	material->enableGridDeluxeMapping = true;
+	material->enableGridLighting = true;
 
 	gl_liquidShaderMaterial->SetHeightMapInNormalMap( pStage->hasHeightMapInNormalMap );
 
 	gl_liquidShaderMaterial->SetReliefMapping( pStage->enableReliefMapping );
 
+	gl_liquidShaderMaterial->SetGridDeluxeMapping( deluxeMode == deluxeMode_t::GRID );
+
+	gl_liquidShaderMaterial->SetGridLighting( lightMode == lightMode_t::GRID );
+
 	material->program = gl_liquidShaderMaterial->GetProgram( pStage->deformIndex );
 }
 

src/engine/renderer/ShadeCommon.h

@@ -147,6 +147,11 @@ template<typename Obj> void SetLightDeluxeMode( Obj* obj,
 
 		This is doable for some complex multi-stage materials. */
 	}
+	else if( stageType == stageType_t::ST_LIQUIDMAP )
+	{
+		lightMode = tr.modelLight;
+		deluxeMode = tr.modelDeluxe;
+	}
 	else if ( obj->bspSurface )
 	{
 		lightMode = tr.worldLight;

src/engine/renderer/gl_shader.cpp

@@ -2956,6 +2956,8 @@ GLShader_liquid::GLShader_liquid( GLShaderManager *manager ) :
 	u_SpecularExponent( this ),
 	u_LightGridOrigin( this ),
 	u_LightGridScale( this ),
+	GLCompileMacro_USE_GRID_DELUXE_MAPPING( this ),
+	GLCompileMacro_USE_GRID_LIGHTING( this ),
 	GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP( this ),
 	GLCompileMacro_USE_RELIEF_MAPPING( this )
 {
@@ -2998,6 +3000,8 @@ GLShader_liquidMaterial::GLShader_liquidMaterial( GLShaderManager* manager ) :
 	u_SpecularExponent( this ),
 	u_LightGridOrigin( this ),
 	u_LightGridScale( this ),
+	GLCompileMacro_USE_GRID_DELUXE_MAPPING( this ),
+	GLCompileMacro_USE_GRID_LIGHTING( this ),
 	GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP( this ),
 	GLCompileMacro_USE_RELIEF_MAPPING( this ) {
 }

src/engine/renderer/gl_shader.h

@@ -4568,6 +4568,8 @@ class GLShader_liquid :
 	public u_SpecularExponent,
 	public u_LightGridOrigin,
 	public u_LightGridScale,
+	public GLCompileMacro_USE_GRID_DELUXE_MAPPING,
+	public GLCompileMacro_USE_GRID_LIGHTING,
 	public GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP,
 	public GLCompileMacro_USE_RELIEF_MAPPING
 {
@@ -4603,6 +4605,8 @@ class GLShader_liquidMaterial :
 	public u_SpecularExponent,
 	public u_LightGridOrigin,
 	public u_LightGridScale,
+	public GLCompileMacro_USE_GRID_DELUXE_MAPPING,
+	public GLCompileMacro_USE_GRID_LIGHTING,
 	public GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP,
 	public GLCompileMacro_USE_RELIEF_MAPPING {
 	public:

src/engine/renderer/glsl_source/liquid_fp.glsl

@@ -130,7 +130,12 @@ void	main()
 
 	// compute light color from light grid
 	vec3 ambientColor, lightColor;
-	ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
+	#if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
+		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
+	#else // !( defined(USE_GRID_LIGHTING) && defined(USE_GRID_DELUXE_MAPPING) )
+		ambientColor = vec3( 0.0, 0.0, 0.0 );
+		lightColor = vec3( 0.0, 0.0, 0.0 );
+	#endif
 
 	// compute light direction in world space
 	vec4 texel = texture3D(u_LightGrid2, lightGridPos);
@@ -139,11 +144,15 @@ void	main()
 	vec4 diffuse = vec4(0.0, 0.0, 0.0, 1.0);
 
 	// compute the specular term
-	#if defined(USE_REFLECTIVE_SPECULAR)
-		computeDeluxeLight(lightDir, normal, viewDir, lightColor, diffuse, reflectColor, color, u_EnvironmentMap0, u_EnvironmentMap1);
-	#else // !USE_REFLECTIVE_SPECULAR
-		computeDeluxeLight(lightDir, normal, viewDir, lightColor, diffuse, reflectColor, color);
-	#endif // !USE_REFLECTIVE_SPECULAR
+	#if defined(USE_DELUXE_MAPPING) || defined(USE_GRID_DELUXE_MAPPING)
+		#if defined(USE_REFLECTIVE_SPECULAR)
+			computeDeluxeLight(lightDir, normal, viewDir, lightColor, diffuse, reflectColor, color, u_EnvironmentMap0, u_EnvironmentMap1);
+		#else // !USE_REFLECTIVE_SPECULAR
+			computeDeluxeLight(lightDir, normal, viewDir, lightColor, diffuse, reflectColor, color);
+		#endif // !USE_REFLECTIVE_SPECULAR
+	#else // !USE_DELUXE_MAPPING && !USE_GRID_DELUXE_MAPPING
+		computeLight(lightColor, diffuse, color);
+	#endif // !USE_DELUXE_MAPPING && !USE_GRID_DELUXE_MAPPING
 
 	outputColor = color;
 

src/engine/renderer/tr_shade.cpp

@@ -2244,17 +2244,25 @@ void Render_liquid( shaderStage_t *pStage )
 	// Tr3B: don't allow blend effects
 	GL_State( pStage->stateBits & ~( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS | GLS_DEPTHMASK_TRUE ) );
 
+	lightMode_t lightMode;
+	deluxeMode_t deluxeMode;
+	SetLightDeluxeMode( &tess, pStage->type, lightMode, deluxeMode );
+
 	// choose right shader program
 	gl_liquidShader->SetHeightMapInNormalMap( pStage->hasHeightMapInNormalMap );
 
 	gl_liquidShader->SetReliefMapping( pStage->enableReliefMapping );
 
+	gl_liquidShader->SetGridDeluxeMapping( deluxeMode == deluxeMode_t::GRID );
+
+	gl_liquidShader->SetGridLighting( lightMode == lightMode_t::GRID );
+
 	// enable shader, set arrays
 	gl_liquidShader->BindProgram( pStage->deformIndex );
 	gl_liquidShader->SetRequiredVertexPointers();
 
 	// set uniforms
-	VectorCopy( backEnd.viewParms.orientation.origin, viewOrigin );  // in world space
+	VectorCopy( backEnd.viewParms.orientation.origin, viewOrigin ); // in world space
 
 	fogDensity = RB_EvalExpression( &pStage->fogDensityExp, 0.001 );
 	VectorCopy( tess.svars.color.ToArray(), fogColor );