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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 13cd9ccf..3ad27c43 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -6,8 +6,11 @@ struct LightSourceParameters
 	vec3 attenuation;
 };
 
-uniform mat4 world_obj_matrix;
-uniform mat3 world_obj_normal_matrix;
+layout(push_constant) uniform ObjectTransform
+{
+	mat4 world_obj_matrix;
+	mat3 world_obj_normal_matrix;
+};
 uniform CameraTransform
 {
 	mat4 eye_world_matrix;
@@ -16,7 +19,7 @@ uniform CameraTransform
 	mat4 eye_clip_matrix;
 };
 
-layout(constant_id=auto) const int max_lights = 4;
+const int max_lights = 6;
 uniform Lighting
 {
 	LightSourceParameters light_sources[max_lights];