Fix ancient-remains foliage that uses alphaGen portal

src.cmake

@@ -139,8 +139,6 @@ set(GLSL_EMBED_LIST
     lightMapping_fp.glsl
     liquid_vp.glsl
     liquid_fp.glsl
-    portal_vp.glsl
-    portal_fp.glsl
     reflection_CB_vp.glsl
     reflection_CB_fp.glsl
     screen_vp.glsl

src/engine/renderer/GeometryOptimiser.cpp

@@ -100,10 +100,6 @@ void MarkShaderBuildScreen( const shaderStage_t* ) {
 	gl_screenShader->MarkProgramForBuilding();
 }
 
-void MarkShaderBuildPortal( const shaderStage_t* ) {
-	gl_portalShader->MarkProgramForBuilding();
-}
-
 void MarkShaderBuildHeatHaze( const shaderStage_t* pStage ) {
 	ProcessShaderHeatHaze( pStage );
 	gl_heatHazeShader->MarkProgramForBuilding();

src/engine/renderer/GeometryOptimiser.h

@@ -84,7 +84,6 @@ void MarkShaderBuildLightMapping( const shaderStage_t* pStage );
 void MarkShaderBuildReflection( const shaderStage_t* pStage );
 void MarkShaderBuildSkybox( const shaderStage_t* pStage );
 void MarkShaderBuildScreen( const shaderStage_t* pStage );
-void MarkShaderBuildPortal( const shaderStage_t* pStage );
 void MarkShaderBuildHeatHaze( const shaderStage_t* pStage );
 void MarkShaderBuildLiquid( const shaderStage_t* pStage );
 

src/engine/renderer/Material.cpp

@@ -142,7 +142,7 @@ void UpdateSurfaceDataNOP( uint32_t*, shaderStage_t*, bool, bool ) {
 }
 
 void UpdateSurfaceDataGeneric3D( uint32_t* materials, shaderStage_t* pStage, bool, bool ) {
-	// shader_t* shader = pStage->shader;
+	shader_t* shader = pStage->shader;
 
 	materials += pStage->bufferOffset;
 
@@ -154,11 +154,13 @@ void UpdateSurfaceDataGeneric3D( uint32_t* materials, shaderStage_t* pStage, boo
 	alphaGen_t alphaGen = SetAlphaGen( pStage );
 
 	const bool styleLightMap = pStage->type == stageType_t::ST_STYLELIGHTMAP || pStage->type == stageType_t::ST_STYLECOLORMAP;
-	gl_genericShaderMaterial->SetUniform_ColorModulateColorGen_Uint( rgbGen, alphaGen, styleLightMap );
+	gl_genericShaderMaterial->SetUniform_ColorModulateColorGen_Uint( rgbGen, alphaGen, styleLightMap || pStage->forceVertexLighting );
 
 	Tess_ComputeColor( pStage );
 	gl_genericShaderMaterial->SetUniform_Color_Uint( tess.svars.color );
 
+	gl_genericShaderMaterial->SetUniform_InversePortalRange( 1.0f / shader->portalRange );
+
 	gl_genericShaderMaterial->SetUniform_DepthScale( pStage->depthFadeValue );
 
 	gl_genericShaderMaterial->WriteUniformsToBuffer( materials, GLShader::MATERIAL );
@@ -879,6 +881,7 @@ void BindShaderGeneric3D( Material* material ) {
 	// Select shader permutation.
 	gl_genericShaderMaterial->SetTCGenEnvironment( material->tcGenEnvironment );
 	gl_genericShaderMaterial->SetTCGenLightmap( material->tcGen_Lightmap );
+	gl_genericShaderMaterial->SetAlphaGenPortal( material->alphaGenPortal );
 	gl_genericShaderMaterial->SetDepthFade( material->hasDepthFade );
 	gl_genericShaderMaterial->SetDeform( material->deformIndex );
 
@@ -892,6 +895,14 @@ void BindShaderGeneric3D( Material* material ) {
 
 	gl_genericShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
 	gl_genericShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] );
+	{
+		matrix_t unprojectMatrix;
+		MatrixCopy( backEnd.viewParms.projectionMatrix, unprojectMatrix );
+		MatrixInverse( unprojectMatrix );
+		MatrixMultiplyTranslation( unprojectMatrix, -1.0f, -1.0f, -1.0f );
+		MatrixMultiplyScale( unprojectMatrix, 2.0f / windowConfig.vidWidth, 2.0f / windowConfig.vidHeight, 2.0f );
+		gl_genericShaderMaterial->SetUniform_UnprojectMatrix( unprojectMatrix );
+	}
 
 	gl_genericShaderMaterial->SetUniform_DepthMapBindless( GL_BindToTMU( 1, tr.depthSamplerImage ) );
 
@@ -1097,6 +1108,10 @@ void ProcessMaterialGeneric3D( Material* material, shaderStage_t* pStage, Materi
 	gl_genericShaderMaterial->SetTCGenEnvironment( pStage->tcGen_Environment );
 	gl_genericShaderMaterial->SetTCGenLightmap( pStage->tcGen_Lightmap );
 
+	bool alphaGenPortal = pStage->alphaGen == alphaGen_t::AGEN_PORTAL;
+	material->alphaGenPortal = alphaGenPortal;
+	gl_genericShaderMaterial->SetAlphaGenPortal( alphaGenPortal );
+
 	bool hasDepthFade = pStage->hasDepthFade;
 	material->hasDepthFade = hasDepthFade;
 	gl_genericShaderMaterial->SetDepthFade( hasDepthFade );
@@ -1299,7 +1314,8 @@ void MaterialSystem::AddStage( MaterialSurface* surface, shaderStage_t* pStage,
 		}
 
 		if ( pStage->shader->reliefDepthScale != pStage2->shader->reliefDepthScale
-		     || pStage->shader->reliefOffsetBias != pStage2->shader->reliefOffsetBias )
+		     || pStage->shader->reliefOffsetBias != pStage2->shader->reliefOffsetBias
+		     || pStage->shader->portalRange != pStage2->shader->portalRange )
 		{
 			continue;
 		}

src/engine/renderer/Material.h

@@ -129,6 +129,7 @@ struct Material {
 	int deformIndex;
 	bool tcGenEnvironment;
 	bool tcGen_Lightmap;
+	bool alphaGenPortal;
 	bool hasDepthFade;
 
 	bool bspSurface;

src/engine/renderer/gl_shader.cpp

@@ -72,7 +72,6 @@ GLShader_heatHaze                        *gl_heatHazeShader = nullptr;
 GLShader_heatHazeMaterial                *gl_heatHazeShaderMaterial = nullptr;
 GLShader_liquid                          *gl_liquidShader = nullptr;
 GLShader_liquidMaterial                  *gl_liquidShaderMaterial = nullptr;
-GLShader_portal                          *gl_portalShader = nullptr;
 GLShader_reflection                      *gl_reflectionShader = nullptr;
 GLShader_reflectionMaterial              *gl_reflectionShaderMaterial = nullptr;
 GLShader_screen                          *gl_screenShader = nullptr;
@@ -2446,12 +2445,14 @@ GLShader_generic::GLShader_generic() :
 	u_AlphaThreshold( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
+	u_UnprojectMatrix( this ),
 	u_ColorModulateColorGen_Float( this ),
 	u_ColorModulateColorGen_Uint( this ),
 	u_Color_Float( this ),
 	u_Color_Uint( this ),
 	u_Bones( this ),
 	u_VertexInterpolation( this ),
+	u_InversePortalRange( this ),
 	u_DepthScale( this ),
 	u_ProfilerZero( this ),
 	u_ProfilerRenderSubGroups( this ),
@@ -2460,6 +2461,7 @@ GLShader_generic::GLShader_generic() :
 	GLCompileMacro_USE_VERTEX_ANIMATION( this ),
 	GLCompileMacro_USE_TCGEN_ENVIRONMENT( this ),
 	GLCompileMacro_USE_TCGEN_LIGHTMAP( this ),
+	GLCompileMacro_USE_ALPHAGEN_PORTAL( this ),
 	GLCompileMacro_USE_DEPTH_FADE( this )
 {
 }
@@ -2480,8 +2482,10 @@ GLShader_genericMaterial::GLShader_genericMaterial() :
 	u_AlphaThreshold( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
+	u_UnprojectMatrix( this ),
 	u_ColorModulateColorGen_Uint( this ),
 	u_Color_Uint( this ),
+	u_InversePortalRange( this ),
 	u_DepthScale( this ),
 	u_ShowTris( this ),
 	u_MaterialColour( this ),
@@ -2490,6 +2494,7 @@ GLShader_genericMaterial::GLShader_genericMaterial() :
 	GLDeformStage( this ),
 	GLCompileMacro_USE_TCGEN_ENVIRONMENT( this ),
 	GLCompileMacro_USE_TCGEN_LIGHTMAP( this ),
+	GLCompileMacro_USE_ALPHAGEN_PORTAL( this ),
 	GLCompileMacro_USE_DEPTH_FADE( this ) {
 }
 
@@ -2769,21 +2774,6 @@ GLShader_screenMaterial::GLShader_screenMaterial() :
 	u_ModelViewProjectionMatrix( this ) {
 }
 
-GLShader_portal::GLShader_portal() :
-	GLShader( "portal", ATTR_POSITION,
-		false, "portal", "portal" ),
-	u_CurrentMap( this ),
-	u_ModelViewMatrix( this ),
-	u_ModelViewProjectionMatrix( this ),
-	u_InversePortalRange( this )
-{
-}
-
-void GLShader_portal::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
-{
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 0 );
-}
-
 GLShader_contrast::GLShader_contrast() :
 	GLShader( "contrast", ATTR_POSITION,
 		false, "screenSpace", "contrast" ),

src/engine/renderer/gl_shader.h

@@ -939,6 +939,7 @@ class GLCompileMacro
 	  USE_REFLECTIVE_SPECULAR,
 	  LIGHT_DIRECTIONAL,
 	  USE_DEPTH_FADE,
+	  USE_ALPHAGEN_PORTAL,
 	  USE_PHYSICAL_MAPPING,
 	};
 
@@ -1425,6 +1426,35 @@ class GLCompileMacro_USE_DEPTH_FADE :
 	}
 };
 
+class GLCompileMacro_USE_ALPHAGEN_PORTAL :
+	GLCompileMacro
+{
+public:
+	GLCompileMacro_USE_ALPHAGEN_PORTAL( GLShader *shader ) :
+		GLCompileMacro( shader )
+	{
+	}
+
+	const char *GetName() const override
+	{
+		return "USE_ALPHAGEN_PORTAL";
+	}
+
+	EGLCompileMacro GetType() const override
+	{
+		return EGLCompileMacro::USE_ALPHAGEN_PORTAL;
+	}
+
+	int GetShaderTypes() const override {
+		return ShaderType::FRAGMENT;
+	}
+
+	void SetAlphaGenPortal( bool enable )
+	{
+		SetMacro( enable );
+	}
+};
+
 class GLCompileMacro_USE_PHYSICAL_MAPPING :
 	GLCompileMacro
 {
@@ -2401,7 +2431,7 @@ class u_InversePortalRange :
 {
 public:
 	u_InversePortalRange( GLShader *shader ) :
-		GLUniform1f( shader, "u_InversePortalRange", PUSH )
+		GLUniform1f( shader, "u_InversePortalRange", MATERIAL_OR_PUSH )
 	{
 	}
 
@@ -2939,12 +2969,14 @@ class GLShader_generic :
 	public u_AlphaThreshold,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
+	public u_UnprojectMatrix,
 	public u_ColorModulateColorGen_Float,
 	public u_ColorModulateColorGen_Uint,
 	public u_Color_Float,
 	public u_Color_Uint,
 	public u_Bones,
 	public u_VertexInterpolation,
+	public u_InversePortalRange,
 	public u_DepthScale,
 	public u_ProfilerZero,
 	public u_ProfilerRenderSubGroups,
@@ -2953,6 +2985,7 @@ class GLShader_generic :
 	public GLCompileMacro_USE_VERTEX_ANIMATION,
 	public GLCompileMacro_USE_TCGEN_ENVIRONMENT,
 	public GLCompileMacro_USE_TCGEN_LIGHTMAP,
+	public GLCompileMacro_USE_ALPHAGEN_PORTAL,
 	public GLCompileMacro_USE_DEPTH_FADE
 {
 public:
@@ -2969,8 +3002,10 @@ class GLShader_genericMaterial :
 	public u_AlphaThreshold,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
+	public u_UnprojectMatrix,
 	public u_ColorModulateColorGen_Uint,
 	public u_Color_Uint,
+	public u_InversePortalRange,
 	public u_DepthScale,
 	public u_ShowTris,
 	public u_MaterialColour,
@@ -2979,6 +3014,7 @@ class GLShader_genericMaterial :
 	public GLDeformStage,
 	public GLCompileMacro_USE_TCGEN_ENVIRONMENT,
 	public GLCompileMacro_USE_TCGEN_LIGHTMAP,
+	public GLCompileMacro_USE_ALPHAGEN_PORTAL,
 	public GLCompileMacro_USE_DEPTH_FADE {
 	public:
 	GLShader_genericMaterial();
@@ -3232,18 +3268,6 @@ class GLShader_screenMaterial :
 	GLShader_screenMaterial();
 };
 
-class GLShader_portal :
-	public GLShader,
-	public u_CurrentMap,
-	public u_ModelViewMatrix,
-	public u_ModelViewProjectionMatrix,
-	public u_InversePortalRange
-{
-public:
-	GLShader_portal();
-	void SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram ) override;
-};
-
 class GLShader_contrast :
 	public GLShader,
 	public u_ColorMap {
@@ -3527,7 +3551,6 @@ extern GLShader_heatHaze                        *gl_heatHazeShader;
 extern GLShader_heatHazeMaterial                *gl_heatHazeShaderMaterial;
 extern GLShader_liquid                          *gl_liquidShader;
 extern GLShader_liquidMaterial                  *gl_liquidShaderMaterial;
-extern GLShader_portal                          *gl_portalShader;
 extern GLShader_reflection                      *gl_reflectionShader;
 extern GLShader_reflectionMaterial              *gl_reflectionShaderMaterial;
 extern GLShader_screen                          *gl_screenShader;

src/engine/renderer/glsl_source/common.glsl

@@ -135,7 +135,6 @@ void ColorModulateColor_lightFactor(
 
 	vec4 unpackedColor = UnpackColor( packedColor );
 
-	unpackedColor.rgb *= lightFactor;
-
 	ModulateColor( colorModulation, unpackedColor, color );
+	color.rgb *= lightFactor;
 }

src/engine/renderer/glsl_source/generic_fp.glsl

@@ -42,6 +42,11 @@ IN(smooth) float        var_FadeDepth;
 uniform sampler2D       u_DepthMap;
 #endif
 
+#if defined(USE_ALPHAGEN_PORTAL)
+uniform float u_InversePortalRange;
+uniform mat4 u_UnprojectMatrix;
+#endif
+
 #insert shaderProfiler_fp
 
 DECLARE_OUTPUT(vec4)
@@ -67,6 +72,16 @@ void	main()
 		return;
 	}
 
+	// Normally alpha modulation is supposed to be done before the alpha test, but this looks
+	// better for the ancient-remains foliage combining alphagen portal with an alpha-tested
+	// plant image: fades out to 0 smoothly instead of cutting off at 0.5.
+#if defined(USE_ALPHAGEN_PORTAL)
+	vec4 position = u_UnprojectMatrix * vec4(gl_FragCoord.xyz, 1.0);
+	float portalAlpha = length(position.xyz / position.w) * u_InversePortalRange;
+portalAlpha = length(position.xyz / position.w) * (1.0/256.0);
+	color.a *= clamp(portalAlpha, 0.0, 1.0);
+#endif
+
 #if defined(USE_DEPTH_FADE)
 	float depth = texture2D(u_DepthMap, gl_FragCoord.xy / r_FBufSize).x;