X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=b86d09bb32e4a5cdc3d49423f5336cf9d896cae1;hb=594f5277e988a5a7b3b4ae381993da68ed733733;hp=b1b887ea68a92b3f11a308d0895e503473cf8f61;hpb=5ca47579de51342ac3e8ecda2cbb9be2f8b4643a;p=libs%2Fgl.git

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index b1b887ea..b86d09bb 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,8 @@ 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_map;
-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 bool use_clipping = false;
+layout(constant_id=auto) const int max_clip_planes = 8;
 uniform Clipping
 {
 	ClipPlane clip_planes[max_clip_planes];
@@ -71,12 +39,15 @@ uniform Clipping
 
 #pragma MSP stage(vertex)
 layout(location=0) in vec4 vertex;
-layout(location=8) in vec4 texcoord;
-layout(location=3) in vec4 color;
+layout(location=1) in vec4 color;
 layout(location=2) in vec3 normal;
-layout(location=4) in vec3 tangent;
-layout(location=5) in vec3 binormal;
-layout(location=12) in vec4 instance_transform[3];
+layout(location=3) in vec3 tangent;
+layout(location=4) in vec3 binormal;
+layout(location=7) in vec4 texcoord;
+layout(location=8) in vec4 texcoord1;
+layout(location=9) in vec4 texcoord2;
+layout(location=10) in vec4 texcoord3;
+layout(location=13) in vec4 instance_transform[3];
 
 #pragma MSP stage(fragment)
 layout(location=0) out vec4 frag_color;