Remove unused shader volumetricFog

DaemonEngine · Sep 16, 2021 · 51a347b · 51a347b
1 parent 281c42e
commit 51a347b
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 201 deletions.
diff --git a/src.cmake b/src.cmake
@@ -143,8 +143,6 @@ set(GLSLSOURCELIST
     ${ENGINE_DIR}/renderer/glsl_source/vertexSimple_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/vertexSkinning_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/vertexSprite_vp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/volumetricFog_fp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/volumetricFog_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/blurX_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/blurX_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/blurY_fp.glsl

diff --git a/src/engine/renderer/gl_shader.cpp b/src/engine/renderer/gl_shader.cpp
@@ -54,7 +54,6 @@ GLShader_blurX                           *gl_blurXShader = nullptr;
 GLShader_blurY                           *gl_blurYShader = nullptr;
 GLShader_debugShadowMap                  *gl_debugShadowMapShader = nullptr;
 GLShader_liquid                          *gl_liquidShader = nullptr;
-GLShader_volumetricFog                   *gl_volumetricFogShader = nullptr;
 GLShader_motionblur                      *gl_motionblurShader = nullptr;
 GLShader_ssao                            *gl_ssaoShader = nullptr;
 GLShader_depthtile1                      *gl_depthtile1Shader = nullptr;
@@ -2103,23 +2102,6 @@ void GLShader_liquid::SetShaderProgramUniforms( shaderProgram_t *shaderProgram )
 	glUniform1i( glGetUniformLocation( shaderProgram->program, "u_HeightMap" ), 15 );
 }
 
-GLShader_volumetricFog::GLShader_volumetricFog( GLShaderManager *manager ) :
-	GLShader( "volumetricFog", ATTR_POSITION, manager ),
-	u_ViewOrigin( this ),
-	u_UnprojectMatrix( this ),
-	u_ModelViewMatrix( this ),
-	u_FogDensity( this ),
-	u_FogColor( this )
-{
-}
-
-void GLShader_volumetricFog::SetShaderProgramUniforms( shaderProgram_t *shaderProgram )
-{
-	glUniform1i( glGetUniformLocation( shaderProgram->program, "u_DepthMap" ), 0 );
-	glUniform1i( glGetUniformLocation( shaderProgram->program, "u_DepthMapBack" ), 1 );
-	glUniform1i( glGetUniformLocation( shaderProgram->program, "u_DepthMapFront" ), 2 );
-}
-
 GLShader_motionblur::GLShader_motionblur( GLShaderManager *manager ) :
 	GLShader( "motionblur", ATTR_POSITION, manager ),
 	u_blurVec( this )

diff --git a/src/engine/renderer/gl_shader.h b/src/engine/renderer/gl_shader.h
@@ -2605,19 +2605,6 @@ class GLShader_liquid :
 	void SetShaderProgramUniforms( shaderProgram_t *shaderProgram );
 };
 
-class GLShader_volumetricFog :
-	public GLShader,
-	public u_ViewOrigin,
-	public u_UnprojectMatrix,
-	public u_ModelViewMatrix,
-	public u_FogDensity,
-	public u_FogColor
-{
-public:
-	GLShader_volumetricFog( GLShaderManager *manager );
-	void SetShaderProgramUniforms( shaderProgram_t *shaderProgram );
-};
-
 class GLShader_motionblur :
 	public GLShader,
 	public u_blurVec
@@ -2698,7 +2685,6 @@ extern GLShader_blurX                           *gl_blurXShader;
 extern GLShader_blurY                           *gl_blurYShader;
 extern GLShader_debugShadowMap                  *gl_debugShadowMapShader;
 extern GLShader_liquid                          *gl_liquidShader;
-extern GLShader_volumetricFog                   *gl_volumetricFogShader;
 extern GLShader_motionblur                      *gl_motionblurShader;
 extern GLShader_ssao                            *gl_ssaoShader;
 extern GLShader_depthtile1                      *gl_depthtile1Shader;

diff --git a/src/engine/renderer/glsl_source/volumetricFog_fp.glsl b/src/engine/renderer/glsl_source/volumetricFog_fp.glsl
diff --git a/src/engine/renderer/glsl_source/volumetricFog_vp.glsl b/src/engine/renderer/glsl_source/volumetricFog_vp.glsl
diff --git a/src/engine/renderer/shaders.cpp b/src/engine/renderer/shaders.cpp
@@ -7,8 +7,6 @@
 #include "vertexSimple_vp.glsl.h"
 #include "vertexSkinning_vp.glsl.h"
 #include "vertexSprite_vp.glsl.h"
-#include "volumetricFog_fp.glsl.h"
-#include "volumetricFog_vp.glsl.h"
 #include "blurX_fp.glsl.h"
 #include "blurX_vp.glsl.h"
 #include "blurY_fp.glsl.h"
@@ -120,6 +118,4 @@ std::unordered_map<std::string, std::string> shadermap({
 	{ "glsl/vertexSimple_vp.glsl", std::string(reinterpret_cast<const char*>(vertexSimple_vp_glsl), sizeof(vertexSimple_vp_glsl)) },
 	{ "glsl/vertexSkinning_vp.glsl", std::string(reinterpret_cast<const char*>(vertexSkinning_vp_glsl), sizeof(vertexSkinning_vp_glsl)) },
 	{ "glsl/vertexSprite_vp.glsl", std::string(reinterpret_cast<const char*>(vertexSprite_vp_glsl), sizeof(vertexSprite_vp_glsl)) },
-	{ "glsl/volumetricFog_fp.glsl", std::string(reinterpret_cast<const char*>(volumetricFog_fp_glsl), sizeof(volumetricFog_fp_glsl)) },
-	{ "glsl/volumetricFog_vp.glsl", std::string(reinterpret_cast<const char*>(volumetricFog_vp_glsl), sizeof(volumetricFog_vp_glsl)) },
 	});
diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp
@@ -119,12 +119,6 @@ static void GLSL_InitGPUShadersOrError()
 		gl_shaderManager.load( gl_liquidShader );
 	}
 
-#if !defined( GLSL_COMPILE_STARTUP_ONLY )
-
-	gl_shaderManager.load( gl_volumetricFogShader );
-
-#endif // #if !defined(GLSL_COMPILE_STARTUP_ONLY)
-
 	/* NOTE: motionblur is enabled by cg_motionblur which is a client cvar
 	so we have to build it in all cases. */
 	gl_shaderManager.load( gl_motionblurShader );
@@ -244,7 +238,6 @@ void GLSL_ShutdownGPUShaders()
 	gl_blurYShader = nullptr;
 	gl_debugShadowMapShader = nullptr;
 	gl_liquidShader = nullptr;
-	gl_volumetricFogShader = nullptr;
 	gl_motionblurShader = nullptr;
 	gl_ssaoShader = nullptr;
 	gl_depthtile1Shader = nullptr;