Check the flat qualifier from the correct member

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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 724538ffb95a84e6cbf69775b2c0e6f0664bc428..2b878b2b14569a75aa77d5da5ef08c0cb130488f 100644 (file)
--- 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;
 };
 
-const int max_lights = 6;
-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;