OpenGL3: Drop always-zero vSpecularColor from the shaders

diff --git a/media/Shaders/OneTextureBlend.fsh b/media/Shaders/OneTextureBlend.fsh
index c348016c9eaa427bdab5f48972813f24b33fb030..7ecb7e1a2cc345e200262d8ae43919c48b101556 100644 (file)
--- a/media/Shaders/OneTextureBlend.fsh
+++ b/media/Shaders/OneTextureBlend.fsh
@@ -18,7 +18,6 @@ uniform float uFogDensity;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 float computeFog()
@@ -54,7 +53,6 @@ void main()
                Color1 = texture2D(uTextureUnit0, vTextureCoord0);
 
        vec4 FinalColor = Color0 * Color1;
-       FinalColor += vSpecularColor;
 
        if (uBlendType == 1)
        {

diff --git a/media/Shaders/Solid.fsh b/media/Shaders/Solid.fsh
index df1010e621b407c6850522963c716f84b1a7ad51..c85c6baf17685d474c7823999615b631f8a1d8ea 100644 (file)
--- a/media/Shaders/Solid.fsh
+++ b/media/Shaders/Solid.fsh
@@ -17,7 +17,6 @@ uniform float uFogDensity;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 float computeFog()
@@ -50,7 +49,6 @@ void main()
 
        if (bool(uTextureUsage0))
                Color *= texture2D(uTextureUnit0, vTextureCoord0);
-       Color += vSpecularColor;
 
        if (bool(uFogEnable))
        {

diff --git a/media/Shaders/Solid.vsh b/media/Shaders/Solid.vsh
index c260409b25150b60e37fbb48a022133a284188d0..7379e5bb4ffbed61fa80d73096fc08bd991f349e 100644 (file)
--- a/media/Shaders/Solid.vsh
+++ b/media/Shaders/Solid.vsh
@@ -20,7 +20,6 @@ uniform float uThickness;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 void main()
@@ -32,7 +31,6 @@ void main()
        vTextureCoord0 = vec4(uTMatrix0 * TextureCoord0).xy;
 
        vVertexColor = inVertexColor.bgra;
-       vSpecularColor = vec4(0.0, 0.0, 0.0, 0.0);
 
        vec3 Position = (uWVMatrix * vec4(inVertexPosition, 1.0)).xyz;
 

diff --git a/media/Shaders/TransparentAlphaChannel.fsh b/media/Shaders/TransparentAlphaChannel.fsh
index cef349a480d5d9e30d69c83acbdef4f870307d19..8491068aa08ca90ba08fdce1ebf0e3f78052f94e 100644 (file)
--- a/media/Shaders/TransparentAlphaChannel.fsh
+++ b/media/Shaders/TransparentAlphaChannel.fsh
@@ -18,7 +18,6 @@ uniform float uFogDensity;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 float computeFog()
@@ -57,7 +56,6 @@ void main()
                if (Color.a < uAlphaRef)
                        discard;
        }
-       Color += vSpecularColor;
 
        if (bool(uFogEnable))
        {

diff --git a/media/Shaders/TransparentAlphaChannelRef.fsh b/media/Shaders/TransparentAlphaChannelRef.fsh
index fab4eeeae7d9f7c639665b4b0abc113ade0ef699..ac762f0c249a284154d4e8dc05cd7a37f0df9451 100644 (file)
--- a/media/Shaders/TransparentAlphaChannelRef.fsh
+++ b/media/Shaders/TransparentAlphaChannelRef.fsh
@@ -18,7 +18,6 @@ uniform float uFogDensity;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 float computeFog()
@@ -55,8 +54,6 @@ void main()
        if (Color.a < uAlphaRef)
                discard;
 
-       Color += vSpecularColor;
-
        if (bool(uFogEnable))
        {
                float FogFactor = computeFog();

diff --git a/media/Shaders/TransparentVertexAlpha.fsh b/media/Shaders/TransparentVertexAlpha.fsh
index df1010e621b407c6850522963c716f84b1a7ad51..c85c6baf17685d474c7823999615b631f8a1d8ea 100644 (file)
--- a/media/Shaders/TransparentVertexAlpha.fsh
+++ b/media/Shaders/TransparentVertexAlpha.fsh
@@ -17,7 +17,6 @@ uniform float uFogDensity;
 
 varying vec2 vTextureCoord0;
 varying vec4 vVertexColor;
-varying vec4 vSpecularColor;
 varying float vFogCoord;
 
 float computeFog()
@@ -50,7 +49,6 @@ void main()
 
        if (bool(uTextureUsage0))
                Color *= texture2D(uTextureUnit0, vTextureCoord0);
-       Color += vSpecularColor;
 
        if (bool(uFogEnable))
        {