Annotate uniforms with descriptor set layout qualifiers

[libs/gl.git] / builtin_data / _sky_backdrop.glsl

diff --git a/builtin_data/_sky_backdrop.glsl b/builtin_data/_sky_backdrop.glsl
index 0aac6c8080553da91a246b18f7dd6d010be11e5a..8e90d91ccb7aeec9c6624421f69b1acd1921c564 100644 (file)
--- a/builtin_data/_sky_backdrop.glsl
+++ b/builtin_data/_sky_backdrop.glsl
@@ -1,22 +1,22 @@
 import msp_interface;
 import _sky;
 
-uniform sampler2D distant;
+layout(set=2) uniform sampler2D distant;
 
 #pragma MSP stage(vertex)
 void main()
 {
        gl_Position = vec4(vertex.xy, 1.0, 1.0);
-       mat4 inv_projection = inverse(projection_matrix);
-       out vec4 view_dir = inv_projection*vec4(vertex.xy, -1.0, 1.0);
+       out vec4 view_dir = eye_clip_matrix*vec4(vertex.xy, -1.0, 1.0);
        view_dir /= view_dir.w;
-       view_dir = inverse(eye_world_matrix)*vec4(view_dir.xyz, 0.0);
+       view_dir = world_eye_matrix*vec4(view_dir.xyz, 0.0);
 }
 
 #pragma MSP stage(fragment)
+layout(location=0) out vec4 frag_color;
 void main()
 {
        vec3 nview = normalize(view_dir.xyz);
        float azimuth = atan(nview.y, nview.x);
-       frag_color = texture(distant, vec2(azimuth/(2*pi), nview.z*0.5+0.5))*light_color;
+       frag_color = texture(distant, vec2(azimuth/(2*PI), nview.z*0.5+0.5))*light_color;
 }