X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=5c10d06fbcac31a5fd9c06f5e37293ea406c2203;hb=842c817bb679a5a0abc05e8149e2e6e0ae1a0412;hp=7222b00f4f2439c0739eeff8dec7d3d97c77c0c3;hpb=5ca47579de51342ac3e8ecda2cbb9be2f8b4643a;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 7222b00f..5c10d06f 100644
--- 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()
@@ -65,17 +65,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)