An assortment of minor fixes

[libs/gl.git] / tests / glsl / keep_spec_constants_in_module.glsl

diff --git a/tests/glsl/keep_spec_constants_in_module.glsl b/tests/glsl/keep_spec_constants_in_module.glsl
index 674e55eced68ae333a47dcf96175cf1ba5ba4ac1..2a6b446e1ffc85be78c249db365cb2831c8c88b7 100644 (file)
--- a/tests/glsl/keep_spec_constants_in_module.glsl
+++ b/tests/glsl/keep_spec_constants_in_module.glsl
@@ -1,7 +1,10 @@
 layout(constant_id=0) const bool use_texture = false;
 layout(constant_id=1) const bool use_vertex_color = false;
 uniform sampler2D tex;
-uniform mat4 mvp;
+layout(push_constant) uniform Transform
+{
+       mat4 mvp;
+};
 
 #pragma MSP stage(vertex)
 layout(location=0) in vec4 position;
@@ -24,10 +27,14 @@ void main()
                frag_color *= color;
 }
 
+// Target API: Vulkan
 // Compile mode: module
 
 /* Expected output: vertex
-layout(location=0) uniform mat4 mvp;
+layout(push_constant) uniform Transform
+{
+       mat4 mvp;
+};
 layout(location=0) in vec4 position;
 layout(location=1) in vec4 color;
 layout(location=2) in vec2 texcoord;
@@ -44,16 +51,16 @@ void main()
 /* Expected output: fragment
 layout(constant_id=0) const bool use_texture = false;
 layout(constant_id=1) const bool use_vertex_color = false;
-layout(location=4) uniform sampler2D tex;
+layout(set=0, binding=71) uniform sampler2D tex;
 layout(location=0) out vec4 frag_color;
 layout(location=1) in vec2 _vs_out_texcoord;
 layout(location=0) in vec4 _vs_out_color;
 void main()
 {
-  frag_color = vec4(1.0);
-  if(use_texture)
-    frag_color *= texture(tex, _vs_out_texcoord);
-  if(use_vertex_color)
-    frag_color *= _vs_out_color;
+       frag_color = vec4(1.0);
+       if(use_texture)
+               frag_color *= texture(tex, _vs_out_texcoord);
+       if(use_vertex_color)
+               frag_color *= _vs_out_color;
 }
 */