From 14ac279027afc13aa32ac88841bafd04cd6cfd8a Mon Sep 17 00:00:00 2001
From: teoxoy <28601907+teoxoy@users.noreply.github.com>
Date: Wed, 3 May 2023 16:55:27 +0200
Subject: [PATCH] [glsl-in] set initializer of local variables

---
 src/front/glsl/parser/declarations.rs         |  3 +-
 tests/out/wgsl/246-collatz-comp.wgsl          |  3 +-
 tests/out/wgsl/277-casting-frag.wgsl          |  3 +-
 tests/out/wgsl/280-matrix-cast-frag.wgsl      |  4 +--
 tests/out/wgsl/901-lhs-field-select-frag.wgsl |  3 +-
 tests/out/wgsl/932-for-loop-if-frag.wgsl      |  3 +-
 tests/out/wgsl/bevy-pbr-frag.wgsl             | 18 ++++-------
 tests/out/wgsl/bits_glsl-frag.wgsl            | 30 +++++++------------
 tests/out/wgsl/constant-array-size-frag.wgsl  |  6 ++--
 tests/out/wgsl/declarations-frag.wgsl         |  6 ++--
 tests/out/wgsl/expressions-frag.wgsl          | 19 ++++--------
 tests/out/wgsl/long-form-matrix-frag.wgsl     | 25 +++++-----------
 tests/out/wgsl/math-functions-frag.wgsl       |  9 ++----
 tests/out/wgsl/prepostfix-frag.wgsl           |  9 ++----
 tests/out/wgsl/sampler-functions-frag.wgsl    |  3 +-
 15 files changed, 46 insertions(+), 98 deletions(-)

diff --git a/src/front/glsl/parser/declarations.rs b/src/front/glsl/parser/declarations.rs
index a91f15c9ed..954c5807f3 100644
--- a/src/front/glsl/parser/declarations.rs
+++ b/src/front/glsl/parser/declarations.rs
@@ -251,8 +251,7 @@ impl<'source> ParsingContext<'source> {
             } else if ctx.external {
                 init.and_then(|expr| ctx.ctx.lift_up_const_expression(expr).ok())
             } else {
-                None
-                // init.filter(|expr| ctx.ctx.expressions.is_const(*expr))
+                init.filter(|expr| ctx.ctx.expressions.is_const(*expr))
             };
 
             let pointer = ctx.add_var(frontend, ty, name, maybe_const_expr, meta)?;
diff --git a/tests/out/wgsl/246-collatz-comp.wgsl b/tests/out/wgsl/246-collatz-comp.wgsl
index e79d619649..5d1ea64833 100644
--- a/tests/out/wgsl/246-collatz-comp.wgsl
+++ b/tests/out/wgsl/246-collatz-comp.wgsl
@@ -8,10 +8,9 @@ var<private> gl_GlobalInvocationID: vec3<u32>;
 
 fn collatz_iterations(n: u32) -> u32 {
     var n_1: u32;
-    var i: u32;
+    var i: u32 = 0u;
 
     n_1 = n;
-    i = 0u;
     loop {
         let _e7 = n_1;
         if !((_e7 != 1u)) {
diff --git a/tests/out/wgsl/277-casting-frag.wgsl b/tests/out/wgsl/277-casting-frag.wgsl
index 84c50ddd45..87761aff4e 100644
--- a/tests/out/wgsl/277-casting-frag.wgsl
+++ b/tests/out/wgsl/277-casting-frag.wgsl
@@ -1,7 +1,6 @@
 fn main_1() {
-    var a: f32;
+    var a: f32 = 1.0;
 
-    a = 1.0;
     return;
 }
 
diff --git a/tests/out/wgsl/280-matrix-cast-frag.wgsl b/tests/out/wgsl/280-matrix-cast-frag.wgsl
index ad9f85b74e..7d432ee496 100644
--- a/tests/out/wgsl/280-matrix-cast-frag.wgsl
+++ b/tests/out/wgsl/280-matrix-cast-frag.wgsl
@@ -1,8 +1,6 @@
 fn main_1() {
-    var a: mat4x4<f32>;
+    var a: mat4x4<f32> = mat4x4<f32>(vec4<f32>(1.0, 0.0, 0.0, 0.0), vec4<f32>(0.0, 1.0, 0.0, 0.0), vec4<f32>(0.0, 0.0, 1.0, 0.0), vec4<f32>(0.0, 0.0, 0.0, 1.0));
 
-    a = mat4x4<f32>(vec4<f32>(1.0, 0.0, 0.0, 0.0), vec4<f32>(0.0, 1.0, 0.0, 0.0), vec4<f32>(0.0, 0.0, 1.0, 0.0), vec4<f32>(0.0, 0.0, 0.0, 1.0));
-    return;
 }
 
 @fragment 
diff --git a/tests/out/wgsl/901-lhs-field-select-frag.wgsl b/tests/out/wgsl/901-lhs-field-select-frag.wgsl
index 71b9870512..341ef150e1 100644
--- a/tests/out/wgsl/901-lhs-field-select-frag.wgsl
+++ b/tests/out/wgsl/901-lhs-field-select-frag.wgsl
@@ -1,7 +1,6 @@
 fn main_1() {
-    var a: vec4<f32>;
+    var a: vec4<f32> = vec4(1.0);
 
-    a = vec4(1.0);
     a.x = 2.0;
     return;
 }
diff --git a/tests/out/wgsl/932-for-loop-if-frag.wgsl b/tests/out/wgsl/932-for-loop-if-frag.wgsl
index f9a29ae87e..ad1fdd34ee 100644
--- a/tests/out/wgsl/932-for-loop-if-frag.wgsl
+++ b/tests/out/wgsl/932-for-loop-if-frag.wgsl
@@ -1,7 +1,6 @@
 fn main_1() {
-    var i: i32;
+    var i: i32 = 0;
 
-    i = 0;
     loop {
         let _e2 = i;
         if !((_e2 < 1)) {
diff --git a/tests/out/wgsl/bevy-pbr-frag.wgsl b/tests/out/wgsl/bevy-pbr-frag.wgsl
index 73501b99f4..c40b6dd73d 100644
--- a/tests/out/wgsl/bevy-pbr-frag.wgsl
+++ b/tests/out/wgsl/bevy-pbr-frag.wgsl
@@ -328,8 +328,8 @@ fn EnvBRDFApprox(f0_7: vec3<f32>, perceptual_roughness: f32, NoV_6: f32) -> vec3
     var f0_8: vec3<f32>;
     var perceptual_roughness_1: f32;
     var NoV_7: f32;
-    var c0_: vec4<f32>;
-    var c1_: vec4<f32>;
+    var c0_: vec4<f32> = vec4<f32>(-1.0, -0.0275, -0.572, 0.022);
+    var c1_: vec4<f32> = vec4<f32>(1.0, 0.0425, 1.04, -0.04);
     var r: vec4<f32>;
     var a004_: f32;
     var AB: vec2<f32>;
@@ -337,8 +337,6 @@ fn EnvBRDFApprox(f0_7: vec3<f32>, perceptual_roughness: f32, NoV_6: f32) -> vec3
     f0_8 = f0_7;
     perceptual_roughness_1 = perceptual_roughness;
     NoV_7 = NoV_6;
-    c0_ = vec4<f32>(-1.0, -0.0275, -0.572, 0.022);
-    c1_ = vec4<f32>(1.0, 0.0425, 1.04, -0.04);
     let _e62 = perceptual_roughness_1;
     let _e64 = c0_;
     let _e66 = c1_;
@@ -638,7 +636,7 @@ fn dir_light(light_2: DirectionalLight, roughness_10: f32, NdotV_2: f32, normal:
     var NoH_5: f32;
     var LoH_7: f32;
     var diffuse_1: vec3<f32>;
-    var specularIntensity_3: f32;
+    var specularIntensity_3: f32 = 1.0;
     var specular_2: vec3<f32>;
 
     light_3 = light_2;
@@ -678,7 +676,6 @@ fn dir_light(light_2: DirectionalLight, roughness_10: f32, NdotV_2: f32, normal:
     let _e124 = LoH_7;
     let _e125 = Fd_Burley(_e121, _e122, _e123, _e124);
     diffuse_1 = (_e116 * _e125);
-    specularIntensity_3 = 1.0;
     let _e138 = F0_3;
     let _e139 = roughness_11;
     let _e140 = half_vector;
@@ -716,9 +713,9 @@ fn main_1() {
     var F0_4: vec3<f32>;
     var diffuseColor_4: vec3<f32>;
     var R_4: vec3<f32>;
-    var light_accum: vec3<f32>;
-    var i: i32;
-    var i_1: i32;
+    var light_accum: vec3<f32> = vec3(0.0);
+    var i: i32 = 0;
+    var i_1: i32 = 0;
     var diffuse_ambient: vec3<f32>;
     var specular_ambient: vec3<f32>;
 
@@ -825,8 +822,6 @@ fn main_1() {
     let _e217 = V_3;
     let _e219 = N_2;
     R_4 = reflect(-(_e217), _e219);
-    light_accum = vec3(0.0);
-    i = 0;
     loop {
         let _e227 = i;
         let _e228 = global_2.NumLights;
@@ -854,7 +849,6 @@ fn main_1() {
             i = (_e236 + 1);
         }
     }
-    i_1 = 0;
     loop {
         let _e264 = i_1;
         let _e265 = global_2.NumLights;
diff --git a/tests/out/wgsl/bits_glsl-frag.wgsl b/tests/out/wgsl/bits_glsl-frag.wgsl
index 13f2a9925e..597d5aa1c5 100644
--- a/tests/out/wgsl/bits_glsl-frag.wgsl
+++ b/tests/out/wgsl/bits_glsl-frag.wgsl
@@ -1,25 +1,15 @@
 fn main_1() {
-    var i: i32;
-    var i2_: vec2<i32>;
-    var i3_: vec3<i32>;
-    var i4_: vec4<i32>;
-    var u: u32;
-    var u2_: vec2<u32>;
-    var u3_: vec3<u32>;
-    var u4_: vec4<u32>;
-    var f2_: vec2<f32>;
-    var f4_: vec4<f32>;
+    var i: i32 = 0;
+    var i2_: vec2<i32> = vec2(0);
+    var i3_: vec3<i32> = vec3(0);
+    var i4_: vec4<i32> = vec4(0);
+    var u: u32 = 0u;
+    var u2_: vec2<u32> = vec2(0u);
+    var u3_: vec3<u32> = vec3(0u);
+    var u4_: vec4<u32> = vec4(0u);
+    var f2_: vec2<f32> = vec2(0.0);
+    var f4_: vec4<f32> = vec4(0.0);
 
-    i = 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);
     let _e33 = f4_;
     u = pack4x8snorm(_e33);
     let _e36 = f4_;
diff --git a/tests/out/wgsl/constant-array-size-frag.wgsl b/tests/out/wgsl/constant-array-size-frag.wgsl
index 18da4f7cd9..f4baa8c129 100644
--- a/tests/out/wgsl/constant-array-size-frag.wgsl
+++ b/tests/out/wgsl/constant-array-size-frag.wgsl
@@ -8,11 +8,9 @@ const NUM_VECS: i32 = 42;
 var<uniform> global: Data;
 
 fn function() -> vec4<f32> {
-    var sum: vec4<f32>;
-    var i: i32;
+    var sum: vec4<f32> = vec4(0.0);
+    var i: i32 = 0;
 
-    sum = vec4(0.0);
-    i = 0;
     loop {
         let _e9 = i;
         if !((_e9 < NUM_VECS)) {
diff --git a/tests/out/wgsl/declarations-frag.wgsl b/tests/out/wgsl/declarations-frag.wgsl
index c82acd1e70..8d8ff9f43c 100644
--- a/tests/out/wgsl/declarations-frag.wgsl
+++ b/tests/out/wgsl/declarations-frag.wgsl
@@ -28,14 +28,12 @@ var<private> array_2d: array<array<f32, 2>, 2>;
 var<private> array_toomanyd: array<array<array<array<array<array<array<f32, 2>, 2>, 2>, 2>, 2>, 2>, 2>;
 
 fn main_1() {
-    var positions: array<vec3<f32>, 2>;
-    var strct: TestStruct;
+    var positions: array<vec3<f32>, 2> = array<vec3<f32>, 2>(vec3<f32>(-1.0, 1.0, 0.0), vec3<f32>(-1.0, -1.0, 0.0));
+    var strct: TestStruct = TestStruct(1.0, 2.0);
     var from_input_array: vec4<f32>;
     var a_1: f32;
     var b: f32;
 
-    positions = array<vec3<f32>, 2>(vec3<f32>(-1.0, 1.0, 0.0), vec3<f32>(-1.0, -1.0, 0.0));
-    strct = TestStruct(1.0, 2.0);
     let _e35 = in_array_2[1];
     from_input_array = _e35;
     let _e41 = array_2d[0][0];
diff --git a/tests/out/wgsl/expressions-frag.wgsl b/tests/out/wgsl/expressions-frag.wgsl
index 8a9776947c..c3817d8d78 100644
--- a/tests/out/wgsl/expressions-frag.wgsl
+++ b/tests/out/wgsl/expressions-frag.wgsl
@@ -280,24 +280,18 @@ fn testUnaryOpMat(a_16: mat3x3<f32>) {
 }
 
 fn testStructConstructor() {
-    var tree: BST;
+    var tree: BST = BST(1);
 
-    tree = BST(1);
-    return;
 }
 
 fn testNonScalarToScalarConstructor() {
-    var f: f32;
+    var f: f32 = 1.0;
 
-    f = 1.0;
-    return;
 }
 
 fn testArrayConstructor() {
-    var tree_1: array<f32, 1>;
+    var tree_1: array<f32, 1> = array<f32, 1>(0.0);
 
-    tree_1 = array<f32, 1>(0.0);
-    return;
 }
 
 fn testFreestandingConstructor() {
@@ -305,10 +299,9 @@ fn testFreestandingConstructor() {
 }
 
 fn testNonImplicitCastVectorCast() {
-    var a_18: u32;
+    var a_18: u32 = 1u;
     var b_16: vec4<i32>;
 
-    a_18 = 1u;
     let _e3 = a_18;
     b_16 = vec4(i32(_e3));
     return;
@@ -393,11 +386,9 @@ fn testLength() {
 
 fn testConstantLength(a_24: array<f32, 4>) {
     var a_25: array<f32, 4>;
-    var len_1: i32;
+    var len_1: i32 = 4;
 
     a_25 = a_24;
-    len_1 = 4;
-    return;
 }
 
 fn indexConstantNonConstantIndex(i: i32) {
diff --git a/tests/out/wgsl/long-form-matrix-frag.wgsl b/tests/out/wgsl/long-form-matrix-frag.wgsl
index 7cc26f1ff4..cadfe936c4 100644
--- a/tests/out/wgsl/long-form-matrix-frag.wgsl
+++ b/tests/out/wgsl/long-form-matrix-frag.wgsl
@@ -1,22 +1,13 @@
 fn main_1() {
-    var splat: mat2x2<f32>;
-    var normal: mat2x2<f32>;
-    var from_matrix: mat2x4<f32>;
-    var a: mat2x2<f32>;
-    var b: mat2x2<f32>;
-    var c: mat3x3<f32>;
-    var d: mat3x3<f32>;
-    var e: mat4x4<f32>;
+    var splat: mat2x2<f32> = mat2x2<f32>(vec2<f32>(1.0, 0.0), vec2<f32>(0.0, 1.0));
+    var normal: mat2x2<f32> = mat2x2<f32>(vec2<f32>(1.0, 1.0), vec2<f32>(2.0, 2.0));
+    var from_matrix: mat2x4<f32> = mat2x4<f32>(vec4<f32>(1.0, 0.0, 0.0, 0.0), vec4<f32>(0.0, 1.0, 0.0, 0.0));
+    var a: mat2x2<f32> = mat2x2<f32>(vec2<f32>(1.0, 2.0), vec2<f32>(3.0, 4.0));
+    var b: mat2x2<f32> = mat2x2<f32>(vec2<f32>(1.0, 2.0), vec2<f32>(3.0, 4.0));
+    var c: mat3x3<f32> = mat3x3<f32>(vec3<f32>(1.0, 2.0, 3.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
+    var d: mat3x3<f32> = mat3x3<f32>(vec3<f32>(2.0, 2.0, 1.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
+    var e: mat4x4<f32> = mat4x4<f32>(vec4<f32>(2.0, 2.0, 1.0, 1.0), vec4<f32>(1.0, 1.0, 2.0, 2.0), vec4<f32>(1.0, 1.0, 1.0, 1.0), vec4<f32>(1.0, 1.0, 1.0, 1.0));
 
-    splat = mat2x2<f32>(vec2<f32>(1.0, 0.0), vec2<f32>(0.0, 1.0));
-    normal = mat2x2<f32>(vec2<f32>(1.0, 1.0), vec2<f32>(2.0, 2.0));
-    from_matrix = mat2x4<f32>(vec4<f32>(1.0, 0.0, 0.0, 0.0), vec4<f32>(0.0, 1.0, 0.0, 0.0));
-    a = mat2x2<f32>(vec2<f32>(1.0, 2.0), vec2<f32>(3.0, 4.0));
-    b = mat2x2<f32>(vec2<f32>(1.0, 2.0), vec2<f32>(3.0, 4.0));
-    c = mat3x3<f32>(vec3<f32>(1.0, 2.0, 3.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
-    d = mat3x3<f32>(vec3<f32>(2.0, 2.0, 1.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
-    e = mat4x4<f32>(vec4<f32>(2.0, 2.0, 1.0, 1.0), vec4<f32>(1.0, 1.0, 2.0, 2.0), vec4<f32>(1.0, 1.0, 1.0, 1.0), vec4<f32>(1.0, 1.0, 1.0, 1.0));
-    return;
 }
 
 @fragment 
diff --git a/tests/out/wgsl/math-functions-frag.wgsl b/tests/out/wgsl/math-functions-frag.wgsl
index 79fa1ca466..50d522d66a 100644
--- a/tests/out/wgsl/math-functions-frag.wgsl
+++ b/tests/out/wgsl/math-functions-frag.wgsl
@@ -1,8 +1,8 @@
 fn main_1() {
-    var a: vec4<f32>;
-    var b: vec4<f32>;
+    var a: vec4<f32> = vec4(1.0);
+    var b: vec4<f32> = vec4(2.0);
     var m: mat4x4<f32>;
-    var i: i32;
+    var i: i32 = 5;
     var ceilOut: vec4<f32>;
     var roundOut: vec4<f32>;
     var floorOut: vec4<f32>;
@@ -48,14 +48,11 @@ fn main_1() {
     var smoothStepVector: vec4<f32>;
     var smoothStepMixed: vec4<f32>;
 
-    a = vec4(1.0);
-    b = vec4(2.0);
     let _e6 = a;
     let _e7 = b;
     let _e8 = a;
     let _e9 = b;
     m = mat4x4<f32>(vec4<f32>(_e6.x, _e6.y, _e6.z, _e6.w), vec4<f32>(_e7.x, _e7.y, _e7.z, _e7.w), vec4<f32>(_e8.x, _e8.y, _e8.z, _e8.w), vec4<f32>(_e9.x, _e9.y, _e9.z, _e9.w));
-    i = 5;
     let _e35 = a;
     ceilOut = ceil(_e35);
     let _e39 = a;
diff --git a/tests/out/wgsl/prepostfix-frag.wgsl b/tests/out/wgsl/prepostfix-frag.wgsl
index 5b8f1bfb6e..3a98925a90 100644
--- a/tests/out/wgsl/prepostfix-frag.wgsl
+++ b/tests/out/wgsl/prepostfix-frag.wgsl
@@ -1,12 +1,11 @@
 fn main_1() {
     var scalar_target: i32;
-    var scalar: i32;
+    var scalar: i32 = 1;
     var vec_target: vec2<u32>;
-    var vec: vec2<u32>;
+    var vec: vec2<u32> = vec2(1u);
     var mat_target: mat4x3<f32>;
-    var mat: mat4x3<f32>;
+    var mat: mat4x3<f32> = mat4x3<f32>(vec3<f32>(1.0, 0.0, 0.0), vec3<f32>(0.0, 1.0, 0.0), vec3<f32>(0.0, 0.0, 1.0), vec3<f32>(0.0, 0.0, 0.0));
 
-    scalar = 1;
     let _e3 = scalar;
     scalar = (_e3 + 1);
     scalar_target = _e3;
@@ -14,7 +13,6 @@ fn main_1() {
     let _e8 = (_e6 - 1);
     scalar = _e8;
     scalar_target = _e8;
-    vec = vec2(1u);
     let _e14 = vec;
     vec = (_e14 - vec2(1u));
     vec_target = _e14;
@@ -22,7 +20,6 @@ fn main_1() {
     let _e21 = (_e18 + vec2(1u));
     vec = _e21;
     vec_target = _e21;
-    mat = mat4x3<f32>(vec3<f32>(1.0, 0.0, 0.0), vec3<f32>(0.0, 1.0, 0.0), vec3<f32>(0.0, 0.0, 1.0), vec3<f32>(0.0, 0.0, 0.0));
     let _e32 = mat;
     let _e34 = vec3(1.0);
     mat = (_e32 + mat4x3<f32>(_e34, _e34, _e34, _e34));
diff --git a/tests/out/wgsl/sampler-functions-frag.wgsl b/tests/out/wgsl/sampler-functions-frag.wgsl
index 7b2b01772f..39e51e93de 100644
--- a/tests/out/wgsl/sampler-functions-frag.wgsl
+++ b/tests/out/wgsl/sampler-functions-frag.wgsl
@@ -1,9 +1,8 @@
 fn CalcShadowPCF1_(T_P_t_TextureDepth: texture_depth_2d, S_P_t_TextureDepth: sampler_comparison, t_ProjCoord: vec3<f32>) -> f32 {
     var t_ProjCoord_1: vec3<f32>;
-    var t_Res: f32;
+    var t_Res: f32 = 0.0;
 
     t_ProjCoord_1 = t_ProjCoord;
-    t_Res = 0.0;
     let _e6 = t_Res;
     let _e7 = t_ProjCoord_1;
     let _e9 = t_ProjCoord_1;