Annotate uniforms with descriptor set layout qualifiers

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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index c4b27b1137e7d77886c15ee510ad0697478a3ff8..5ecb4f82631c365817fbb1ecd956bcf503e13250 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -2,52 +2,41 @@ struct LightSourceParameters
 {
        vec4 position;
        vec3 color;
+       int type;
+       vec3 attenuation;
 };
 
-struct ClipPlane
+layout(push_constant) uniform ObjectTransform
 {
-       vec4 equation;
+       mat4 world_obj_matrix;
+       mat3 world_obj_normal_matrix;
 };
-
-uniform mat4 eye_obj_matrix;
-uniform mat3 eye_obj_normal_matrix;
-uniform Transform
+layout(set=0) uniform CameraTransform
 {
        mat4 eye_world_matrix;
-       mat4 projection_matrix;
+       mat4 world_eye_matrix;
+       mat4 clip_eye_matrix;
+       mat4 eye_clip_matrix;
 };
 
-uniform Lighting
+const int max_lights = 6;
+layout(set=0) uniform Lighting
 {
-       // Declared as an array for compatibility reasons
-       LightSourceParameters light_sources[1];
+       LightSourceParameters light_sources[max_lights];
        vec4 ambient_color;
-       vec4 sky_color;
-       vec3 eye_zenith_dir;
-       float horizon_limit;
        vec4 fog_color;
        float fog_density;
 };
 
-layout(constant_id=auto) const bool use_clipping = false;
-layout(constant_id=auto) const int max_clip_planes = 8;
-uniform Clipping
-{
-       ClipPlane clip_planes[max_clip_planes];
-};
-
 #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 vec4 group;
+layout(location=4) in ivec4 group;
 layout(location=5) in vec4 weight;
 layout(location=6) in vec4 texcoord;
 layout(location=7) in vec4 texcoord1;
 layout(location=8) in vec4 texcoord2;
 layout(location=9) in vec4 texcoord3;
 layout(location=13) in vec4 instance_transform[3];
-
-#pragma MSP stage(fragment)
-layout(location=0) out vec4 frag_color;