From e4e409f2ae12b2d1aee82a404cc35456ff87fe66 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Wed, 2 Mar 2022 14:14:02 +0000 Subject: [PATCH] GLSL: remove spurious semicolons. textureQueryLevels() and textureSamples() were being emitted with a spurious semicolon. Bug: tint:1222 Change-Id: I56c561fcaac510b76a27a850f5be522ab7f98307 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/82361 Kokoro: Kokoro Reviewed-by: Ben Clayton Commit-Queue: Stephen White --- src/tint/writer/glsl/generator_impl.cc | 4 ++-- test/tint/benchmark/particles.wgsl.expected.glsl | 2 +- .../builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/105988.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl | 6 +++--- .../builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl | 6 +++--- .../gen/textureNumSamples/2c6f14.wgsl.expected.glsl | 6 +++--- .../gen/textureNumSamples/42f8bb.wgsl.expected.glsl | 6 +++--- .../gen/textureNumSamples/449d23.wgsl.expected.glsl | 6 +++--- .../gen/textureNumSamples/a3c8a0.wgsl.expected.glsl | 6 +++--- .../textureNumSamples/depth_ms.spvasm.expected.glsl | 6 +++--- ...t_SampledImageAccessTest_Variable_0.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_1.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_2.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_3.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_4.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_5.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_6.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_7.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_8.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_0.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_0.spvasm.expected.glsl | 2 +- ...t_SampledImageAccessTest_Variable_0.spvasm.expected.glsl | 2 +- ...ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl | 2 +- ...sterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl | 2 +- ...sterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl | 2 +- 44 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc index fecb069864..6bab9283c4 100644 --- a/src/tint/writer/glsl/generator_impl.cc +++ b/src/tint/writer/glsl/generator_impl.cc @@ -1343,7 +1343,7 @@ bool GeneratorImpl::EmitTextureCall(std::ostream& out, if (!EmitExpression(out, texture)) { return false; } - out << ");"; + out << ")"; return true; } case sem::BuiltinType::kTextureNumSamples: { @@ -1351,7 +1351,7 @@ bool GeneratorImpl::EmitTextureCall(std::ostream& out, if (!EmitExpression(out, texture)) { return false; } - out << ");"; + out << ")"; return true; } default: diff --git a/test/tint/benchmark/particles.wgsl.expected.glsl b/test/tint/benchmark/particles.wgsl.expected.glsl index 8a544f9b80..1ff55f9044 100644 --- a/test/tint/benchmark/particles.wgsl.expected.glsl +++ b/test/tint/benchmark/particles.wgsl.expected.glsl @@ -182,7 +182,7 @@ void simulate(uvec3 GlobalInvocationID) { if ((particle.lifetime < 0.0f)) { ivec2 coord = ivec2(0, 0); { - for(int level = (textureQueryLevels(tint_symbol_1); - 1); (level > 0); level = (level - 1)) { + for(int level = (textureQueryLevels(tint_symbol_1) - 1); (level > 0); level = (level - 1)) { vec4 probabilites = texelFetch(tint_symbol_1, coord, level); vec4 value = vec4(rand()); bvec4 mask = bvec4(uvec4(greaterThanEqual(value, vec4(0.0f, probabilites.xyz))) & uvec4(lessThan(value, probabilites))); diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl index 363c8fd43e..9bbd20a71e 100644 --- a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp samplerCube arg_0_1; void textureNumLevels_076cb5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp samplerCube arg_0_1; void textureNumLevels_076cb5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp samplerCube arg_0_1; void textureNumLevels_076cb5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl index 9dc59aa768..15006a8926 100644 --- a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isamplerCube arg_0_1; void textureNumLevels_080d95() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp isamplerCube arg_0_1; void textureNumLevels_080d95() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp isamplerCube arg_0_1; void textureNumLevels_080d95() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl index e177a2d171..1e3dce5c80 100644 --- a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usampler2D arg_0_1; void textureNumLevels_09ddd0() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp usampler2D arg_0_1; void textureNumLevels_09ddd0() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp usampler2D arg_0_1; void textureNumLevels_09ddd0() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl index ee2c95d4d1..fab6949ece 100644 --- a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2DArray arg_0_1; void textureNumLevels_105988() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2DArray arg_0_1; void textureNumLevels_105988() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2DArray arg_0_1; void textureNumLevels_105988() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl index 08010f6a0c..bab3f808ca 100644 --- a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usampler1D arg_0_1; void textureNumLevels_1e6f3b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp usampler1D arg_0_1; void textureNumLevels_1e6f3b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp usampler1D arg_0_1; void textureNumLevels_1e6f3b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl index 68f1997285..c8737bef7e 100644 --- a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isampler2D arg_0_1; void textureNumLevels_23f750() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp isampler2D arg_0_1; void textureNumLevels_23f750() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp isampler2D arg_0_1; void textureNumLevels_23f750() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl index 994f8884c2..dddffe399f 100644 --- a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp samplerCubeArray arg_0_1; void textureNumLevels_2c3575() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp samplerCubeArray arg_0_1; void textureNumLevels_2c3575() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp samplerCubeArray arg_0_1; void textureNumLevels_2c3575() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl index c0f0a6e703..49f9557308 100644 --- a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isampler1D arg_0_1; void textureNumLevels_32a0ae() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp isampler1D arg_0_1; void textureNumLevels_32a0ae() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp isampler1D arg_0_1; void textureNumLevels_32a0ae() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl index 3aef60b2e7..3ea5d59344 100644 --- a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usampler2DArray arg_0_1; void textureNumLevels_5101cf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp usampler2DArray arg_0_1; void textureNumLevels_5101cf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp usampler2DArray arg_0_1; void textureNumLevels_5101cf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl index 8de7b7644a..c5aa89f5df 100644 --- a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler1D arg_0_1; void textureNumLevels_51b5bb() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp sampler1D arg_0_1; void textureNumLevels_51b5bb() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp sampler1D arg_0_1; void textureNumLevels_51b5bb() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl index e2fc0ee672..d4b77457cc 100644 --- a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp samplerCube arg_0_1; void textureNumLevels_897aaf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp samplerCube arg_0_1; void textureNumLevels_897aaf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp samplerCube arg_0_1; void textureNumLevels_897aaf() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl index f1226e8970..24d4d1b931 100644 --- a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isampler3D arg_0_1; void textureNumLevels_9da7a5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp isampler3D arg_0_1; void textureNumLevels_9da7a5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp isampler3D arg_0_1; void textureNumLevels_9da7a5() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl index db6bc663ee..fb57871d9a 100644 --- a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isamplerCubeArray arg_0_1; void textureNumLevels_a91c03() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp isamplerCubeArray arg_0_1; void textureNumLevels_a91c03() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp isamplerCubeArray arg_0_1; void textureNumLevels_a91c03() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl index 08525ba2e0..27c1a65ff1 100644 --- a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp samplerCubeArray arg_0_1; void textureNumLevels_aee7c8() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp samplerCubeArray arg_0_1; void textureNumLevels_aee7c8() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp samplerCubeArray arg_0_1; void textureNumLevels_aee7c8() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl index c45e25686e..2803f6877e 100644 --- a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2D arg_0_1; void textureNumLevels_b1b12b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2D arg_0_1; void textureNumLevels_b1b12b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2D arg_0_1; void textureNumLevels_b1b12b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl index b6c55fb1f8..59d6c1b1b9 100644 --- a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usampler3D arg_0_1; void textureNumLevels_b4f5ea() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp usampler3D arg_0_1; void textureNumLevels_b4f5ea() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp usampler3D arg_0_1; void textureNumLevels_b4f5ea() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl index 60d7c42c1a..c2785de67f 100644 --- a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isampler2DArray arg_0_1; void textureNumLevels_d004a9() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp isampler2DArray arg_0_1; void textureNumLevels_d004a9() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp isampler2DArray arg_0_1; void textureNumLevels_d004a9() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl index 53548f099b..8084d8e5f8 100644 --- a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler3D arg_0_1; void textureNumLevels_dca09e() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler3D arg_0_1; void textureNumLevels_dca09e() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler3D arg_0_1; void textureNumLevels_dca09e() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl index 6b5a17e492..380ace4aab 100644 --- a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2D arg_0_1; void textureNumLevels_e67231() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2D arg_0_1; void textureNumLevels_e67231() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2D arg_0_1; void textureNumLevels_e67231() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl index 781d655778..4c98081c21 100644 --- a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usamplerCube arg_0_1; void textureNumLevels_ed078b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp usamplerCube arg_0_1; void textureNumLevels_ed078b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp usamplerCube arg_0_1; void textureNumLevels_ed078b() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl index 74c3c18bfa..3b89ce476d 100644 --- a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usamplerCubeArray arg_0_1; void textureNumLevels_f46ec6() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -31,7 +31,7 @@ precision mediump float; uniform highp usamplerCubeArray arg_0_1; void textureNumLevels_f46ec6() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -53,7 +53,7 @@ ERROR: 2 compilation errors. No code generated. uniform highp usamplerCubeArray arg_0_1; void textureNumLevels_f46ec6() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl index 03a7528c56..eb3975aa0f 100644 --- a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2DArray arg_0_1; void textureNumLevels_f5828d() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2DArray arg_0_1; void textureNumLevels_f5828d() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2DArray arg_0_1; void textureNumLevels_f5828d() { - int res = textureQueryLevels(arg_0_1);; + int res = textureQueryLevels(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl index ff0f7aba26..1efb1cd97f 100644 --- a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2DMS arg_0_1; void textureNumSamples_2c6f14() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2DMS arg_0_1; void textureNumSamples_2c6f14() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2DMS arg_0_1; void textureNumSamples_2c6f14() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl index be3a261b62..12fa25542a 100644 --- a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp usampler2DMS arg_0_1; void textureNumSamples_42f8bb() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp usampler2DMS arg_0_1; void textureNumSamples_42f8bb() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp usampler2DMS arg_0_1; void textureNumSamples_42f8bb() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl index d0fd60f3c8..c527b0618e 100644 --- a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp isampler2DMS arg_0_1; void textureNumSamples_449d23() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp isampler2DMS arg_0_1; void textureNumSamples_449d23() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp isampler2DMS arg_0_1; void textureNumSamples_449d23() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl index 635289313b..734b4a1c9d 100644 --- a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl @@ -4,7 +4,7 @@ SKIP: FAILED uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } vec4 vertex_main() { @@ -32,7 +32,7 @@ precision mediump float; uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void fragment_main() { @@ -55,7 +55,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { - int res = textureSamples(arg_0_1);; + int res = textureSamples(arg_0_1); } void compute_main() { diff --git a/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.glsl b/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.glsl index 1f9ab09105..b7003ae14e 100644 --- a/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.glsl +++ b/test/tint/builtins/textureNumSamples/depth_ms.spvasm.expected.glsl @@ -6,7 +6,7 @@ vec4 tint_symbol_1 = vec4(0.0f, 0.0f, 0.0f, 0.0f); uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { int res = 0; - int x_16 = textureSamples(arg_0_1);; + int x_16 = textureSamples(arg_0_1); res = x_16; return; } @@ -53,7 +53,7 @@ precision mediump float; uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { int res = 0; - int x_16 = textureSamples(arg_0_1);; + int x_16 = textureSamples(arg_0_1); res = x_16; return; } @@ -88,7 +88,7 @@ ERROR: 3 compilation errors. No code generated. uniform highp sampler2DMS arg_0_1; void textureNumSamples_a3c8a0() { int res = 0; - int x_16 = textureSamples(arg_0_1);; + int x_16 = textureSamples(arg_0_1); res = x_16; return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index d850b056e6..ffee0b317e 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index f84f06cf58..b1a7cac5ff 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl index 4889a75a04..fce900e30b 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl index 44ddcb5980..3f50534829 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl index 5e70fed154..466d054b4a 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl index d850b056e6..ffee0b317e 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl index f84f06cf58..b1a7cac5ff 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl index 44ddcb5980..3f50534829 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl index 5e70fed154..466d054b4a 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20_1);; + int x_99 = textureQueryLevels(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 224db3a558..87eaf6f5c7 100644 --- a/test/tint/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - uint x_99 = uint(textureQueryLevels(x_20_1);); + uint x_99 = uint(textureQueryLevels(x_20_1)); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index ed11575a00..43c81f6fad 100644 --- a/test/tint/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureSamples(x_20_1);; + int x_99 = textureSamples(x_20_1); return; } diff --git a/test/tint/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index a76b0791e7..2cd7703e75 100644 --- a/test/tint/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -22,7 +22,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - uint x_99 = uint(textureSamples(x_20_1);); + uint x_99 = uint(textureSamples(x_20_1)); return; } diff --git a/test/tint/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl index bd6a5b0c57..ff38dd5e2f 100644 --- a/test/tint/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl @@ -18,7 +18,7 @@ void main_1() { vec2 vf12 = vec2(1.0f, 2.0f); vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - uint x_71 = uint(textureSamples(x_20_1);); + uint x_71 = uint(textureSamples(x_20_1)); uint x_1000 = 0u; return; } diff --git a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl index b35bfaa621..44f2f4376d 100644 --- a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl @@ -5,7 +5,7 @@ precision mediump float; uniform highp sampler2D x_20_1; void main_1() { - uint x_125 = uint(textureQueryLevels(x_20_1);); + uint x_125 = uint(textureQueryLevels(x_20_1)); return; } diff --git a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl index 4ed812de65..fa0ffd299b 100644 --- a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl @@ -5,7 +5,7 @@ precision mediump float; uniform highp sampler2DMS x_20_1; void main_1() { - uint x_125 = uint(textureSamples(x_20_1);); + uint x_125 = uint(textureSamples(x_20_1)); return; }