From bfa2bbe590d9dad265d45ce9e79eb113f6974db5 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Fri, 4 Jun 2021 19:55:15 -0700 Subject: [PATCH] Snapshot quad-glsl to WGSL, not SPIR-V and IR. In tests/out, stop generating the uncommitted files quad-glsl.ron and quad-glsl.spvasm, and add the snapshot quad-glsl.wgsl. --- tests/out/quad-glsl.wgsl | 40 ++++++++++++++++++++++++++++++++++++++++ tests/snapshots.rs | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 tests/out/quad-glsl.wgsl diff --git a/tests/out/quad-glsl.wgsl b/tests/out/quad-glsl.wgsl new file mode 100644 index 0000000000..dfadc6ec8a --- /dev/null +++ b/tests/out/quad-glsl.wgsl @@ -0,0 +1,40 @@ +struct VertexOutput { + [[location(0), interpolate(perspective)]] member: vec2; + [[builtin(position)]] member1: vec4; +}; + +struct FragmentOutput { + [[location(0), interpolate(perspective)]] member2: vec4; +}; + +var a_pos: vec2; +var a_uv: vec2; +var v_uv: vec2; +var gl_Position: vec4; +var v_uv1: vec2; +var o_color: vec4; + +fn vert_main() { + v_uv = a_uv; + gl_Position = vec4((1.2000000476837158 * a_pos), 0.0, 1.0); + return; +} + +fn frag_main() { + o_color = vec4(1.0, 1.0, 1.0, 1.0); + return; +} + +[[stage(vertex)]] +fn vert_main1([[location(0), interpolate(perspective)]] param: vec2, [[location(1), interpolate(perspective)]] param1: vec2) -> VertexOutput { + a_pos = param; + a_uv = param1; + vert_main(); + return VertexOutput(v_uv, gl_Position); +} + +[[stage(fragment)]] +fn frag_main1() -> FragmentOutput { + frag_main(); + return FragmentOutput(o_color); +} diff --git a/tests/snapshots.rs b/tests/snapshots.rs index 25c6887a6e..a5aebfc69a 100644 --- a/tests/snapshots.rs +++ b/tests/snapshots.rs @@ -421,5 +421,5 @@ fn convert_glsl_quad() { let mut entry_points = naga::FastHashMap::default(); entry_points.insert("vert_main".to_string(), naga::ShaderStage::Vertex); entry_points.insert("frag_main".to_string(), naga::ShaderStage::Fragment); - convert_glsl("quad-glsl", entry_points, Targets::SPIRV | Targets::IR); + convert_glsl("quad-glsl", entry_points, Targets::WGSL); }