X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=5f391bb5fa882ca39897509974aba622c2b587c2;hp=13cd9ccf9665a92d6603164639e1edc6099e6847;hb=HEAD;hpb=f82ef715f0d7e1e7d0b93be4b7b89c8ce6bba40b

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 13cd9ccf..2b878b2b 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -1,14 +1,9 @@
-struct LightSourceParameters
+layout(push_constant) uniform ObjectTransform
 {
-	vec4 position;
-	vec3 color;
-	int type;
-	vec3 attenuation;
+	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;
@@ -16,21 +11,12 @@ uniform CameraTransform
 	mat4 eye_clip_matrix;
 };
 
-layout(constant_id=auto) const int max_lights = 4;
-uniform Lighting
-{
-	LightSourceParameters light_sources[max_lights];
-	vec4 ambient_color;
-	vec4 fog_color;
-	float fog_density;
-};
-
 #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;