X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fphong.glsl;h=56fa68c7767e1264d2a170baa4931e69ae8c0482;hb=713ff9619daa858ffbd428f7699cd57598563dbd;hp=e3b97f5870d4cb93c2fba04934234af20efd8584;hpb=5ca47579de51342ac3e8ecda2cbb9be2f8b4643a;p=libs%2Fgl.git

diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl
index e3b97f58..56fa68c7 100644
--- a/shaderlib/phong.glsl
+++ b/shaderlib/phong.glsl
@@ -2,16 +2,16 @@ import msp_interface;
 import common;
 import shadow;
 
-const bool use_diffuse_map = false;
-const bool use_specular = false;
-const bool use_specular_map = false;
-const bool use_shininess_map = false;
-const bool use_emission = false;
-const bool use_emission_map = false;
-const bool use_reflectivity = false;
-const bool use_reflectivity_map = false;
-const bool use_sky = false;
-const bool use_fog = false;
+layout(constant_id=auto) const bool use_diffuse_map = false;
+layout(constant_id=auto) const bool use_specular = false;
+layout(constant_id=auto) const bool use_specular_map = false;
+layout(constant_id=auto) const bool use_shininess_map = false;
+layout(constant_id=auto) const bool use_emission = false;
+layout(constant_id=auto) const bool use_emission_map = false;
+layout(constant_id=auto) const bool use_reflectivity = false;
+layout(constant_id=auto) const bool use_reflectivity_map = false;
+layout(constant_id=auto) const bool use_sky = false;
+layout(constant_id=auto) const bool use_fog = false;
 
 #pragma MSP stage(fragment)
 vec4 get_diffuse_color()
@@ -101,7 +101,7 @@ void main()
 	vec3 look;
 	if(use_normal_map)
 	{
-		normal = get_normal_sample();
+		normal = get_fragment_normal();
 		look = normalize(tbn_look_dir);
 	}
 	else