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;
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;