Store object transform in a push constant block

[libs/gl.git] / shaderlib / msp_interface.glsl

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 13cd9ccf9665a92d6603164639e1edc6099e6847..3ad27c43351aff10ad3ad9a8bee164098563b06e 100644 (file)
--- 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];