diff --git a/src/back/wgsl/writer.rs b/src/back/wgsl/writer.rs index da39cd94f2..3a0424e7bb 100644 --- a/src/back/wgsl/writer.rs +++ b/src/back/wgsl/writer.rs @@ -1132,6 +1132,12 @@ impl Writer { } write!(self.out, ")")? } + Expression::Splat { size, value } => { + let size = back::vector_size_str(size); + write!(self.out, "vec{size}(")?; + write_expression(self, value)?; + write!(self.out, ")")?; + } _ => unreachable!(), } @@ -1173,7 +1179,8 @@ impl Writer { Expression::Literal(_) | Expression::Constant(_) | Expression::ZeroValue(_) - | Expression::Compose { .. } => { + | Expression::Compose { .. } + | Expression::Splat { .. } => { self.write_possibly_const_expression( module, expr, @@ -1450,23 +1457,6 @@ impl Writer { self.write_expr(module, expr, func_ctx)?; write!(self.out, ")")?; } - Expression::Splat { size, value } => { - let inner = func_ctx.resolve_type(value, &module.types); - let (scalar_kind, scalar_width) = match *inner { - crate::TypeInner::Scalar { kind, width } => (kind, width), - _ => { - return Err(Error::Unimplemented(format!( - "write_expr expression::splat {inner:?}" - ))); - } - }; - let scalar = scalar_kind_str(scalar_kind, scalar_width); - let size = back::vector_size_str(size); - - write!(self.out, "vec{size}<{scalar}>(")?; - self.write_expr(module, value, func_ctx)?; - write!(self.out, ")")?; - } Expression::Load { pointer } => { let is_atomic_pointer = func_ctx .resolve_type(pointer, &module.types) diff --git a/tests/out/wgsl/900-implicit-conversions-frag.wgsl b/tests/out/wgsl/900-implicit-conversions-frag.wgsl index 923e387222..58ed87e1ea 100644 --- a/tests/out/wgsl/900-implicit-conversions-frag.wgsl +++ b/tests/out/wgsl/900-implicit-conversions-frag.wgsl @@ -57,7 +57,7 @@ fn implicit_dims_3(v_6: vec4) { fn main_1() { exact_1(1); implicit(f32(1u)); - implicit_dims_2(vec3(vec3(1))); + implicit_dims_2(vec3(vec3(1))); return; } diff --git a/tests/out/wgsl/901-lhs-field-select-frag.wgsl b/tests/out/wgsl/901-lhs-field-select-frag.wgsl index 196f21d79a..71b9870512 100644 --- a/tests/out/wgsl/901-lhs-field-select-frag.wgsl +++ b/tests/out/wgsl/901-lhs-field-select-frag.wgsl @@ -1,7 +1,7 @@ fn main_1() { var a: vec4; - a = vec4(1.0); + a = vec4(1.0); a.x = 2.0; return; } diff --git a/tests/out/wgsl/access.wgsl b/tests/out/wgsl/access.wgsl index 77ebe1ee18..ea64e80db3 100644 --- a/tests/out/wgsl/access.wgsl +++ b/tests/out/wgsl/access.wgsl @@ -55,13 +55,13 @@ fn test_matrix_within_struct_accesses() { let _e41 = idx; let _e43 = idx; let l6_ = baz.m[_e41][_e43]; - t = Baz(mat3x2(vec2(1.0), vec2(2.0), vec2(3.0))); + t = Baz(mat3x2(vec2(1.0), vec2(2.0), vec2(3.0))); let _e56 = idx; idx = (_e56 + 1); - t.m = mat3x2(vec2(6.0), vec2(5.0), vec2(4.0)); - t.m[0] = vec2(9.0); + t.m = mat3x2(vec2(6.0), vec2(5.0), vec2(4.0)); + t.m[0] = vec2(9.0); let _e72 = idx; - t.m[_e72] = vec2(90.0); + t.m[_e72] = vec2(90.0); t.m[0][1] = 10.0; let _e85 = idx; t.m[0][_e85] = 20.0; @@ -97,10 +97,10 @@ fn test_matrix_within_array_within_struct_accesses() { let _e67 = idx_1; idx_1 = (_e67 + 1); t_1.am = array, 2>(); - t_1.am[0] = mat4x2(vec2(8.0), vec2(7.0), vec2(6.0), vec2(5.0)); - t_1.am[0][0] = vec2(9.0); + t_1.am[0] = mat4x2(vec2(8.0), vec2(7.0), vec2(6.0), vec2(5.0)); + t_1.am[0][0] = vec2(9.0); let _e93 = idx_1; - t_1.am[0][_e93] = vec2(90.0); + t_1.am[0][_e93] = vec2(90.0); t_1.am[0][0][1] = 10.0; let _e110 = idx_1; t_1.am[0][0][_e110] = 20.0; @@ -127,7 +127,7 @@ fn assign_through_ptr_fn(p: ptr) { } fn assign_array_through_ptr_fn(foo_2: ptr, 2>>) { - (*foo_2) = array, 2>(vec4(1.0), vec4(2.0)); + (*foo_2) = array, 2>(vec4(1.0), vec4(2.0)); return; } @@ -152,24 +152,24 @@ fn foo_vert(@builtin(vertex_index) vi: u32) -> @builtin(position) vec4 { c2_[(vi + 1u)] = 42; let value = c2_[vi]; let _e48 = test_arr_as_arg(array, 5>()); - return vec4((_matrix * vec4(vec4(value))), 2.0); + return vec4((_matrix * vec4(vec4(value))), 2.0); } @fragment fn foo_frag() -> @location(0) vec4 { bar._matrix[1][2] = 1.0; - bar._matrix = mat4x3(vec3(0.0), vec3(1.0), vec3(2.0), vec3(3.0)); - bar.arr = array, 2>(vec2(0u), vec2(1u)); + bar._matrix = mat4x3(vec3(0.0), vec3(1.0), vec3(2.0), vec3(3.0)); + bar.arr = array, 2>(vec2(0u), vec2(1u)); bar.data[1].value = 1; qux = vec2(); - return vec4(0.0); + return vec4(0.0); } @compute @workgroup_size(1, 1, 1) fn assign_through_ptr() { var arr: array, 2>; - arr = array, 2>(vec4(6.0), vec4(7.0)); + arr = array, 2>(vec4(6.0), vec4(7.0)); assign_through_ptr_fn((&val)); assign_array_through_ptr_fn((&arr)); return; diff --git a/tests/out/wgsl/bevy-pbr-frag.wgsl b/tests/out/wgsl/bevy-pbr-frag.wgsl index 249298dcc9..85bbafd042 100644 --- a/tests/out/wgsl/bevy-pbr-frag.wgsl +++ b/tests/out/wgsl/bevy-pbr-frag.wgsl @@ -218,7 +218,7 @@ fn F_Schlick(f0_: vec3, f90_: f32, VoH: f32) -> vec3 { let _e49 = VoH_1; let _e52 = VoH_1; let _e54 = pow5_((1.0 - _e52)); - return (f0_ + ((vec3(_e45) - f0_) * _e54)); + return (f0_ + ((vec3(_e45) - f0_) * _e54)); } fn F_Schlick_1(f0_1: f32, f90_2: f32, VoH_2: f32) -> f32 { @@ -247,7 +247,7 @@ fn fresnel(f0_3: vec3, LoH: f32) -> vec3 { LoH_1 = LoH; let _e49 = f0_4; let _e62 = f0_4; - f90_4 = clamp(dot(_e62, vec3((50.0 * 0.33))), 0.0, 1.0); + f90_4 = clamp(dot(_e62, vec3((50.0 * 0.33))), 0.0, 1.0); let _e75 = f0_4; let _e76 = f90_4; let _e77 = LoH_1; @@ -342,7 +342,7 @@ fn EnvBRDFApprox(f0_7: vec3, perceptual_roughness: f32, NoV_6: f32) -> vec3 let _e62 = perceptual_roughness_1; let _e64 = c0_; let _e66 = c1_; - r = ((vec4(_e62) * _e64) + _e66); + r = ((vec4(_e62) * _e64) + _e66); let _e69 = r; let _e71 = r; let _e76 = NoV_7; @@ -356,11 +356,11 @@ fn EnvBRDFApprox(f0_7: vec3, perceptual_roughness: f32, NoV_6: f32) -> vec3 a004_ = ((min((_e83.x * _e85.x), exp2((-(9.28) * _e94))) * _e98.x) + _e101.y); let _e109 = a004_; let _e112 = r; - AB = ((vec2(-(1.04), 1.04) * vec2(_e109)) + _e112.zw); + AB = ((vec2(-(1.04), 1.04) * vec2(_e109)) + _e112.zw); let _e116 = f0_8; let _e117 = AB; let _e121 = AB; - return ((_e116 * vec3(_e117.x)) + vec3(_e121.y)); + return ((_e116 * vec3(_e117.x)) + vec3(_e121.y)); } fn perceptualRoughnessToRoughness(perceptualRoughness: f32) -> f32 { @@ -381,7 +381,7 @@ fn reinhard(color: vec3) -> vec3 { color_1 = color; let _e42 = color_1; let _e45 = color_1; - return (_e42 / (vec3(1.0) + _e45)); + return (_e42 / (vec3(1.0) + _e45)); } fn reinhard_extended(color_2: vec3, max_white: f32) -> vec3 { @@ -395,10 +395,10 @@ fn reinhard_extended(color_2: vec3, max_white: f32) -> vec3 { let _e47 = color_3; let _e48 = max_white_1; let _e49 = max_white_1; - numerator = (_e44 * (vec3(1.0) + (_e47 / vec3((_e48 * _e49))))); + numerator = (_e44 * (vec3(1.0) + (_e47 / vec3((_e48 * _e49))))); let _e56 = numerator; let _e59 = color_3; - return (_e56 / (vec3(1.0) + _e59)); + return (_e56 / (vec3(1.0) + _e59)); } fn luminance(v_1: vec3) -> f32 { @@ -788,7 +788,7 @@ fn main_1() { let _e123 = textureSample(StandardMaterial_normal_map, StandardMaterial_normal_map_sampler, _e122); let _e131 = v_Uv_1; let _e132 = textureSample(StandardMaterial_normal_map, StandardMaterial_normal_map_sampler, _e131); - N_2 = (_e120 * normalize(((_e132.xyz * 2.0) - vec3(1.0)))); + N_2 = (_e120 * normalize(((_e132.xyz * 2.0) - vec3(1.0)))); let _e142 = v_Uv_1; let _e143 = textureSample(StandardMaterial_occlusion_texture, StandardMaterial_occlusion_texture_sampler, _e142); occlusion = _e143.x; @@ -817,15 +817,15 @@ fn main_1() { let _e195 = metallic; let _e199 = output_color; let _e201 = metallic; - F0_4 = (vec3((((0.16 * _e190) * _e192) * (1.0 - _e195))) + (_e199.xyz * vec3(_e201))); + F0_4 = (vec3((((0.16 * _e190) * _e192) * (1.0 - _e195))) + (_e199.xyz * vec3(_e201))); let _e206 = output_color; let _e209 = metallic; - diffuseColor_4 = (_e206.xyz * vec3((1.0 - _e209))); + diffuseColor_4 = (_e206.xyz * vec3((1.0 - _e209))); let _e214 = V_3; let _e217 = V_3; let _e219 = N_2; R_4 = reflect(-(_e217), _e219); - light_accum = vec3(0.0); + light_accum = vec3(0.0); i = 0; loop { let _e227 = i; diff --git a/tests/out/wgsl/binding-arrays.wgsl b/tests/out/wgsl/binding-arrays.wgsl index 7f181413bb..878fb2c91d 100644 --- a/tests/out/wgsl/binding-arrays.wgsl +++ b/tests/out/wgsl/binding-arrays.wgsl @@ -35,11 +35,11 @@ fn main(fragment_in: FragmentIn) -> @location(0) vec4 { let uniform_index = uni.index; let non_uniform_index = fragment_in.index; u1_ = 0u; - u2_ = vec2(0u); + u2_ = vec2(0u); v1_ = 0.0; - v4_ = vec4(0.0); - let uv = vec2(0.0); - let pix = vec2(0); + v4_ = vec4(0.0); + let uv = vec2(0.0); + let pix = vec2(0); let _e22 = textureDimensions(texture_array_unbounded[0]); let _e23 = u2_; u2_ = (_e23 + _e22); @@ -165,8 +165,8 @@ fn main(fragment_in: FragmentIn) -> @location(0) vec4 { textureStore(texture_array_storage[non_uniform_index], pix, _e313); let _e314 = u2_; let _e315 = u1_; - let v2_ = vec2((_e314 + vec2(_e315))); + let v2_ = vec2((_e314 + vec2(_e315))); let _e319 = v4_; let _e326 = v1_; - return ((_e319 + vec4(v2_.x, v2_.y, v2_.x, v2_.y)) + vec4(_e326)); + return ((_e319 + vec4(v2_.x, v2_.y, v2_.x, v2_.y)) + vec4(_e326)); } diff --git a/tests/out/wgsl/bitcast.wgsl b/tests/out/wgsl/bitcast.wgsl index 298c5fc21d..a8699e0a9f 100644 --- a/tests/out/wgsl/bitcast.wgsl +++ b/tests/out/wgsl/bitcast.wgsl @@ -10,15 +10,15 @@ fn main() { var f3_: vec3; var f4_: vec4; - i2_ = vec2(0); - i3_ = vec3(0); - i4_ = vec4(0); - u2_ = vec2(0u); - u3_ = vec3(0u); - u4_ = vec4(0u); - f2_ = vec2(0.0); - f3_ = vec3(0.0); - f4_ = vec4(0.0); + i2_ = vec2(0); + i3_ = vec3(0); + i4_ = vec4(0); + u2_ = vec2(0u); + u3_ = vec3(0u); + u4_ = vec4(0u); + f2_ = vec2(0.0); + f3_ = vec3(0.0); + f4_ = vec4(0.0); let _e27 = i2_; u2_ = bitcast>(_e27); let _e29 = i3_; diff --git a/tests/out/wgsl/bits.wgsl b/tests/out/wgsl/bits.wgsl index c203ac94d5..4458a0740b 100644 --- a/tests/out/wgsl/bits.wgsl +++ b/tests/out/wgsl/bits.wgsl @@ -12,15 +12,15 @@ fn main() { var f4_: vec4; i = 0; - i2_ = vec2(0); - i3_ = vec3(0); - i4_ = vec4(0); + i2_ = vec2(0); + i3_ = vec3(0); + i4_ = vec4(0); u = 0u; - u2_ = vec2(0u); - u3_ = vec3(0u); - u4_ = vec4(0u); - f2_ = vec2(0.0); - f4_ = vec4(0.0); + u2_ = vec2(0u); + u3_ = vec3(0u); + u4_ = vec4(0u); + f2_ = vec2(0.0); + f4_ = vec4(0.0); let _e28 = f4_; u = pack4x8snorm(_e28); let _e30 = f4_; diff --git a/tests/out/wgsl/bits_glsl-frag.wgsl b/tests/out/wgsl/bits_glsl-frag.wgsl index 6e63fe662e..d81c3319d7 100644 --- a/tests/out/wgsl/bits_glsl-frag.wgsl +++ b/tests/out/wgsl/bits_glsl-frag.wgsl @@ -11,15 +11,15 @@ fn main_1() { var f4_: vec4; i = 0; - i2_ = vec2(0); - i3_ = vec3(0); - i4_ = vec4(0); + i2_ = vec2(0); + i3_ = vec3(0); + i4_ = vec4(0); u = u32(0); - u2_ = vec2(u32(0)); - u3_ = vec3(u32(0)); - u4_ = vec4(u32(0)); - f2_ = vec2(0.0); - f4_ = vec4(0.0); + u2_ = vec2(u32(0)); + u3_ = vec3(u32(0)); + u4_ = vec4(u32(0)); + f2_ = vec2(0.0); + f4_ = vec4(0.0); let _e33 = f4_; u = pack4x8snorm(_e33); let _e36 = f4_; diff --git a/tests/out/wgsl/boids.wgsl b/tests/out/wgsl/boids.wgsl index 26502a9e6c..af5d5247d8 100644 --- a/tests/out/wgsl/boids.wgsl +++ b/tests/out/wgsl/boids.wgsl @@ -107,13 +107,13 @@ fn main(@builtin(global_invocation_id) global_invocation_id: vec3) { let _e97 = cMass; let _e98 = cMassCount; let _e102 = vPos; - cMass = ((_e97 / vec2(f32(_e98))) - _e102); + cMass = ((_e97 / vec2(f32(_e98))) - _e102); } let _e104 = cVelCount; if (_e104 > 0) { let _e107 = cVel; let _e108 = cVelCount; - cVel = (_e107 / vec2(f32(_e108))); + cVel = (_e107 / vec2(f32(_e108))); } let _e112 = vVel; let _e113 = cMass; diff --git a/tests/out/wgsl/bool-select-frag.wgsl b/tests/out/wgsl/bool-select-frag.wgsl index 4f0e218ee2..f34c54243d 100644 --- a/tests/out/wgsl/bool-select-frag.wgsl +++ b/tests/out/wgsl/bool-select-frag.wgsl @@ -23,12 +23,12 @@ fn TevPerCompGT_1(a_2: vec3, b_2: vec3) -> vec3 { b_3 = b_2; let _e7 = a_3; let _e8 = b_3; - return select(vec3(0.0), vec3(1.0), (_e7 > _e8)); + return select(vec3(0.0), vec3(1.0), (_e7 > _e8)); } fn main_1() { let _e1 = o_color; - let _e11 = TevPerCompGT_1(vec3(3.0), vec3(5.0)); + let _e11 = TevPerCompGT_1(vec3(3.0), vec3(5.0)); o_color.x = _e11.x; o_color.y = _e11.y; o_color.z = _e11.z; diff --git a/tests/out/wgsl/clamp-splat-vert.wgsl b/tests/out/wgsl/clamp-splat-vert.wgsl index deeea02ef1..6b5fe96de2 100644 --- a/tests/out/wgsl/clamp-splat-vert.wgsl +++ b/tests/out/wgsl/clamp-splat-vert.wgsl @@ -7,7 +7,7 @@ var gl_Position: vec4; fn main_1() { let _e5 = a_pos_1; - let _e10 = clamp(_e5, vec2(0.0), vec2(1.0)); + let _e10 = clamp(_e5, vec2(0.0), vec2(1.0)); gl_Position = vec4(_e10.x, _e10.y, 0.0, 1.0); return; } diff --git a/tests/out/wgsl/constant-array-size-frag.wgsl b/tests/out/wgsl/constant-array-size-frag.wgsl index fb706acf2a..1aff03c79c 100644 --- a/tests/out/wgsl/constant-array-size-frag.wgsl +++ b/tests/out/wgsl/constant-array-size-frag.wgsl @@ -11,7 +11,7 @@ fn function() -> vec4 { var sum: vec4; var i: i32; - sum = vec4(f32(0)); + sum = vec4(f32(0)); i = 0; loop { let _e9 = i; diff --git a/tests/out/wgsl/constructors.wgsl b/tests/out/wgsl/constructors.wgsl index 7818e4c39e..6ed0e50907 100644 --- a/tests/out/wgsl/constructors.wgsl +++ b/tests/out/wgsl/constructors.wgsl @@ -20,11 +20,11 @@ const cp3_: array = array(0, 1, 2, 3); fn main() { var foo: Foo; - foo = Foo(vec4(1.0), 1); + foo = Foo(vec4(1.0), 1); let m0_ = mat2x2(vec2(1.0, 0.0), vec2(0.0, 1.0)); let m1_ = mat4x4(vec4(1.0, 0.0, 0.0, 0.0), vec4(0.0, 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0)); - let cit0_ = vec2(0u); - let cit1_ = mat2x2(vec2(0.0), vec2(0.0)); + let cit0_ = vec2(0u); + let cit1_ = mat2x2(vec2(0.0), vec2(0.0)); let cit2_ = array(0, 1, 2, 3); let ic0_ = bool(bool()); let ic1_ = i32(i32()); diff --git a/tests/out/wgsl/declarations-frag.wgsl b/tests/out/wgsl/declarations-frag.wgsl index 23c697a008..1720296896 100644 --- a/tests/out/wgsl/declarations-frag.wgsl +++ b/tests/out/wgsl/declarations-frag.wgsl @@ -52,7 +52,7 @@ fn main_1() { a_1 = _e41; let _e57 = array_toomanyd[0][0][0][0][0][0][0]; b = _e57; - out_array[0] = vec4(2.0); + out_array[0] = vec4(2.0); return; } diff --git a/tests/out/wgsl/expressions-frag.wgsl b/tests/out/wgsl/expressions-frag.wgsl index e8e1a9f98a..d947a0df71 100644 --- a/tests/out/wgsl/expressions-frag.wgsl +++ b/tests/out/wgsl/expressions-frag.wgsl @@ -31,11 +31,11 @@ fn testBinOpVecFloat(a: vec4, b: f32) { let _e5 = a_1; v = (_e5 * 2.0); let _e8 = a_1; - v = (_e8 / vec4(2.0)); + v = (_e8 / vec4(2.0)); let _e12 = a_1; - v = (_e12 + vec4(2.0)); + v = (_e12 + vec4(2.0)); let _e16 = a_1; - v = (_e16 - vec4(2.0)); + v = (_e16 - vec4(2.0)); return; } @@ -51,13 +51,13 @@ fn testBinOpFloatVec(a_2: vec4, b_2: f32) { v_1 = (_e5 * _e6); let _e8 = a_3; let _e9 = b_3; - v_1 = (_e8 / vec4(_e9)); + v_1 = (_e8 / vec4(_e9)); let _e12 = a_3; let _e13 = b_3; - v_1 = (_e12 + vec4(_e13)); + v_1 = (_e12 + vec4(_e13)); let _e16 = a_3; let _e17 = b_3; - v_1 = (_e16 - vec4(_e17)); + v_1 = (_e16 - vec4(_e17)); return; } @@ -73,28 +73,28 @@ fn testBinOpIVecInt(a_4: vec4, b_4: i32) { v_2 = (_e5 * _e6); let _e8 = a_5; let _e9 = b_5; - v_2 = (_e8 / vec4(_e9)); + v_2 = (_e8 / vec4(_e9)); let _e12 = a_5; let _e13 = b_5; - v_2 = (_e12 + vec4(_e13)); + v_2 = (_e12 + vec4(_e13)); let _e16 = a_5; let _e17 = b_5; - v_2 = (_e16 - vec4(_e17)); + v_2 = (_e16 - vec4(_e17)); let _e20 = a_5; let _e21 = b_5; - v_2 = (_e20 & vec4(_e21)); + v_2 = (_e20 & vec4(_e21)); let _e24 = a_5; let _e25 = b_5; - v_2 = (_e24 | vec4(_e25)); + v_2 = (_e24 | vec4(_e25)); let _e28 = a_5; let _e29 = b_5; - v_2 = (_e28 ^ vec4(_e29)); + v_2 = (_e28 ^ vec4(_e29)); let _e32 = a_5; let _e33 = b_5; - v_2 = (_e32 >> vec4(u32(_e33))); + v_2 = (_e32 >> vec4(u32(_e33))); let _e37 = a_5; let _e38 = b_5; - v_2 = (_e37 << vec4(u32(_e38))); + v_2 = (_e37 << vec4(u32(_e38))); return; } @@ -110,19 +110,19 @@ fn testBinOpIntIVec(a_6: i32, b_6: vec4) { v_3 = (_e5 * _e6); let _e8 = a_7; let _e9 = b_7; - v_3 = (vec4(_e8) + _e9); + v_3 = (vec4(_e8) + _e9); let _e12 = a_7; let _e13 = b_7; - v_3 = (vec4(_e12) - _e13); + v_3 = (vec4(_e12) - _e13); let _e16 = a_7; let _e17 = b_7; - v_3 = (vec4(_e16) & _e17); + v_3 = (vec4(_e16) & _e17); let _e20 = a_7; let _e21 = b_7; - v_3 = (vec4(_e20) | _e21); + v_3 = (vec4(_e20) | _e21); let _e24 = a_7; let _e25 = b_7; - v_3 = (vec4(_e24) ^ _e25); + v_3 = (vec4(_e24) ^ _e25); return; } @@ -138,28 +138,28 @@ fn testBinOpUVecUint(a_8: vec4, b_8: u32) { v_4 = (_e5 * _e6); let _e8 = a_9; let _e9 = b_9; - v_4 = (_e8 / vec4(_e9)); + v_4 = (_e8 / vec4(_e9)); let _e12 = a_9; let _e13 = b_9; - v_4 = (_e12 + vec4(_e13)); + v_4 = (_e12 + vec4(_e13)); let _e16 = a_9; let _e17 = b_9; - v_4 = (_e16 - vec4(_e17)); + v_4 = (_e16 - vec4(_e17)); let _e20 = a_9; let _e21 = b_9; - v_4 = (_e20 & vec4(_e21)); + v_4 = (_e20 & vec4(_e21)); let _e24 = a_9; let _e25 = b_9; - v_4 = (_e24 | vec4(_e25)); + v_4 = (_e24 | vec4(_e25)); let _e28 = a_9; let _e29 = b_9; - v_4 = (_e28 ^ vec4(_e29)); + v_4 = (_e28 ^ vec4(_e29)); let _e32 = a_9; let _e33 = b_9; - v_4 = (_e32 >> vec4(_e33)); + v_4 = (_e32 >> vec4(_e33)); let _e36 = a_9; let _e37 = b_9; - v_4 = (_e36 << vec4(_e37)); + v_4 = (_e36 << vec4(_e37)); return; } @@ -175,19 +175,19 @@ fn testBinOpUintUVec(a_10: u32, b_10: vec4) { v_5 = (_e5 * _e6); let _e8 = a_11; let _e9 = b_11; - v_5 = (vec4(_e8) + _e9); + v_5 = (vec4(_e8) + _e9); let _e12 = a_11; let _e13 = b_11; - v_5 = (vec4(_e12) - _e13); + v_5 = (vec4(_e12) - _e13); let _e16 = a_11; let _e17 = b_11; - v_5 = (vec4(_e16) & _e17); + v_5 = (vec4(_e16) & _e17); let _e20 = a_11; let _e21 = b_11; - v_5 = (vec4(_e20) | _e21); + v_5 = (vec4(_e20) | _e21); let _e24 = a_11; let _e25 = b_11; - v_5 = (vec4(_e24) ^ _e25); + v_5 = (vec4(_e24) ^ _e25); return; } @@ -229,33 +229,33 @@ fn testBinOpMatFloat(a_14: f32, b_14: mat3x3) { b_15 = b_14; let _e5 = a_15; let _e6 = b_15; - let _e7 = vec3(_e5); + let _e7 = vec3(_e5); v_7 = mat3x3((_e7 / _e6[0]), (_e7 / _e6[1]), (_e7 / _e6[2])); let _e15 = a_15; let _e16 = b_15; v_7 = (_e15 * _e16); let _e18 = a_15; let _e19 = b_15; - let _e20 = vec3(_e18); + let _e20 = vec3(_e18); v_7 = mat3x3((_e20 + _e19[0]), (_e20 + _e19[1]), (_e20 + _e19[2])); let _e28 = a_15; let _e29 = b_15; - let _e30 = vec3(_e28); + let _e30 = vec3(_e28); v_7 = mat3x3((_e30 - _e29[0]), (_e30 - _e29[1]), (_e30 - _e29[2])); let _e38 = b_15; let _e39 = a_15; - let _e40 = vec3(_e39); + let _e40 = vec3(_e39); v_7 = mat3x3((_e38[0] / _e40), (_e38[1] / _e40), (_e38[2] / _e40)); let _e48 = b_15; let _e49 = a_15; v_7 = (_e48 * _e49); let _e51 = b_15; let _e52 = a_15; - let _e53 = vec3(_e52); + let _e53 = vec3(_e52); v_7 = mat3x3((_e51[0] + _e53), (_e51[1] + _e53), (_e51[2] + _e53)); let _e61 = b_15; let _e62 = a_15; - let _e63 = vec3(_e62); + let _e63 = vec3(_e62); v_7 = mat3x3((_e61[0] - _e63), (_e61[1] - _e63), (_e61[2] - _e63)); return; } @@ -268,12 +268,12 @@ fn testUnaryOpMat(a_16: mat3x3) { let _e3 = a_17; v_8 = -(_e3); let _e5 = a_17; - let _e7 = vec3(1.0); + let _e7 = vec3(1.0); let _e9 = (_e5 - mat3x3(_e7, _e7, _e7)); a_17 = _e9; v_8 = _e9; let _e10 = a_17; - let _e12 = vec3(1.0); + let _e12 = vec3(1.0); a_17 = (_e10 - mat3x3(_e12, _e12, _e12)); v_8 = _e10; return; @@ -310,7 +310,7 @@ fn testNonImplicitCastVectorCast() { a_18 = u32(1); let _e3 = a_18; - b_16 = vec4(i32(_e3)); + b_16 = vec4(i32(_e3)); return; } @@ -426,7 +426,7 @@ fn testSwizzleWrites(a_27: vec3) { a_28.x = _e21.x; a_28.y = _e21.y; let _e26 = a_28; - let _e30 = (_e26.zy + vec2(1.0)); + let _e30 = (_e26.zy + vec2(1.0)); a_28.z = _e30.x; a_28.y = _e30.y; return; @@ -441,7 +441,7 @@ fn main_1() { let _e8 = local_6; global = _e8; let _e9 = o_color; - let _e12 = vec4(1.0); + let _e12 = vec4(1.0); o_color.x = _e12.x; o_color.y = _e12.y; o_color.z = _e12.z; diff --git a/tests/out/wgsl/extra.wgsl b/tests/out/wgsl/extra.wgsl index 8fc91fa2d9..b6cfaea7d3 100644 --- a/tests/out/wgsl/extra.wgsl +++ b/tests/out/wgsl/extra.wgsl @@ -16,6 +16,6 @@ fn main(in: FragmentIn) -> @location(0) vec4 { if (in.primitive_index == _e4) { return in.color; } else { - return vec4((vec3(1.0) - in.color.xyz), in.color.w); + return vec4((vec3(1.0) - in.color.xyz), in.color.w); } } diff --git a/tests/out/wgsl/fma-frag.wgsl b/tests/out/wgsl/fma-frag.wgsl index d7c74c2247..56677056f7 100644 --- a/tests/out/wgsl/fma-frag.wgsl +++ b/tests/out/wgsl/fma-frag.wgsl @@ -33,7 +33,7 @@ fn Fma(d: ptr, m: Mat4x3_, s: f32) { fn main_1() { let _e1 = o_color; - let _e4 = vec4(1.0); + let _e4 = vec4(1.0); o_color.x = _e4.x; o_color.y = _e4.y; o_color.z = _e4.z; diff --git a/tests/out/wgsl/fragment-output.wgsl b/tests/out/wgsl/fragment-output.wgsl index 45cfdc8e8b..f478faa70f 100644 --- a/tests/out/wgsl/fragment-output.wgsl +++ b/tests/out/wgsl/fragment-output.wgsl @@ -20,12 +20,12 @@ struct FragmentOutputVec2Scalar { fn main_vec4vec3_() -> FragmentOutputVec4Vec3_ { var output: FragmentOutputVec4Vec3_; - output.vec4f = vec4(0.0); - output.vec4i = vec4(0); - output.vec4u = vec4(0u); - output.vec3f = vec3(0.0); - output.vec3i = vec3(0); - output.vec3u = vec3(0u); + output.vec4f = vec4(0.0); + output.vec4i = vec4(0); + output.vec4u = vec4(0u); + output.vec3f = vec3(0.0); + output.vec3i = vec3(0); + output.vec3u = vec3(0u); let _e19 = output; return _e19; } @@ -34,9 +34,9 @@ fn main_vec4vec3_() -> FragmentOutputVec4Vec3_ { fn main_vec2scalar() -> FragmentOutputVec2Scalar { var output_1: FragmentOutputVec2Scalar; - output_1.vec2f = vec2(0.0); - output_1.vec2i = vec2(0); - output_1.vec2u = vec2(0u); + output_1.vec2f = vec2(0.0); + output_1.vec2i = vec2(0); + output_1.vec2u = vec2(0u); output_1.scalarf = 0.0; output_1.scalari = 0; output_1.scalaru = 0u; diff --git a/tests/out/wgsl/functions.wgsl b/tests/out/wgsl/functions.wgsl index 62faf0e06e..f48a864461 100644 --- a/tests/out/wgsl/functions.wgsl +++ b/tests/out/wgsl/functions.wgsl @@ -6,13 +6,13 @@ fn test_fma() -> vec2 { } fn test_integer_dot_product() -> i32 { - let a_2_ = vec2(1); - let b_2_ = vec2(1); + let a_2_ = vec2(1); + let b_2_ = vec2(1); let c_2_ = dot(a_2_, b_2_); - let a_3_ = vec3(1u); - let b_3_ = vec3(1u); + let a_3_ = vec3(1u); + let b_3_ = vec3(1u); let c_3_ = dot(a_3_, b_3_); - let c_4_ = dot(vec4(4), vec4(2)); + let c_4_ = dot(vec4(4), vec4(2)); return c_4_; } diff --git a/tests/out/wgsl/globals.wgsl b/tests/out/wgsl/globals.wgsl index b83b43806d..3cd484487f 100644 --- a/tests/out/wgsl/globals.wgsl +++ b/tests/out/wgsl/globals.wgsl @@ -29,7 +29,7 @@ fn test_msl_packed_vec3_as_arg(arg: vec3) { fn test_msl_packed_vec3_() { var idx: i32; - alignment.v3_ = vec3(1.0); + alignment.v3_ = vec3(1.0); idx = 1; alignment.v3_.x = 1.0; alignment.v3_.x = 2.0; diff --git a/tests/out/wgsl/image.wgsl b/tests/out/wgsl/image.wgsl index ddfd0b2168..062d377139 100644 --- a/tests/out/wgsl/image.wgsl +++ b/tests/out/wgsl/image.wgsl @@ -69,7 +69,7 @@ fn depth_load(@builtin(local_invocation_id) local_id_1: vec3) { let dim_1 = textureDimensions(image_storage_src); let itc_1 = (vec2((dim_1 * local_id_1.xy)) % vec2(10, 20)); let val = textureLoad(image_depth_multisampled_src, itc_1, i32(local_id_1.z)); - textureStore(image_dst, itc_1.x, vec4(u32(val))); + textureStore(image_dst, itc_1.x, vec4(u32(val))); return; } @@ -89,7 +89,7 @@ fn queries() -> @builtin(position) vec4 { let dim_3d_lod = textureDimensions(image_3d, 1); let dim_2s_ms = textureDimensions(image_aa); let sum = ((((((((((dim_1d + dim_2d.y) + dim_2d_lod.y) + dim_2d_array.y) + dim_2d_array_lod.y) + dim_cube.y) + dim_cube_lod.y) + dim_cube_array.y) + dim_cube_array_lod.y) + dim_3d.z) + dim_3d_lod.z); - return vec4(f32(sum)); + return vec4(f32(sum)); } @vertex @@ -103,15 +103,15 @@ fn levels_queries() -> @builtin(position) vec4 { let num_levels_3d = textureNumLevels(image_3d); let num_samples_aa = textureNumSamples(image_aa); let sum_1 = (((((((num_layers_2d + num_layers_cube) + num_samples_aa) + num_levels_2d) + num_levels_2d_array) + num_levels_3d) + num_levels_cube) + num_levels_cube_array); - return vec4(f32(sum_1)); + return vec4(f32(sum_1)); } @fragment fn texture_sample() -> @location(0) vec4 { var a: vec4; - let tc = vec2(0.5); - let tc3_ = vec3(0.5); + let tc = vec2(0.5); + let tc3_ = vec3(0.5); let _e9 = textureSample(image_1d, sampler_reg, tc.x); let _e10 = a; a = (_e10 + _e9); @@ -186,8 +186,8 @@ fn texture_sample() -> @location(0) vec4 { fn texture_sample_comparison() -> @location(0) f32 { var a_1: f32; - let tc_1 = vec2(0.5); - let tc3_1 = vec3(0.5); + let tc_1 = vec2(0.5); + let tc3_1 = vec3(0.5); let _e8 = textureSampleCompare(image_2d_depth, sampler_cmp, tc_1, 0.5); let _e9 = a_1; a_1 = (_e9 + _e8); @@ -218,7 +218,7 @@ fn texture_sample_comparison() -> @location(0) f32 { @fragment fn gather() -> @location(0) vec4 { - let tc_2 = vec2(0.5); + let tc_2 = vec2(0.5); let s2d = textureGather(1, image_2d, sampler_reg, tc_2); let s2d_offset = textureGather(3, image_2d, sampler_reg, tc_2, vec2(3, 1)); let s2d_depth = textureGatherCompare(image_2d_depth, sampler_cmp, tc_2, 0.5); @@ -231,8 +231,8 @@ fn gather() -> @location(0) vec4 { @fragment fn depth_no_comparison() -> @location(0) vec4 { - let tc_3 = vec2(0.5); + let tc_3 = vec2(0.5); let s2d_1 = textureSample(image_2d_depth, sampler_reg, tc_3); let s2d_gather = textureGather(image_2d_depth, sampler_reg, tc_3); - return (vec4(s2d_1) + s2d_gather); + return (vec4(s2d_1) + s2d_gather); } diff --git a/tests/out/wgsl/images-frag.wgsl b/tests/out/wgsl/images-frag.wgsl index 2a0f5e749e..8b77c3e94d 100644 --- a/tests/out/wgsl/images-frag.wgsl +++ b/tests/out/wgsl/images-frag.wgsl @@ -24,7 +24,7 @@ fn testImg1D(coord: i32) { let _e10 = textureDimensions(img1D); size = i32(_e10); let _e17 = coord_1; - textureStore(img1D, _e17, vec4(f32(2))); + textureStore(img1D, _e17, vec4(f32(2))); let _e22 = coord_1; let _e23 = textureLoad(img1D, _e22); c = _e23; @@ -44,7 +44,7 @@ fn testImg1DArray(coord_2: vec2) { let _e20 = textureLoad(img1DArray, _e17.x, _e17.y); c_1 = _e20; let _e26 = coord_3; - textureStore(img1DArray, _e26.x, _e26.y, vec4(f32(2))); + textureStore(img1DArray, _e26.x, _e26.y, vec4(f32(2))); return; } @@ -60,7 +60,7 @@ fn testImg2D(coord_4: vec2) { let _e16 = textureLoad(img2D, _e15); c_2 = _e16; let _e22 = coord_5; - textureStore(img2D, _e22, vec4(f32(2))); + textureStore(img2D, _e22, vec4(f32(2))); return; } @@ -77,7 +77,7 @@ fn testImg2DArray(coord_6: vec3) { let _e22 = textureLoad(img2DArray, _e19.xy, _e19.z); c_3 = _e22; let _e28 = coord_7; - textureStore(img2DArray, _e28.xy, _e28.z, vec4(f32(2))); + textureStore(img2DArray, _e28.xy, _e28.z, vec4(f32(2))); return; } @@ -93,7 +93,7 @@ fn testImg3D(coord_8: vec3) { let _e16 = textureLoad(img3D, _e15); c_4 = _e16; let _e22 = coord_9; - textureStore(img3D, _e22, vec4(f32(2))); + textureStore(img3D, _e22, vec4(f32(2))); return; } @@ -119,7 +119,7 @@ fn testImgWriteOnly(coord_12: vec2) { let _e10 = textureDimensions(img2D); size_6 = vec2(vec2(_e10)); let _e18 = coord_13; - textureStore(imgWriteOnly, _e18, vec4(f32(2))); + textureStore(imgWriteOnly, _e18, vec4(f32(2))); return; } diff --git a/tests/out/wgsl/interface.wgsl b/tests/out/wgsl/interface.wgsl index 68fe28cd4e..8654c13d95 100644 --- a/tests/out/wgsl/interface.wgsl +++ b/tests/out/wgsl/interface.wgsl @@ -22,7 +22,7 @@ var output: array; @vertex fn vertex(@builtin(vertex_index) vertex_index: u32, @builtin(instance_index) instance_index: u32, @location(10) @interpolate(flat) color: u32) -> VertexOutput { let tmp: u32 = ((vertex_index + instance_index) + color); - return VertexOutput(vec4(1.0), f32(tmp)); + return VertexOutput(vec4(1.0), f32(tmp)); } @fragment diff --git a/tests/out/wgsl/long-form-matrix-frag.wgsl b/tests/out/wgsl/long-form-matrix-frag.wgsl index 4a173b63ce..f335452e1f 100644 --- a/tests/out/wgsl/long-form-matrix-frag.wgsl +++ b/tests/out/wgsl/long-form-matrix-frag.wgsl @@ -10,26 +10,26 @@ fn main_1() { let _e1 = f32(1); splat = mat2x2(vec2(_e1, 0.0), vec2(0.0, _e1)); - let _e9 = vec2(f32(1)); - let _e12 = vec2(f32(2)); + let _e9 = vec2(f32(1)); + let _e12 = vec2(f32(2)); normal = mat2x2(vec2(_e9.x, _e9.y), vec2(_e12.x, _e12.y)); let _e26 = mat3x3(vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.0, 1.0)); from_matrix = mat2x4(vec4(_e26[0].x, _e26[0].y, _e26[0].z, 0.0), vec4(_e26[1].x, _e26[1].y, _e26[1].z, 0.0)); a = mat2x2(vec2(f32(1), f32(2)), vec2(f32(3), f32(4))); let _e58 = vec2(f32(2), f32(3)); b = mat2x2(vec2(f32(1), _e58.x), vec2(_e58.y, f32(4))); - let _e73 = vec3(f32(1)); - let _e76 = vec3(f32(1)); + let _e73 = vec3(f32(1)); + let _e76 = vec3(f32(1)); c = mat3x3(vec3(f32(1), f32(2), f32(3)), vec3(_e73.x, _e73.y, _e73.z), vec3(_e76.x, _e76.y, _e76.z)); - let _e93 = vec2(f32(2)); - let _e97 = vec3(f32(1)); - let _e100 = vec3(f32(1)); + let _e93 = vec2(f32(2)); + let _e97 = vec3(f32(1)); + let _e100 = vec3(f32(1)); d = mat3x3(vec3(_e93.x, _e93.y, f32(1)), vec3(_e97.x, _e97.y, _e97.z), vec3(_e100.x, _e100.y, _e100.z)); - let _e117 = vec2(f32(2)); - let _e120 = vec4(f32(1)); - let _e123 = vec2(f32(2)); - let _e126 = vec4(f32(1)); - let _e129 = vec4(f32(1)); + let _e117 = vec2(f32(2)); + let _e120 = vec4(f32(1)); + let _e123 = vec2(f32(2)); + let _e126 = vec4(f32(1)); + let _e129 = vec4(f32(1)); e = mat4x4(vec4(_e117.x, _e117.y, _e120.x, _e120.y), vec4(_e120.z, _e120.w, _e123.x, _e123.y), vec4(_e126.x, _e126.y, _e126.z, _e126.w), vec4(_e129.x, _e129.y, _e129.z, _e129.w)); return; } diff --git a/tests/out/wgsl/math-functions-frag.wgsl b/tests/out/wgsl/math-functions-frag.wgsl index 138bdbf24f..37e42868a4 100644 --- a/tests/out/wgsl/math-functions-frag.wgsl +++ b/tests/out/wgsl/math-functions-frag.wgsl @@ -49,8 +49,8 @@ fn main_1() { var smoothStepVector: vec4; var smoothStepMixed: vec4; - a = vec4(1.0); - b = vec4(2.0); + a = vec4(1.0); + b = vec4(2.0); let _e6 = a; let _e7 = b; let _e8 = a; @@ -163,8 +163,8 @@ fn main_1() { let _e243 = a; deg = degrees(_e243.x); smoothStepScalar = smoothstep(0.0, 1.0, 0.5); - smoothStepVector = smoothstep(vec4(0.0), vec4(1.0), vec4(0.5)); - smoothStepMixed = smoothstep(vec4(0.0), vec4(1.0), vec4(0.5)); + smoothStepVector = smoothstep(vec4(0.0), vec4(1.0), vec4(0.5)); + smoothStepMixed = smoothstep(vec4(0.0), vec4(1.0), vec4(0.5)); return; } diff --git a/tests/out/wgsl/math-functions.wgsl b/tests/out/wgsl/math-functions.wgsl index 0b20291f57..e6742fd31e 100644 --- a/tests/out/wgsl/math-functions.wgsl +++ b/tests/out/wgsl/math-functions.wgsl @@ -1,6 +1,6 @@ @fragment fn main() { - let v = vec4(0.0); + let v = vec4(0.0); let a = degrees(1.0); let b = radians(1.0); let c = degrees(v); @@ -8,30 +8,30 @@ fn main() { let e = saturate(v); let g = refract(v, v, 1.0); let sign_a = sign(-1); - let sign_b = sign(vec4(-1)); + let sign_b = sign(vec4(-1)); let sign_c = sign(-1.0); - let sign_d = sign(vec4(-1.0)); + let sign_d = sign(vec4(-1.0)); let const_dot = dot(vec2(), vec2()); let first_leading_bit_abs = firstLeadingBit(abs(0u)); let flb_a = firstLeadingBit(-1); - let flb_b = firstLeadingBit(vec2(-1)); - let flb_c = firstLeadingBit(vec2(1u)); + let flb_b = firstLeadingBit(vec2(-1)); + let flb_c = firstLeadingBit(vec2(1u)); let ftb_a = firstTrailingBit(-1); let ftb_b = firstTrailingBit(1u); - let ftb_c = firstTrailingBit(vec2(-1)); - let ftb_d = firstTrailingBit(vec2(1u)); + let ftb_c = firstTrailingBit(vec2(-1)); + let ftb_d = firstTrailingBit(vec2(1u)); let ctz_a = countTrailingZeros(0u); let ctz_b = countTrailingZeros(0); let ctz_c = countTrailingZeros(4294967295u); let ctz_d = countTrailingZeros(-1); - let ctz_e = countTrailingZeros(vec2(0u)); - let ctz_f = countTrailingZeros(vec2(0)); - let ctz_g = countTrailingZeros(vec2(1u)); - let ctz_h = countTrailingZeros(vec2(1)); + let ctz_e = countTrailingZeros(vec2(0u)); + let ctz_f = countTrailingZeros(vec2(0)); + let ctz_g = countTrailingZeros(vec2(1u)); + let ctz_h = countTrailingZeros(vec2(1)); let clz_a = countLeadingZeros(-1); let clz_b = countLeadingZeros(1u); - let clz_c = countLeadingZeros(vec2(-1)); - let clz_d = countLeadingZeros(vec2(1u)); + let clz_c = countLeadingZeros(vec2(-1)); + let clz_d = countLeadingZeros(vec2(1u)); let lde_a = ldexp(1.0, 2); let lde_b = ldexp(vec2(1.0, 2.0), vec2(3, 4)); let modf_a = modf(1.5); diff --git a/tests/out/wgsl/module-scope.wgsl b/tests/out/wgsl/module-scope.wgsl index 91a13718dd..141c28b500 100644 --- a/tests/out/wgsl/module-scope.wgsl +++ b/tests/out/wgsl/module-scope.wgsl @@ -21,6 +21,6 @@ fn call() { statement(); let _e0 = returns(); let vf = f32(Value); - let s = textureSample(Texture, Sampler, vec2(vf)); + let s = textureSample(Texture, Sampler, vec2(vf)); } diff --git a/tests/out/wgsl/operators.wgsl b/tests/out/wgsl/operators.wgsl index 9550bf8405..3fb0846bf3 100644 --- a/tests/out/wgsl/operators.wgsl +++ b/tests/out/wgsl/operators.wgsl @@ -12,25 +12,25 @@ fn builtins() -> vec4 { let b1_ = bitcast(v_i32_one.x); let b2_ = bitcast>(v_i32_one); let v_i32_zero = vec4(v_f32_zero); - return (((((vec4((vec4(s1_) + v_i32_zero)) + s2_) + m1_) + m2_) + vec4(b1_)) + b2_); + return (((((vec4((vec4(s1_) + v_i32_zero)) + s2_) + m1_) + m2_) + vec4(b1_)) + b2_); } fn splat() -> vec4 { - let a_2 = (((vec2(1.0) + vec2(2.0)) - vec2(3.0)) / vec2(4.0)); - let b = (vec4(5) % vec4(2)); + let a_2 = (((vec2(1.0) + vec2(2.0)) - vec2(3.0)) / vec2(4.0)); + let b = (vec4(5) % vec4(2)); return (a_2.xyxy + vec4(b)); } fn splat_assignment() -> vec2 { var a: vec2; - a = vec2(2.0); + a = vec2(2.0); let _e4 = a; - a = (_e4 + vec2(1.0)); + a = (_e4 + vec2(1.0)); let _e8 = a; - a = (_e8 - vec2(3.0)); + a = (_e8 - vec2(3.0)); let _e12 = a; - a = (_e12 / vec2(4.0)); + a = (_e12 / vec2(4.0)); let _e15 = a; return _e15; } @@ -42,153 +42,153 @@ fn bool_cast(x: vec3) -> vec3 { fn logical() { let neg0_ = !(true); - let neg1_ = !(vec2(true)); + let neg1_ = !(vec2(true)); let or = (true || false); let and = (true && false); let bitwise_or0_ = (true | false); - let bitwise_or1_ = (vec3(true) | vec3(false)); + let bitwise_or1_ = (vec3(true) | vec3(false)); let bitwise_and0_ = (true & false); - let bitwise_and1_ = (vec4(true) & vec4(false)); + let bitwise_and1_ = (vec4(true) & vec4(false)); } fn arithmetic() { - let neg1_1 = -(vec2(1)); - let neg2_ = -(vec2(1.0)); + let neg1_1 = -(vec2(1)); + let neg2_ = -(vec2(1.0)); let add0_ = (2 + 1); let add1_ = (2u + 1u); let add2_ = (2.0 + 1.0); - let add3_ = (vec2(2) + vec2(1)); - let add4_ = (vec3(2u) + vec3(1u)); - let add5_ = (vec4(2.0) + vec4(1.0)); + let add3_ = (vec2(2) + vec2(1)); + let add4_ = (vec3(2u) + vec3(1u)); + let add5_ = (vec4(2.0) + vec4(1.0)); let sub0_ = (2 - 1); let sub1_ = (2u - 1u); let sub2_ = (2.0 - 1.0); - let sub3_ = (vec2(2) - vec2(1)); - let sub4_ = (vec3(2u) - vec3(1u)); - let sub5_ = (vec4(2.0) - vec4(1.0)); + let sub3_ = (vec2(2) - vec2(1)); + let sub4_ = (vec3(2u) - vec3(1u)); + let sub5_ = (vec4(2.0) - vec4(1.0)); let mul0_ = (2 * 1); let mul1_ = (2u * 1u); let mul2_ = (2.0 * 1.0); - let mul3_ = (vec2(2) * vec2(1)); - let mul4_ = (vec3(2u) * vec3(1u)); - let mul5_ = (vec4(2.0) * vec4(1.0)); + let mul3_ = (vec2(2) * vec2(1)); + let mul4_ = (vec3(2u) * vec3(1u)); + let mul5_ = (vec4(2.0) * vec4(1.0)); let div0_ = (2 / 1); let div1_ = (2u / 1u); let div2_ = (2.0 / 1.0); - let div3_ = (vec2(2) / vec2(1)); - let div4_ = (vec3(2u) / vec3(1u)); - let div5_ = (vec4(2.0) / vec4(1.0)); + let div3_ = (vec2(2) / vec2(1)); + let div4_ = (vec3(2u) / vec3(1u)); + let div5_ = (vec4(2.0) / vec4(1.0)); let rem0_ = (2 % 1); let rem1_ = (2u % 1u); let rem2_ = (2.0 % 1.0); - let rem3_ = (vec2(2) % vec2(1)); - let rem4_ = (vec3(2u) % vec3(1u)); - let rem5_ = (vec4(2.0) % vec4(1.0)); + let rem3_ = (vec2(2) % vec2(1)); + let rem4_ = (vec3(2u) % vec3(1u)); + let rem5_ = (vec4(2.0) % vec4(1.0)); { - let add0_1 = (vec2(2) + vec2(1)); - let add1_1 = (vec2(2) + vec2(1)); - let add2_1 = (vec2(2u) + vec2(1u)); - let add3_1 = (vec2(2u) + vec2(1u)); - let add4_1 = (vec2(2.0) + vec2(1.0)); - let add5_1 = (vec2(2.0) + vec2(1.0)); - let sub0_1 = (vec2(2) - vec2(1)); - let sub1_1 = (vec2(2) - vec2(1)); - let sub2_1 = (vec2(2u) - vec2(1u)); - let sub3_1 = (vec2(2u) - vec2(1u)); - let sub4_1 = (vec2(2.0) - vec2(1.0)); - let sub5_1 = (vec2(2.0) - vec2(1.0)); - let mul0_1 = (vec2(2) * 1); - let mul1_1 = (2 * vec2(1)); - let mul2_1 = (vec2(2u) * 1u); - let mul3_1 = (2u * vec2(1u)); - let mul4_1 = (vec2(2.0) * 1.0); - let mul5_1 = (2.0 * vec2(1.0)); - let div0_1 = (vec2(2) / vec2(1)); - let div1_1 = (vec2(2) / vec2(1)); - let div2_1 = (vec2(2u) / vec2(1u)); - let div3_1 = (vec2(2u) / vec2(1u)); - let div4_1 = (vec2(2.0) / vec2(1.0)); - let div5_1 = (vec2(2.0) / vec2(1.0)); - let rem0_1 = (vec2(2) % vec2(1)); - let rem1_1 = (vec2(2) % vec2(1)); - let rem2_1 = (vec2(2u) % vec2(1u)); - let rem3_1 = (vec2(2u) % vec2(1u)); - let rem4_1 = (vec2(2.0) % vec2(1.0)); - let rem5_1 = (vec2(2.0) % vec2(1.0)); + let add0_1 = (vec2(2) + vec2(1)); + let add1_1 = (vec2(2) + vec2(1)); + let add2_1 = (vec2(2u) + vec2(1u)); + let add3_1 = (vec2(2u) + vec2(1u)); + let add4_1 = (vec2(2.0) + vec2(1.0)); + let add5_1 = (vec2(2.0) + vec2(1.0)); + let sub0_1 = (vec2(2) - vec2(1)); + let sub1_1 = (vec2(2) - vec2(1)); + let sub2_1 = (vec2(2u) - vec2(1u)); + let sub3_1 = (vec2(2u) - vec2(1u)); + let sub4_1 = (vec2(2.0) - vec2(1.0)); + let sub5_1 = (vec2(2.0) - vec2(1.0)); + let mul0_1 = (vec2(2) * 1); + let mul1_1 = (2 * vec2(1)); + let mul2_1 = (vec2(2u) * 1u); + let mul3_1 = (2u * vec2(1u)); + let mul4_1 = (vec2(2.0) * 1.0); + let mul5_1 = (2.0 * vec2(1.0)); + let div0_1 = (vec2(2) / vec2(1)); + let div1_1 = (vec2(2) / vec2(1)); + let div2_1 = (vec2(2u) / vec2(1u)); + let div3_1 = (vec2(2u) / vec2(1u)); + let div4_1 = (vec2(2.0) / vec2(1.0)); + let div5_1 = (vec2(2.0) / vec2(1.0)); + let rem0_1 = (vec2(2) % vec2(1)); + let rem1_1 = (vec2(2) % vec2(1)); + let rem2_1 = (vec2(2u) % vec2(1u)); + let rem3_1 = (vec2(2u) % vec2(1u)); + let rem4_1 = (vec2(2.0) % vec2(1.0)); + let rem5_1 = (vec2(2.0) % vec2(1.0)); } let add = (mat3x3() + mat3x3()); let sub = (mat3x3() - mat3x3()); let mul_scalar0_ = (mat3x3() * 1.0); let mul_scalar1_ = (2.0 * mat3x3()); - let mul_vector0_ = (mat4x3() * vec4(1.0)); - let mul_vector1_ = (vec3(2.0) * mat4x3()); + let mul_vector0_ = (mat4x3() * vec4(1.0)); + let mul_vector1_ = (vec3(2.0) * mat4x3()); let mul = (mat4x3() * mat3x4()); } fn bit() { let flip0_ = ~(1); let flip1_ = ~(1u); - let flip2_ = !(vec2(1)); - let flip3_ = !(vec3(1u)); + let flip2_ = !(vec2(1)); + let flip3_ = !(vec3(1u)); let or0_ = (2 | 1); let or1_ = (2u | 1u); - let or2_ = (vec2(2) | vec2(1)); - let or3_ = (vec3(2u) | vec3(1u)); + let or2_ = (vec2(2) | vec2(1)); + let or3_ = (vec3(2u) | vec3(1u)); let and0_ = (2 & 1); let and1_ = (2u & 1u); - let and2_ = (vec2(2) & vec2(1)); - let and3_ = (vec3(2u) & vec3(1u)); + let and2_ = (vec2(2) & vec2(1)); + let and3_ = (vec3(2u) & vec3(1u)); let xor0_ = (2 ^ 1); let xor1_ = (2u ^ 1u); - let xor2_ = (vec2(2) ^ vec2(1)); - let xor3_ = (vec3(2u) ^ vec3(1u)); + let xor2_ = (vec2(2) ^ vec2(1)); + let xor3_ = (vec3(2u) ^ vec3(1u)); let shl0_ = (2 << 1u); let shl1_ = (2u << 1u); - let shl2_ = (vec2(2) << vec2(1u)); - let shl3_ = (vec3(2u) << vec3(1u)); + let shl2_ = (vec2(2) << vec2(1u)); + let shl3_ = (vec3(2u) << vec3(1u)); let shr0_ = (2 >> 1u); let shr1_ = (2u >> 1u); - let shr2_ = (vec2(2) >> vec2(1u)); - let shr3_ = (vec3(2u) >> vec3(1u)); + let shr2_ = (vec2(2) >> vec2(1u)); + let shr3_ = (vec3(2u) >> vec3(1u)); } fn comparison() { let eq0_ = (2 == 1); let eq1_ = (2u == 1u); let eq2_ = (2.0 == 1.0); - let eq3_ = (vec2(2) == vec2(1)); - let eq4_ = (vec3(2u) == vec3(1u)); - let eq5_ = (vec4(2.0) == vec4(1.0)); + let eq3_ = (vec2(2) == vec2(1)); + let eq4_ = (vec3(2u) == vec3(1u)); + let eq5_ = (vec4(2.0) == vec4(1.0)); let neq0_ = (2 != 1); let neq1_ = (2u != 1u); let neq2_ = (2.0 != 1.0); - let neq3_ = (vec2(2) != vec2(1)); - let neq4_ = (vec3(2u) != vec3(1u)); - let neq5_ = (vec4(2.0) != vec4(1.0)); + let neq3_ = (vec2(2) != vec2(1)); + let neq4_ = (vec3(2u) != vec3(1u)); + let neq5_ = (vec4(2.0) != vec4(1.0)); let lt0_ = (2 < 1); let lt1_ = (2u < 1u); let lt2_ = (2.0 < 1.0); - let lt3_ = (vec2(2) < vec2(1)); - let lt4_ = (vec3(2u) < vec3(1u)); - let lt5_ = (vec4(2.0) < vec4(1.0)); + let lt3_ = (vec2(2) < vec2(1)); + let lt4_ = (vec3(2u) < vec3(1u)); + let lt5_ = (vec4(2.0) < vec4(1.0)); let lte0_ = (2 <= 1); let lte1_ = (2u <= 1u); let lte2_ = (2.0 <= 1.0); - let lte3_ = (vec2(2) <= vec2(1)); - let lte4_ = (vec3(2u) <= vec3(1u)); - let lte5_ = (vec4(2.0) <= vec4(1.0)); + let lte3_ = (vec2(2) <= vec2(1)); + let lte4_ = (vec3(2u) <= vec3(1u)); + let lte5_ = (vec4(2.0) <= vec4(1.0)); let gt0_ = (2 > 1); let gt1_ = (2u > 1u); let gt2_ = (2.0 > 1.0); - let gt3_ = (vec2(2) > vec2(1)); - let gt4_ = (vec3(2u) > vec3(1u)); - let gt5_ = (vec4(2.0) > vec4(1.0)); + let gt3_ = (vec2(2) > vec2(1)); + let gt4_ = (vec3(2u) > vec3(1u)); + let gt5_ = (vec4(2.0) > vec4(1.0)); let gte0_ = (2 >= 1); let gte1_ = (2u >= 1u); let gte2_ = (2.0 >= 1.0); - let gte3_ = (vec2(2) >= vec2(1)); - let gte4_ = (vec3(2u) >= vec3(1u)); - let gte5_ = (vec4(2.0) >= vec4(1.0)); + let gte3_ = (vec2(2) >= vec2(1)); + let gte4_ = (vec3(2u) >= vec3(1u)); + let gte5_ = (vec4(2.0) >= vec4(1.0)); } fn assignment() { diff --git a/tests/out/wgsl/padding.wgsl b/tests/out/wgsl/padding.wgsl index 7f77c35319..9893747ca7 100644 --- a/tests/out/wgsl/padding.wgsl +++ b/tests/out/wgsl/padding.wgsl @@ -29,5 +29,5 @@ fn vertex() -> @builtin(position) vec4 { let _e4 = input1_.b; let _e8 = input2_.b; let _e12 = input3_.b; - return (((vec4(1.0) * _e4) * _e8) * _e12); + return (((vec4(1.0) * _e4) * _e8) * _e12); } diff --git a/tests/out/wgsl/prepostfix-frag.wgsl b/tests/out/wgsl/prepostfix-frag.wgsl index 5515f9827b..296a8151eb 100644 --- a/tests/out/wgsl/prepostfix-frag.wgsl +++ b/tests/out/wgsl/prepostfix-frag.wgsl @@ -14,22 +14,22 @@ fn main_1() { let _e8 = (_e6 - 1); scalar = _e8; scalar_target = _e8; - vec = vec2(u32(1)); + vec = vec2(u32(1)); let _e14 = vec; - vec = (_e14 - vec2(1u)); + vec = (_e14 - vec2(1u)); vec_target = _e14; let _e18 = vec; - let _e21 = (_e18 + vec2(1u)); + let _e21 = (_e18 + vec2(1u)); vec = _e21; vec_target = _e21; let _e24 = f32(1); mat = mat4x3(vec3(_e24, 0.0, 0.0), vec3(0.0, _e24, 0.0), vec3(0.0, 0.0, _e24), vec3(0.0, 0.0, 0.0)); let _e32 = mat; - let _e34 = vec3(1.0); + let _e34 = vec3(1.0); mat = (_e32 + mat4x3(_e34, _e34, _e34, _e34)); mat_target = _e32; let _e37 = mat; - let _e39 = vec3(1.0); + let _e39 = vec3(1.0); let _e41 = (_e37 - mat4x3(_e39, _e39, _e39, _e39)); mat = _e41; mat_target = _e41; diff --git a/tests/out/wgsl/samplers-frag.wgsl b/tests/out/wgsl/samplers-frag.wgsl index 56d4489d85..96b6626522 100644 --- a/tests/out/wgsl/samplers-frag.wgsl +++ b/tests/out/wgsl/samplers-frag.wgsl @@ -71,7 +71,7 @@ fn testTex1D(coord: f32) { let _e82 = coord_1; let _e87 = coord_1; let _e91 = vec4(_e87, 0.0, 0.0, 6.0); - let _e97 = textureSample(tex1D, samp, (_e91.xyz / vec3(_e91.w)).x); + let _e97 = textureSample(tex1D, samp, (_e91.xyz / vec3(_e91.w)).x); c = _e97; let _e98 = coord_1; let _e102 = coord_1; @@ -81,7 +81,7 @@ fn testTex1D(coord: f32) { let _e110 = coord_1; let _e116 = coord_1; let _e120 = vec4(_e116, 0.0, 0.0, 6.0); - let _e127 = textureSampleBias(tex1D, samp, (_e120.xyz / vec3(_e120.w)).x, 2.0); + let _e127 = textureSampleBias(tex1D, samp, (_e120.xyz / vec3(_e120.w)).x, 2.0); c = _e127; let _e128 = coord_1; let _e133 = coord_1; @@ -91,7 +91,7 @@ fn testTex1D(coord: f32) { let _e142 = coord_1; let _e149 = coord_1; let _e153 = vec4(_e149, 0.0, 0.0, 6.0); - let _e161 = textureSampleGrad(tex1D, samp, (_e153.xyz / vec3(_e153.w)).x, 4.0, 4.0); + let _e161 = textureSampleGrad(tex1D, samp, (_e153.xyz / vec3(_e153.w)).x, 4.0, 4.0); c = _e161; let _e162 = coord_1; let _e168 = coord_1; @@ -101,7 +101,7 @@ fn testTex1D(coord: f32) { let _e178 = coord_1; let _e186 = coord_1; let _e190 = vec4(_e186, 0.0, 0.0, 6.0); - let _e199 = textureSampleGrad(tex1D, samp, (_e190.xyz / vec3(_e190.w)).x, 4.0, 4.0, 5); + let _e199 = textureSampleGrad(tex1D, samp, (_e190.xyz / vec3(_e190.w)).x, 4.0, 4.0, 5); c = _e199; let _e200 = coord_1; let _e204 = coord_1; @@ -111,7 +111,7 @@ fn testTex1D(coord: f32) { let _e212 = coord_1; let _e218 = coord_1; let _e222 = vec4(_e218, 0.0, 0.0, 6.0); - let _e229 = textureSampleLevel(tex1D, samp, (_e222.xyz / vec3(_e222.w)).x, 3.0); + let _e229 = textureSampleLevel(tex1D, samp, (_e222.xyz / vec3(_e222.w)).x, 3.0); c = _e229; let _e230 = coord_1; let _e235 = coord_1; @@ -121,7 +121,7 @@ fn testTex1D(coord: f32) { let _e244 = coord_1; let _e251 = coord_1; let _e255 = vec4(_e251, 0.0, 0.0, 6.0); - let _e263 = textureSampleLevel(tex1D, samp, (_e255.xyz / vec3(_e255.w)).x, 3.0, 5); + let _e263 = textureSampleLevel(tex1D, samp, (_e255.xyz / vec3(_e255.w)).x, 3.0, 5); c = _e263; let _e264 = coord_1; let _e268 = coord_1; @@ -131,7 +131,7 @@ fn testTex1D(coord: f32) { let _e276 = coord_1; let _e282 = coord_1; let _e286 = vec4(_e282, 0.0, 0.0, 6.0); - let _e293 = textureSample(tex1D, samp, (_e286.xyz / vec3(_e286.w)).x, 5); + let _e293 = textureSample(tex1D, samp, (_e286.xyz / vec3(_e286.w)).x, 5); c = _e293; let _e294 = coord_1; let _e299 = coord_1; @@ -141,7 +141,7 @@ fn testTex1D(coord: f32) { let _e308 = coord_1; let _e315 = coord_1; let _e319 = vec4(_e315, 0.0, 0.0, 6.0); - let _e327 = textureSampleBias(tex1D, samp, (_e319.xyz / vec3(_e319.w)).x, 2.0, 5); + let _e327 = textureSampleBias(tex1D, samp, (_e319.xyz / vec3(_e319.w)).x, 2.0, 5); c = _e327; let _e328 = coord_1; let _e331 = coord_1; @@ -215,10 +215,10 @@ fn testTex2D(coord_4: vec2) { let _e31 = textureSampleBias(tex2D, samp, _e29, 2.0); c_2 = _e31; let _e37 = coord_5; - let _e42 = textureSampleGrad(tex2D, samp, _e37, vec2(4.0), vec2(4.0)); + let _e42 = textureSampleGrad(tex2D, samp, _e37, vec2(4.0), vec2(4.0)); c_2 = _e42; let _e50 = coord_5; - let _e57 = textureSampleGrad(tex2D, samp, _e50, vec2(4.0), vec2(4.0), vec2(5, 5)); + let _e57 = textureSampleGrad(tex2D, samp, _e50, vec2(4.0), vec2(4.0), vec2(5, 5)); c_2 = _e57; let _e60 = coord_5; let _e62 = textureSampleLevel(tex2D, samp, _e60, 3.0); @@ -235,82 +235,82 @@ fn testTex2D(coord_4: vec2) { let _e88 = coord_5; let _e93 = coord_5; let _e97 = vec3(_e93.x, _e93.y, 6.0); - let _e102 = textureSample(tex2D, samp, (_e97.xy / vec2(_e97.z))); + let _e102 = textureSample(tex2D, samp, (_e97.xy / vec2(_e97.z))); c_2 = _e102; let _e103 = coord_5; let _e109 = coord_5; let _e114 = vec4(_e109.x, _e109.y, 0.0, 6.0); - let _e120 = textureSample(tex2D, samp, (_e114.xyz / vec3(_e114.w)).xy); + let _e120 = textureSample(tex2D, samp, (_e114.xyz / vec3(_e114.w)).xy); c_2 = _e120; let _e121 = coord_5; let _e127 = coord_5; let _e131 = vec3(_e127.x, _e127.y, 6.0); - let _e137 = textureSampleBias(tex2D, samp, (_e131.xy / vec2(_e131.z)), 2.0); + let _e137 = textureSampleBias(tex2D, samp, (_e131.xy / vec2(_e131.z)), 2.0); c_2 = _e137; let _e138 = coord_5; let _e145 = coord_5; let _e150 = vec4(_e145.x, _e145.y, 0.0, 6.0); - let _e157 = textureSampleBias(tex2D, samp, (_e150.xyz / vec3(_e150.w)).xy, 2.0); + let _e157 = textureSampleBias(tex2D, samp, (_e150.xyz / vec3(_e150.w)).xy, 2.0); c_2 = _e157; let _e158 = coord_5; let _e167 = coord_5; let _e171 = vec3(_e167.x, _e167.y, 6.0); - let _e180 = textureSampleGrad(tex2D, samp, (_e171.xy / vec2(_e171.z)), vec2(4.0), vec2(4.0)); + let _e180 = textureSampleGrad(tex2D, samp, (_e171.xy / vec2(_e171.z)), vec2(4.0), vec2(4.0)); c_2 = _e180; let _e181 = coord_5; let _e191 = coord_5; let _e196 = vec4(_e191.x, _e191.y, 0.0, 6.0); - let _e206 = textureSampleGrad(tex2D, samp, (_e196.xyz / vec3(_e196.w)).xy, vec2(4.0), vec2(4.0)); + let _e206 = textureSampleGrad(tex2D, samp, (_e196.xyz / vec3(_e196.w)).xy, vec2(4.0), vec2(4.0)); c_2 = _e206; let _e207 = coord_5; let _e218 = coord_5; let _e222 = vec3(_e218.x, _e218.y, 6.0); - let _e233 = textureSampleGrad(tex2D, samp, (_e222.xy / vec2(_e222.z)), vec2(4.0), vec2(4.0), vec2(5, 5)); + let _e233 = textureSampleGrad(tex2D, samp, (_e222.xy / vec2(_e222.z)), vec2(4.0), vec2(4.0), vec2(5, 5)); c_2 = _e233; let _e234 = coord_5; let _e246 = coord_5; let _e251 = vec4(_e246.x, _e246.y, 0.0, 6.0); - let _e263 = textureSampleGrad(tex2D, samp, (_e251.xyz / vec3(_e251.w)).xy, vec2(4.0), vec2(4.0), vec2(5, 5)); + let _e263 = textureSampleGrad(tex2D, samp, (_e251.xyz / vec3(_e251.w)).xy, vec2(4.0), vec2(4.0), vec2(5, 5)); c_2 = _e263; let _e264 = coord_5; let _e270 = coord_5; let _e274 = vec3(_e270.x, _e270.y, 6.0); - let _e280 = textureSampleLevel(tex2D, samp, (_e274.xy / vec2(_e274.z)), 3.0); + let _e280 = textureSampleLevel(tex2D, samp, (_e274.xy / vec2(_e274.z)), 3.0); c_2 = _e280; let _e281 = coord_5; let _e288 = coord_5; let _e293 = vec4(_e288.x, _e288.y, 0.0, 6.0); - let _e300 = textureSampleLevel(tex2D, samp, (_e293.xyz / vec3(_e293.w)).xy, 3.0); + let _e300 = textureSampleLevel(tex2D, samp, (_e293.xyz / vec3(_e293.w)).xy, 3.0); c_2 = _e300; let _e301 = coord_5; let _e309 = coord_5; let _e313 = vec3(_e309.x, _e309.y, 6.0); - let _e321 = textureSampleLevel(tex2D, samp, (_e313.xy / vec2(_e313.z)), 3.0, vec2(5, 5)); + let _e321 = textureSampleLevel(tex2D, samp, (_e313.xy / vec2(_e313.z)), 3.0, vec2(5, 5)); c_2 = _e321; let _e322 = coord_5; let _e331 = coord_5; let _e336 = vec4(_e331.x, _e331.y, 0.0, 6.0); - let _e345 = textureSampleLevel(tex2D, samp, (_e336.xyz / vec3(_e336.w)).xy, 3.0, vec2(5, 5)); + let _e345 = textureSampleLevel(tex2D, samp, (_e336.xyz / vec3(_e336.w)).xy, 3.0, vec2(5, 5)); c_2 = _e345; let _e346 = coord_5; let _e353 = coord_5; let _e357 = vec3(_e353.x, _e353.y, 6.0); - let _e364 = textureSample(tex2D, samp, (_e357.xy / vec2(_e357.z)), vec2(5, 5)); + let _e364 = textureSample(tex2D, samp, (_e357.xy / vec2(_e357.z)), vec2(5, 5)); c_2 = _e364; let _e365 = coord_5; let _e373 = coord_5; let _e378 = vec4(_e373.x, _e373.y, 0.0, 6.0); - let _e386 = textureSample(tex2D, samp, (_e378.xyz / vec3(_e378.w)).xy, vec2(5, 5)); + let _e386 = textureSample(tex2D, samp, (_e378.xyz / vec3(_e378.w)).xy, vec2(5, 5)); c_2 = _e386; let _e387 = coord_5; let _e395 = coord_5; let _e399 = vec3(_e395.x, _e395.y, 6.0); - let _e407 = textureSampleBias(tex2D, samp, (_e399.xy / vec2(_e399.z)), 2.0, vec2(5, 5)); + let _e407 = textureSampleBias(tex2D, samp, (_e399.xy / vec2(_e399.z)), 2.0, vec2(5, 5)); c_2 = _e407; let _e408 = coord_5; let _e417 = coord_5; let _e422 = vec4(_e417.x, _e417.y, 0.0, 6.0); - let _e431 = textureSampleBias(tex2D, samp, (_e422.xyz / vec3(_e422.w)).xy, 2.0, vec2(5, 5)); + let _e431 = textureSampleBias(tex2D, samp, (_e422.xyz / vec3(_e422.w)).xy, 2.0, vec2(5, 5)); c_2 = _e431; let _e432 = coord_5; let _e435 = coord_5; @@ -364,37 +364,37 @@ fn testTex2DShadow(coord_6: vec2) { let _e134 = coord_7; let _e140 = coord_7; let _e145 = vec4(_e140.x, _e140.y, 1.0, 6.0); - let _e149 = (_e145.xyz / vec3(_e145.w)); + let _e149 = (_e145.xyz / vec3(_e145.w)); let _e152 = textureSampleCompare(tex2DShadow, sampShadow, _e149.xy, _e149.z); d = _e152; let _e153 = coord_7; let _e163 = coord_7; let _e168 = vec4(_e163.x, _e163.y, 1.0, 6.0); - let _e176 = (_e168.xyz / vec3(_e168.w)); + let _e176 = (_e168.xyz / vec3(_e168.w)); let _e179 = textureSampleCompareLevel(tex2DShadow, sampShadow, _e176.xy, _e176.z); d = _e179; let _e180 = coord_7; let _e192 = coord_7; let _e197 = vec4(_e192.x, _e192.y, 1.0, 6.0); - let _e207 = (_e197.xyz / vec3(_e197.w)); + let _e207 = (_e197.xyz / vec3(_e197.w)); let _e210 = textureSampleCompareLevel(tex2DShadow, sampShadow, _e207.xy, _e207.z, vec2(5, 5)); d = _e210; let _e211 = coord_7; let _e218 = coord_7; let _e223 = vec4(_e218.x, _e218.y, 1.0, 6.0); - let _e228 = (_e223.xyz / vec3(_e223.w)); + let _e228 = (_e223.xyz / vec3(_e223.w)); let _e231 = textureSampleCompareLevel(tex2DShadow, sampShadow, _e228.xy, _e228.z); d = _e231; let _e232 = coord_7; let _e241 = coord_7; let _e246 = vec4(_e241.x, _e241.y, 1.0, 6.0); - let _e253 = (_e246.xyz / vec3(_e246.w)); + let _e253 = (_e246.xyz / vec3(_e246.w)); let _e256 = textureSampleCompareLevel(tex2DShadow, sampShadow, _e253.xy, _e253.z, vec2(5, 5)); d = _e256; let _e257 = coord_7; let _e265 = coord_7; let _e270 = vec4(_e265.x, _e265.y, 1.0, 6.0); - let _e276 = (_e270.xyz / vec3(_e270.w)); + let _e276 = (_e270.xyz / vec3(_e270.w)); let _e279 = textureSampleCompare(tex2DShadow, sampShadow, _e276.xy, _e276.z, vec2(5, 5)); d = _e279; return; @@ -416,10 +416,10 @@ fn testTex2DArray(coord_8: vec3) { let _e41 = textureSampleBias(tex2DArray, samp, _e36.xy, i32(_e36.z), 2.0); c_3 = _e41; let _e47 = coord_9; - let _e55 = textureSampleGrad(tex2DArray, samp, _e47.xy, i32(_e47.z), vec2(4.0), vec2(4.0)); + let _e55 = textureSampleGrad(tex2DArray, samp, _e47.xy, i32(_e47.z), vec2(4.0), vec2(4.0)); c_3 = _e55; let _e63 = coord_9; - let _e73 = textureSampleGrad(tex2DArray, samp, _e63.xy, i32(_e63.z), vec2(4.0), vec2(4.0), vec2(5, 5)); + let _e73 = textureSampleGrad(tex2DArray, samp, _e63.xy, i32(_e63.z), vec2(4.0), vec2(4.0), vec2(5, 5)); c_3 = _e73; let _e76 = coord_9; let _e81 = textureSampleLevel(tex2DArray, samp, _e76.xy, i32(_e76.z), 3.0); @@ -493,7 +493,7 @@ fn testTexCube(coord_12: vec3) { let _e31 = textureSampleBias(texCube, samp, _e29, 2.0); c_4 = _e31; let _e37 = coord_13; - let _e42 = textureSampleGrad(texCube, samp, _e37, vec3(4.0), vec3(4.0)); + let _e42 = textureSampleGrad(texCube, samp, _e37, vec3(4.0), vec3(4.0)); c_4 = _e42; let _e45 = coord_13; let _e47 = textureSampleLevel(texCube, samp, _e45, 3.0); @@ -538,7 +538,7 @@ fn testTexCubeArray(coord_16: vec4) { let _e41 = textureSampleBias(texCubeArray, samp, _e36.xyz, i32(_e36.w), 2.0); c_5 = _e41; let _e47 = coord_17; - let _e55 = textureSampleGrad(texCubeArray, samp, _e47.xyz, i32(_e47.w), vec3(4.0), vec3(4.0)); + let _e55 = textureSampleGrad(texCubeArray, samp, _e47.xyz, i32(_e47.w), vec3(4.0), vec3(4.0)); c_5 = _e55; let _e58 = coord_17; let _e63 = textureSampleLevel(texCubeArray, samp, _e58.xyz, i32(_e58.w), 3.0); @@ -578,48 +578,48 @@ fn testTex3D(coord_20: vec3) { let _e32 = coord_21; let _e38 = coord_21; let _e43 = vec4(_e38.x, _e38.y, _e38.z, 6.0); - let _e48 = textureSample(tex3D, samp, (_e43.xyz / vec3(_e43.w))); + let _e48 = textureSample(tex3D, samp, (_e43.xyz / vec3(_e43.w))); c_6 = _e48; let _e49 = coord_21; let _e56 = coord_21; let _e61 = vec4(_e56.x, _e56.y, _e56.z, 6.0); - let _e67 = textureSampleBias(tex3D, samp, (_e61.xyz / vec3(_e61.w)), 2.0); + let _e67 = textureSampleBias(tex3D, samp, (_e61.xyz / vec3(_e61.w)), 2.0); c_6 = _e67; let _e68 = coord_21; let _e76 = coord_21; let _e81 = vec4(_e76.x, _e76.y, _e76.z, 6.0); - let _e88 = textureSample(tex3D, samp, (_e81.xyz / vec3(_e81.w)), vec3(5, 5, 5)); + let _e88 = textureSample(tex3D, samp, (_e81.xyz / vec3(_e81.w)), vec3(5, 5, 5)); c_6 = _e88; let _e89 = coord_21; let _e98 = coord_21; let _e103 = vec4(_e98.x, _e98.y, _e98.z, 6.0); - let _e111 = textureSampleBias(tex3D, samp, (_e103.xyz / vec3(_e103.w)), 2.0, vec3(5, 5, 5)); + let _e111 = textureSampleBias(tex3D, samp, (_e103.xyz / vec3(_e103.w)), 2.0, vec3(5, 5, 5)); c_6 = _e111; let _e112 = coord_21; let _e119 = coord_21; let _e124 = vec4(_e119.x, _e119.y, _e119.z, 6.0); - let _e130 = textureSampleLevel(tex3D, samp, (_e124.xyz / vec3(_e124.w)), 3.0); + let _e130 = textureSampleLevel(tex3D, samp, (_e124.xyz / vec3(_e124.w)), 3.0); c_6 = _e130; let _e131 = coord_21; let _e140 = coord_21; let _e145 = vec4(_e140.x, _e140.y, _e140.z, 6.0); - let _e153 = textureSampleLevel(tex3D, samp, (_e145.xyz / vec3(_e145.w)), 3.0, vec3(5, 5, 5)); + let _e153 = textureSampleLevel(tex3D, samp, (_e145.xyz / vec3(_e145.w)), 3.0, vec3(5, 5, 5)); c_6 = _e153; let _e154 = coord_21; let _e164 = coord_21; let _e169 = vec4(_e164.x, _e164.y, _e164.z, 6.0); - let _e178 = textureSampleGrad(tex3D, samp, (_e169.xyz / vec3(_e169.w)), vec3(4.0), vec3(4.0)); + let _e178 = textureSampleGrad(tex3D, samp, (_e169.xyz / vec3(_e169.w)), vec3(4.0), vec3(4.0)); c_6 = _e178; let _e179 = coord_21; let _e191 = coord_21; let _e196 = vec4(_e191.x, _e191.y, _e191.z, 6.0); - let _e207 = textureSampleGrad(tex3D, samp, (_e196.xyz / vec3(_e196.w)), vec3(4.0), vec3(4.0), vec3(5, 5, 5)); + let _e207 = textureSampleGrad(tex3D, samp, (_e196.xyz / vec3(_e196.w)), vec3(4.0), vec3(4.0), vec3(5, 5, 5)); c_6 = _e207; let _e213 = coord_21; - let _e218 = textureSampleGrad(tex3D, samp, _e213, vec3(4.0), vec3(4.0)); + let _e218 = textureSampleGrad(tex3D, samp, _e213, vec3(4.0), vec3(4.0)); c_6 = _e218; let _e226 = coord_21; - let _e233 = textureSampleGrad(tex3D, samp, _e226, vec3(4.0), vec3(4.0), vec3(5, 5, 5)); + let _e233 = textureSampleGrad(tex3D, samp, _e226, vec3(4.0), vec3(4.0), vec3(5, 5, 5)); c_6 = _e233; let _e236 = coord_21; let _e238 = textureSampleLevel(tex3D, samp, _e236, 3.0); diff --git a/tests/out/wgsl/type-alias.wgsl b/tests/out/wgsl/type-alias.wgsl index b298c2c931..fea2dec108 100644 --- a/tests/out/wgsl/type-alias.wgsl +++ b/tests/out/wgsl/type-alias.wgsl @@ -1,8 +1,8 @@ fn main() { let a = vec3(0.0, 0.0, 0.0); - let c = vec3(0.0); - let b = vec3(vec2(0.0), 0.0); - let d = vec3(vec2(0.0), 0.0); + let c = vec3(0.0); + let b = vec3(vec2(0.0), 0.0); + let d = vec3(vec2(0.0), 0.0); let e = vec3(d); let f = mat2x2(vec2(1.0, 2.0), vec2(3.0, 4.0)); let g = mat3x3(a, a, a);