X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=b3202738def94e9c3e061f7ccb7304f47ad59104;hb=7c797f8445ab02381e358472755e94e5c5125252;hp=3fdd606b1b51f70585fc9fd619133b13e63a46b3;hpb=b4fe073653da9e27bf486b1b4366fe44b6138bb4;p=libs%2Fgl.git

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 3fdd606b..b3202738 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -6,14 +6,12 @@ struct LightSourceParameters
 	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
+layout(set=0) uniform CameraTransform
 {
 	mat4 eye_world_matrix;
 	mat4 world_eye_matrix;
@@ -21,8 +19,8 @@ uniform CameraTransform
 	mat4 eye_clip_matrix;
 };
 
-layout(constant_id=auto) const int max_lights = 4;
-uniform Lighting
+const int max_lights = 6;
+layout(set=0) uniform Lighting
 {
 	LightSourceParameters light_sources[max_lights];
 	vec4 ambient_color;
@@ -30,19 +28,12 @@ uniform Lighting
 	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;
 layout(location=2) in vec3 normal;
 layout(location=3) in vec3 tangent;
-layout(location=4) in ivec4 group;
+layout(location=4) in uvec4 group;
 layout(location=5) in vec4 weight;
 layout(location=6) in vec4 texcoord;
 layout(location=7) in vec4 texcoord1;