Clean-up

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2184,7 +2184,7 @@ GLuint GLShaderManager::SortUniforms( std::vector<GLUniform*>& uniforms ) {
 		auto iterNext = FindUniformForOffset( uniformQueue, structSize );
 		if ( iterNext == uniformQueue.end() ) {
 			// add 1 unit of padding
-			ASSERT( !_materialSystemUniforms.back()->_components); // array WriteToBuffer impls don't handle padding correctly
+			ASSERT( !uniforms.back()->_components ); // array WriteToBuffer impls don't handle padding correctly
 			++structSize;
 			++uniforms.back()->_std430Size;
 		} else {
@@ -3078,7 +3078,6 @@ GlobalUBOProxy::GlobalUBOProxy() :
 	u_ColorMap3D( this ),
 	u_DepthMap( this ),
 	u_PortalMap( this ),
-	u_FogMap( this ),
 	u_DepthTile1( this ),
 	u_DepthTile2( this ),
 	u_LightTiles( this ),

src/engine/renderer/gl_shader.h

@@ -3793,7 +3793,6 @@ class GlobalUBOProxy :
 	public u_ColorMap3D,
 	public u_DepthMap,
 	public u_PortalMap,
-	public u_FogMap,
 	public u_DepthTile1,
 	public u_DepthTile2,
 	public u_LightTiles,

src/engine/renderer/glsl_source/fogGlobal_fp.glsl

@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #insert common
 #insert fogEquation_fp
 
+#define DEPTHMAP_GLSL
+
 uniform sampler2D	u_DepthMap;
 
 uniform colorPack u_Color;

src/engine/renderer/glsl_source/fogQuake3_fp.glsl

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #insert fogEquation_fp
 
-#define FOGQUAKE3_GLSL
+#define DEPTHMAP_GLSL
 
 uniform float u_FogEyeT;
 

src/engine/renderer/glsl_source/material_fp.glsl

@@ -52,10 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		sampler3D u_ColorMap3D = sampler3D( u_ColorMap3D_initial );
 	#endif // !CAMERAEFFECTS_GLSL
 
-	#if defined(FOGQUAKE3_GLSL)
-		sampler2D u_FogMap = sampler2D( u_FogMap_initial );
-	#endif // !FOGQUAKE3_GLSL
-
 	#if defined(LIQUID_GLSL)
 		sampler2D u_PortalMap = sampler2D( u_PortalMap_initial );
 	#endif // !LIQUID_GLSL

src/engine/renderer/tr_bsp.cpp

@@ -4663,10 +4663,6 @@ static void SetConstUniforms() {
 
 		globalUBOProxy->SetUniform_PortalMapBindless( GL_BindToTMU( 1, tr.portalRenderImage ) );
 
-		globalUBOProxy->SetUniform_FogMapBindless(
-			GL_BindToTMU( 0, tr.fogImage )
-		);
-
 		if ( glConfig.realtimeLighting ) {
 			globalUBOProxy->SetUniform_DepthTile1Bindless(
 				GL_BindToTMU( 0, tr.depthtile1RenderImage )