X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Fkeep_spec_constants_in_module.glsl;h=7b9f98c8f690277e889f2a2e2a4dab50c483d807;hb=98f72f1666f45fa96407c96ff2bb88a5962e66c9;hp=a7feab178f41144f65ee90b9e314eda0c21df34d;hpb=05d8360ceef28e0b36e96127e04a82dd77a5c433;p=libs%2Fgl.git diff --git a/tests/glsl/keep_spec_constants_in_module.glsl b/tests/glsl/keep_spec_constants_in_module.glsl index a7feab17..7b9f98c8 100644 --- 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,15 +27,19 @@ void main() frag_color *= color; } +// Target API: Vulkan // Compile mode: module /* Expected output: vertex -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; -out vec4 _vs_out_color; -out vec2 _vs_out_texcoord; +layout(location=0) out vec4 _vs_out_color; +layout(location=1) out vec2 _vs_out_texcoord; void main() { _vs_out_color = color; @@ -44,10 +51,10 @@ void main() /* Expected output: fragment layout(constant_id=0) const bool use_texture = false; layout(constant_id=1) const bool use_vertex_color = false; -uniform sampler2D tex; +layout(set=0, binding=71) uniform sampler2D tex; layout(location=0) out vec4 frag_color; -in vec2 _vs_out_texcoord; -in vec4 _vs_out_color; +layout(location=1) in vec2 _vs_out_texcoord; +layout(location=0) in vec4 _vs_out_color; void main() { frag_color = vec4(1.0);