Move the frag_color output from msp_interface to common

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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 6c229da0f32da92fc9bd76db74241a5542fba478..3fdd606b1b51f70585fc9fd619133b13e63a46b3 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -2,6 +2,8 @@ struct LightSourceParameters
 {
        vec4 position;
        vec3 color;
+       int type;
+       vec3 attenuation;
 };
 
 struct ClipPlane
@@ -19,10 +21,10 @@ uniform CameraTransform
        mat4 eye_clip_matrix;
 };
 
+layout(constant_id=auto) const int max_lights = 4;
 uniform Lighting
 {
-       // Declared as an array for compatibility reasons
-       LightSourceParameters light_sources[1];
+       LightSourceParameters light_sources[max_lights];
        vec4 ambient_color;
        vec4 fog_color;
        float fog_density;
@@ -47,6 +49,3 @@ layout(location=7) in vec4 texcoord1;
 layout(location=8) in vec4 texcoord2;
 layout(location=9) in vec4 texcoord3;
 layout(location=13) in vec4 instance_transform[3];
-
-#pragma MSP stage(fragment)
-layout(location=0) out vec4 frag_color;