Rearrange various uniforms to be declared in the file which uses them

[libs/gl.git] / shaderlib / msp_interface.glsl

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index fda84de95fff74de5ec6fc11180a05bc6a872168..e20e36dd555014087999c0ef86324f7f68b6a222 100644 (file)
--- 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];
@@ -73,6 +43,7 @@ layout(location=3) 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];
 
 #pragma MSP stage(fragment)
 layout(location=0) out vec4 frag_color;