X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=e20e36dd555014087999c0ef86324f7f68b6a222;hb=a3c33df71e507380100069ad7ef802b61de351bb;hp=5f391bb5fa882ca39897509974aba622c2b587c2;hpb=b0059bd068c99dadfc922584911fcb25a21b737b;p=libs%2Fgl.git

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 5f391bb5..e20e36dd 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -5,14 +5,6 @@ struct LightSourceParameters
 	vec4 specular;
 };
 
-struct MaterialParameters
-{
-	vec4 ambient;
-	vec4 diffuse;
-	vec4 specular;
-	float shininess;
-};
-
 struct ClipPlane
 {
 	vec4 equation;
@@ -26,12 +18,6 @@ uniform Transform
 	mat4 projection_matrix;
 };
 
-uniform Material
-{
-	MaterialParameters material;
-	float reflectivity;
-};
-
 uniform Lighting
 {
 	// Declared as an array for compatibility reasons
@@ -44,23 +30,7 @@ uniform Lighting
 	float fog_density;
 };
 
-uniform sampler2D diffuse_map;
-uniform sampler2D normal_map;
-
-uniform sampler2DShadow shadow;
-uniform ShadowMap
-{
-	float shadow_darkness;
-	mat4 shd_eye_matrix;
-};
-
-uniform samplerCube environment;
-uniform EnvMap
-{
-	mat3 env_eye_matrix;
-};
-
-const int max_clip_planes = 0;
+layout(constant_id=auto) const int max_clip_planes = 0;
 uniform Clipping
 {
 	ClipPlane clip_planes[max_clip_planes];