Cleanup: rename GLSL shader fogGlobal -> fog

Also move the Render_fog function with its friends.

Author: slipher

src.cmake

@@ -129,8 +129,8 @@ set(GLSL_EMBED_LIST
     vertexSkinning_vp.glsl
 
     # Regular shaders
-    fogGlobal_vp.glsl
-    fogGlobal_fp.glsl
+    fog_vp.glsl
+    fog_fp.glsl
     generic_vp.glsl
     generic_fp.glsl
     heatHaze_vp.glsl

src/engine/renderer/gl_shader.cpp

@@ -55,7 +55,7 @@ GLShader_processSurfaces                 *gl_processSurfacesShader = nullptr;
 GLShader_blur                            *gl_blurShader = nullptr;
 GLShader_cameraEffects                   *gl_cameraEffectsShader = nullptr;
 GLShader_contrast                        *gl_contrastShader = nullptr;
-GLShader_fogGlobal                       *gl_fogGlobalShader = nullptr;
+GLShader_fog                             *gl_fogShader = nullptr;
 GLShader_fxaa                            *gl_fxaaShader = nullptr;
 GLShader_motionblur                      *gl_motionblurShader = nullptr;
 GLShader_ssao                            *gl_ssaoShader = nullptr;
@@ -2688,10 +2688,9 @@ GLShader_skyboxMaterial::GLShader_skyboxMaterial() :
 	u_ModelViewProjectionMatrix( this )
 {}
 
-// TODO: rename
-GLShader_fogGlobal::GLShader_fogGlobal() :
-	GLShader( "fogGlobal", ATTR_POSITION | ATTR_FOG_SURFACE,
-		false, "fogGlobal", "fogGlobal" ),
+GLShader_fog::GLShader_fog() :
+	GLShader( "fog", ATTR_POSITION | ATTR_FOG_SURFACE,
+		false, "fog", "fog" ),
 	u_DepthMap( this ),
 	u_ModelViewProjectionMatrix( this ),
 	u_UnprojectMatrix( this ),
@@ -2703,7 +2702,7 @@ GLShader_fogGlobal::GLShader_fogGlobal() :
 {
 }
 
-void GLShader_fogGlobal::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
+void GLShader_fog::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
 {
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthMap" ), 1 );
 }

src/engine/renderer/gl_shader.h

@@ -3178,7 +3178,7 @@ class GLShader_skyboxMaterial :
 	GLShader_skyboxMaterial();
 };
 
-class GLShader_fogGlobal :
+class GLShader_fog :
 	public GLShader,
 	public u_DepthMap,
 	public u_ModelViewProjectionMatrix,
@@ -3190,7 +3190,7 @@ class GLShader_fogGlobal :
 	public GLCompileMacro_OUTSIDE_FOG
 {
 public:
-	GLShader_fogGlobal();
+	GLShader_fog();
 	void SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram ) override;
 };
 
@@ -3528,7 +3528,7 @@ extern GLShader_processSurfaces                 *gl_processSurfacesShader;
 extern GLShader_blur                            *gl_blurShader;
 extern GLShader_cameraEffects                   *gl_cameraEffectsShader;
 extern GLShader_contrast                        *gl_contrastShader;
-extern GLShader_fogGlobal                       *gl_fogGlobalShader;
+extern GLShader_fog                             *gl_fogShader;
 extern GLShader_fxaa                            *gl_fxaaShader;
 extern GLShader_motionblur                      *gl_motionblurShader;
 extern GLShader_ssao                            *gl_ssaoShader;

…e/renderer/glsl_source/fogGlobal_fp.glsl …/engine/renderer/glsl_source/fog_fp.glslsrc/engine/renderer/glsl_source/fogGlobal_fp.glsl renamed to src/engine/renderer/glsl_source/fog_fp.glsl src/engine/renderer/glsl_source/fogGlobal_fp.glsl renamed to src/engine/renderer/glsl_source/fog_fp.glsl

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-/* fogGlobal_fp.glsl */
+/* fog_fp.glsl */
 
 #insert common
 #insert fogEquation_fp

…e/renderer/glsl_source/fogGlobal_vp.glsl …/engine/renderer/glsl_source/fog_vp.glslsrc/engine/renderer/glsl_source/fogGlobal_vp.glsl renamed to src/engine/renderer/glsl_source/fog_vp.glsl src/engine/renderer/glsl_source/fogGlobal_vp.glsl renamed to src/engine/renderer/glsl_source/fog_vp.glsl

@@ -1419,72 +1419,6 @@ void RB_RenderPostDepthLightTile()
 	GL_CheckErrors();
 }
 
-// TODO: move with other Render_ functions
-void Render_fogGlobal( shaderStage_t *stage )
-{
-	if ( backEnd.refdef.rdflags & RDF_NOWORLDMODEL )
-	{
-		return;
-	}
-
-	if ( r_noFog->integer )
-	{
-		return;
-	}
-
-	GLIMP_LOGCOMMENT( "--- RB_RenderGlobalFog ---" );
-
-	RB_PrepareForSamplingDepthMap();
-
-	GL_Cull( stage->shader->cullType );
-
-	gl_fogGlobalShader->SetOutsideFog( stage->type == stageType_t::ST_FOGMAP_OUTER );
-
-	gl_fogGlobalShader->BindProgram();
-
-	{
-		GL_State( stage->stateBits );
-
-		gl_fogGlobalShader->SetUniform_FogGradient(
-			1.0f / stage->shader->fogParms.depthForOpaque, stage->shader->fogParms.falloffExp );
-		gl_fogGlobalShader->SetUniform_ViewOrigin( backEnd.viewParms.orientation.origin );
-		SetUniform_Color( gl_fogGlobalShader, stage->shader->fogParms.color );
-	}
-
-	switch ( stage->type )
-	{
-	case stageType_t::ST_FOGMAP_INNER:
-	{
-		// It's important to avoid far plane clipping
-		matrix_t projection, mvp;
-		MatrixPerspectiveProjectionFovXYInfiniteRH( projection, tr.refdef.fov_x, tr.refdef.fov_y, 1.0f );
-		MatrixMultiply( projection, glState.modelViewMatrix[ glState.stackIndex ], mvp );
-		gl_fogGlobalShader->SetUniform_ModelViewProjectionMatrix( mvp );
-		break;
-	}
-	case stageType_t::ST_FOGMAP_OUTER:
-	{
-		gl_fogGlobalShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );
-		break;
-	}
-	default:
-		ASSERT_UNREACHABLE();
-	}
-
-	gl_fogGlobalShader->SetUniform_UnprojectMatrix( backEnd.viewParms.unprojectionMatrix );
-
-	// bind u_DepthMap
-	gl_fogGlobalShader->SetUniform_DepthMapBindless(
-		GL_BindToTMU( 1, tr.depthSamplerImage )
-	);
-
-	gl_fogGlobalShader->SetRequiredVertexPointers();
-
-	Tess_DrawElements();
-
-	GL_CheckErrors();
-}
-
 void RB_RenderBloom()
 {
 	if ( ( backEnd.refdef.rdflags & ( RDF_NOWORLDMODEL | RDF_NOBLOOM ) )

src/engine/renderer/tr_backend.cpp

@@ -1536,8 +1536,8 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 			{
 				for ( bool outer : { false, true } )
 				{
-					gl_fogGlobalShader->SetOutsideFog( outer );
-					gl_fogGlobalShader->MarkProgramForBuilding();
+					gl_fogShader->SetOutsideFog( outer );
+					gl_fogShader->MarkProgramForBuilding();
 				}
 			}
 

src/engine/renderer/tr_init.cpp

@@ -3241,7 +3241,7 @@ void GLimp_LogComment_( std::string comment );
 	void Render_portal( shaderStage_t *pStage );
 	void Render_heatHaze( shaderStage_t *pStage );
 	void Render_liquid( shaderStage_t *pStage );
-	void Render_fogGlobal( shaderStage_t *pStage );
+	void Render_fog( shaderStage_t *pStage );
 
 	/*
 	============================================================

src/engine/renderer/tr_local.h

@@ -299,7 +299,7 @@ static void GLSL_InitGPUShadersOrError()
 	}
 
 	// Fog GLSL is always loaded and built because disabling fog is cheat.
-	gl_shaderManager.LoadShader( gl_fogGlobalShader );
+	gl_shaderManager.LoadShader( gl_fogShader );
 
 	if ( r_heatHaze->integer )
 	{
@@ -478,7 +478,7 @@ void GLSL_ShutdownGPUShaders()
 	gl_reflectionShaderMaterial = nullptr;
 	gl_skyboxShader = nullptr;
 	gl_skyboxShaderMaterial = nullptr;
-	gl_fogGlobalShader = nullptr;
+	gl_fogShader = nullptr;
 	gl_heatHazeShader = nullptr;
 	gl_heatHazeShaderMaterial = nullptr;
 	gl_screenShader = nullptr;
@@ -1590,6 +1590,69 @@ void Render_liquid( shaderStage_t *pStage )
 	GL_CheckErrors();
 }
 
+void Render_fog( shaderStage_t *stage )
+{
+	if ( backEnd.refdef.rdflags & RDF_NOWORLDMODEL )
+	{
+		return;
+	}
+
+	if ( r_noFog->integer )
+	{
+		return;
+	}
+
+	GLIMP_LOGCOMMENT( "--- Render_fog ---" );
+
+	RB_PrepareForSamplingDepthMap();
+
+	GL_Cull( stage->shader->cullType );
+
+	gl_fogShader->SetOutsideFog( stage->type == stageType_t::ST_FOGMAP_OUTER );
+
+	gl_fogShader->BindProgram();
+
+	GL_State( stage->stateBits );
+
+	gl_fogShader->SetUniform_FogGradient(
+		1.0f / stage->shader->fogParms.depthForOpaque, stage->shader->fogParms.falloffExp );
+	gl_fogShader->SetUniform_ViewOrigin( backEnd.viewParms.orientation.origin );
+	SetUniform_Color( gl_fogShader, stage->shader->fogParms.color );
+
+	switch ( stage->type )
+	{
+	case stageType_t::ST_FOGMAP_INNER:
+	{
+		// It's important to avoid far plane clipping
+		matrix_t projection, mvp;
+		MatrixPerspectiveProjectionFovXYInfiniteRH( projection, tr.refdef.fov_x, tr.refdef.fov_y, 1.0f );
+		MatrixMultiply( projection, glState.modelViewMatrix[ glState.stackIndex ], mvp );
+		gl_fogShader->SetUniform_ModelViewProjectionMatrix( mvp );
+		break;
+	}
+	case stageType_t::ST_FOGMAP_OUTER:
+	{
+		gl_fogShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );
+		break;
+	}
+	default:
+		ASSERT_UNREACHABLE();
+	}
+
+	gl_fogShader->SetUniform_UnprojectMatrix( backEnd.viewParms.unprojectionMatrix );
+
+	// bind u_DepthMap
+	gl_fogShader->SetUniform_DepthMapBindless(
+		GL_BindToTMU( 1, tr.depthSamplerImage )
+	);
+
+	gl_fogShader->SetRequiredVertexPointers();
+
+	Tess_DrawElements();
+
+	GL_CheckErrors();
+}
+
 /*
 ===============
 Tess_ComputeColor

src/engine/renderer/tr_shade.cpp

@@ -5653,7 +5653,7 @@ static void SetStagesRenderers()
 			case stageType_t::ST_FOGMAP_INNER:
 			case stageType_t::ST_FOGMAP_OUTER:
 				stageRendererOptions = {
-					&Render_fogGlobal, &MarkShaderBuildNOP,
+					&Render_fog, &MarkShaderBuildNOP,
 					&UpdateSurfaceDataNOP, &BindShaderNOP, &ProcessMaterialNOP,
 				};
 				break;