X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=3ad27c43351aff10ad3ad9a8bee164098563b06e;hb=5ced451549e2238bb1195d03419437a395b9afec;hp=860b0c794d23a4b6edd0bd61859f8e2f1dfd82ae;hpb=07a69fb2c913d489510e384599ae63ed9e045c60;p=libs%2Fgl.git

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 860b0c79..3ad27c43 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -2,15 +2,15 @@ struct LightSourceParameters
 {
 	vec4 position;
 	vec3 color;
+	int type;
+	vec3 attenuation;
 };
 
-struct ClipPlane
+layout(push_constant) uniform ObjectTransform
 {
-	vec4 equation;
+	mat4 world_obj_matrix;
+	mat3 world_obj_normal_matrix;
 };
-
-uniform mat4 world_obj_matrix;
-uniform mat3 world_obj_normal_matrix;
 uniform CameraTransform
 {
 	mat4 eye_world_matrix;
@@ -19,25 +19,15 @@ uniform CameraTransform
 	mat4 eye_clip_matrix;
 };
 
+const int max_lights = 6;
 uniform Lighting
 {
-	// Declared as an array for compatibility reasons
-	LightSourceParameters light_sources[1];
+	LightSourceParameters light_sources[max_lights];
 	vec4 ambient_color;
-	vec4 sky_color;
-	vec3 world_zenith_dir;
-	float horizon_limit;
 	vec4 fog_color;
 	float fog_density;
 };
 
-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];
-};
-
 #pragma MSP stage(vertex)
 layout(location=0) in vec4 vertex;
 layout(location=1) in vec4 color;
@@ -50,6 +40,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;