Fix some errors in the shader library

[libs/gl.git] / shaderlib / common.glsl

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 7222b00f4f2439c0739eeff8dec7d3d97c77c0c3..eb191e45dc7f6e03ce31473b81eba73449241c40 100644 (file)
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -1,7 +1,7 @@
 import msp_interface;
 import shadow;
 
-const bool use_normal_map = false;
+layout(constant_id=auto) const bool use_normal_map = false;
 
 #pragma MSP stage(vertex)
 vec4 get_vertex_position()
@@ -44,7 +44,6 @@ void standard_transform()
        out vec3 tbn_halfway_dir = eye_halfway_dir*eye_tbn_matrix;
 
        out vec3 tbn_zenith_dir = eye_zenith_dir*eye_tbn_matrix;
-       out vec3 shadow_coord = (shd_eye_matrix*eye_vertex).xyz;
        out float fog_coord = eye_vertex.z;
 
        for(int i=0; i<max_clip_planes; ++i)
@@ -65,17 +64,17 @@ void main()
 }
 
 #pragma MSP stage(fragment)
-vec3 get_normal_sample()
+vec3 get_fragment_normal()
 {
        if(use_normal_map)
-               return texture(normal_map, texcoord.xy).xyz*2.0-1.0;
+               return normalize(texture(normal_map, texcoord.xy).xyz*2.0-1.0);
        else
                return vec3(0.0, 0.0, 1.0);
 }
 
 vec4 get_environment_sample(vec3 direction)
 {
-       return texture(environment, direction);
+       return texture(environment_map, direction);
 }
 
 vec3 get_reflection(vec3 normal, vec3 look)
@@ -90,5 +89,5 @@ vec3 get_reflection(vec3 normal, vec3 look)
 vec3 apply_fog(vec3 color)
 {
        float fog_value = exp(fog_coord*fog_density);
-       return mix(fog_color, color, fog_value);
+       return mix(fog_color.rgb, color, fog_value);
 }