Fix inconsequential texture binding mistakes

Mistakes with texture binding that didn't break anything:
- Heat haze doesn't really use height map
- 3 shaders used the wrong uniform name when attempting to assign a
  texture uniform to unit 0, but unit 0 is the default so it didn't
  matter.

Author: slipher

src/engine/renderer/gl_shader.cpp

@@ -2564,7 +2564,7 @@ GLShader_reflection::GLShader_reflection():
 
 void GLShader_reflection::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
 {
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMapCube" ), 0 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 1 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), 15 );
 }
@@ -2694,7 +2694,6 @@ GLShader_heatHaze::GLShader_heatHaze() :
 		false, "heatHaze", "heatHaze" ),
 	u_CurrentMap( this ),
 	u_NormalMap( this ),
-	u_HeightMap( this ),
 	u_TextureMatrix( this ),
 	u_DeformMagnitude( this ),
 	u_ModelViewProjectionMatrix( this ),
@@ -2713,15 +2712,13 @@ void GLShader_heatHaze::SetShaderProgramUniforms( ShaderProgramDescriptor *shade
 {
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 0 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 1 );
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), 15 );
 }
 
 GLShader_heatHazeMaterial::GLShader_heatHazeMaterial() :
 	GLShader( "heatHazeMaterial", ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT,
 		true, "heatHaze", "heatHaze" ),
 	u_CurrentMap( this ),
 	u_NormalMap( this ),
-	u_HeightMap( this ),
 	u_TextureMatrix( this ),
 	u_DeformEnable( this ),
 	u_DeformMagnitude( this ),
@@ -2736,7 +2733,6 @@ GLShader_heatHazeMaterial::GLShader_heatHazeMaterial() :
 void GLShader_heatHazeMaterial::SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) {
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_NormalMap" ), 0 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 1 );
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_HeightMap" ), 15 );
 }
 
 GLShader_screen::GLShader_screen() :
@@ -2775,7 +2771,7 @@ GLShader_portal::GLShader_portal() :
 
 void GLShader_portal::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
 {
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 0 );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
 }
 
 GLShader_contrast::GLShader_contrast() :
@@ -2965,7 +2961,7 @@ GLShader_depthtile2::GLShader_depthtile2() :
 
 void GLShader_depthtile2::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
 {
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthMap" ), 0 );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthTile1" ), 0 );
 }
 
 GLShader_lighttile::GLShader_lighttile() :

src/engine/renderer/gl_shader.h

@@ -3510,7 +3510,6 @@ class GLShader_heatHaze :
 	public GLShader,
 	public u_CurrentMap,
 	public u_NormalMap,
-	public u_HeightMap,
 	public u_TextureMatrix,
 	public u_DeformMagnitude,
 	public u_ModelViewProjectionMatrix,
@@ -3532,7 +3531,6 @@ class GLShader_heatHazeMaterial :
 	public GLShader,
 	public u_CurrentMap,
 	public u_NormalMap,
-	public u_HeightMap,
 	public u_TextureMatrix,
 	public u_DeformEnable,
 	public u_DeformMagnitude,