X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=e20e36dd555014087999c0ef86324f7f68b6a222;hb=7f03ee52e8af5f857e44702b6d1c2822a51c62ef;hp=6a8ee8d8f63713260ff05b98879b8e7f30644505;hpb=3500f13f51dabadd2e7f06b81820936520cc8115;p=libs%2Fgl.git

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 6a8ee8d8..e20e36dd 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -5,15 +5,6 @@ struct LightSourceParameters
 	vec4 specular;
 };
 
-struct BasicMaterialParameters
-{
-	vec4 diffuse;
-	vec4 specular;
-	vec4 emission;
-	float shininess;
-	float reflectivity;
-};
-
 struct ClipPlane
 {
 	vec4 equation;
@@ -27,11 +18,6 @@ uniform Transform
 	mat4 projection_matrix;
 };
 
-uniform BasicMaterial
-{
-	BasicMaterialParameters basic_material;
-};
-
 uniform Lighting
 {
 	// Declared as an array for compatibility reasons
@@ -44,26 +30,7 @@ uniform Lighting
 	float fog_density;
 };
 
-uniform sampler2D diffuse_map;
-uniform sampler2D specular_map;
-uniform sampler2D shininess_map;
-uniform sampler2D emission_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];