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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 13cd9ccf..5ecb4f82 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -6,9 +6,12 @@ struct LightSourceParameters
 	vec3 attenuation;
 };
 
-uniform mat4 world_obj_matrix;
-uniform mat3 world_obj_normal_matrix;
-uniform CameraTransform
+layout(push_constant) uniform ObjectTransform
+{
+	mat4 world_obj_matrix;
+	mat3 world_obj_normal_matrix;
+};
+layout(set=0) uniform CameraTransform
 {
 	mat4 eye_world_matrix;
 	mat4 world_eye_matrix;
@@ -16,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;