Update expectations

Signed-off-by: sagudev <[email protected]>

Author: sagudev

Diff for: naga/tests/out/glsl/image.texture_sample.Fragment.glsl

@@ -11,73 +11,73 @@ layout(location = 0) out vec4 _fs2p_location0;
 
 void main() {
     vec4 a = vec4(0.0);
-    vec2 tc = vec2(0.5);
-    vec3 tc3_ = vec3(0.5);
-    ivec2 offset = ivec2(3, 1);
+    vec2 _e1 = vec2(0.5);
+    vec3 _e3 = vec3(0.5);
+    ivec2 _e6 = ivec2(3, 1);
     vec4 _e11 = texture(_group_0_binding_0_fs, 0.5);
     vec4 _e12 = a;
     a = (_e12 + _e11);
-    vec4 _e16 = texture(_group_0_binding_1_fs, vec2(tc));
+    vec4 _e16 = texture(_group_0_binding_1_fs, vec2(_e1));
     vec4 _e17 = a;
     a = (_e17 + _e16);
-    vec4 _e24 = textureOffset(_group_0_binding_1_fs, vec2(tc), ivec2(3, 1));
+    vec4 _e24 = textureOffset(_group_0_binding_1_fs, vec2(_e1), ivec2(3, 1));
     vec4 _e25 = a;
     a = (_e25 + _e24);
-    vec4 _e29 = textureLod(_group_0_binding_1_fs, vec2(tc), 2.3);
+    vec4 _e29 = textureLod(_group_0_binding_1_fs, vec2(_e1), 2.3);
     vec4 _e30 = a;
     a = (_e30 + _e29);
-    vec4 _e34 = textureLodOffset(_group_0_binding_1_fs, vec2(tc), 2.3, ivec2(3, 1));
+    vec4 _e34 = textureLodOffset(_group_0_binding_1_fs, vec2(_e1), 2.3, ivec2(3, 1));
     vec4 _e35 = a;
     a = (_e35 + _e34);
-    vec4 _e40 = textureOffset(_group_0_binding_1_fs, vec2(tc), ivec2(3, 1), 2.0);
+    vec4 _e40 = textureOffset(_group_0_binding_1_fs, vec2(_e1), ivec2(3, 1), 2.0);
     vec4 _e41 = a;
     a = (_e41 + _e40);
-    vec4 _e46 = texture(_group_0_binding_4_fs, vec3(tc, 0u));
+    vec4 _e46 = texture(_group_0_binding_4_fs, vec3(_e1, 0u));
     vec4 _e47 = a;
     a = (_e47 + _e46);
-    vec4 _e52 = textureOffset(_group_0_binding_4_fs, vec3(tc, 0u), ivec2(3, 1));
+    vec4 _e52 = textureOffset(_group_0_binding_4_fs, vec3(_e1, 0u), ivec2(3, 1));
     vec4 _e53 = a;
     a = (_e53 + _e52);
-    vec4 _e58 = textureLod(_group_0_binding_4_fs, vec3(tc, 0u), 2.3);
+    vec4 _e58 = textureLod(_group_0_binding_4_fs, vec3(_e1, 0u), 2.3);
     vec4 _e59 = a;
     a = (_e59 + _e58);
-    vec4 _e64 = textureLodOffset(_group_0_binding_4_fs, vec3(tc, 0u), 2.3, ivec2(3, 1));
+    vec4 _e64 = textureLodOffset(_group_0_binding_4_fs, vec3(_e1, 0u), 2.3, ivec2(3, 1));
     vec4 _e65 = a;
     a = (_e65 + _e64);
-    vec4 _e71 = textureOffset(_group_0_binding_4_fs, vec3(tc, 0u), ivec2(3, 1), 2.0);
+    vec4 _e71 = textureOffset(_group_0_binding_4_fs, vec3(_e1, 0u), ivec2(3, 1), 2.0);
     vec4 _e72 = a;
     a = (_e72 + _e71);
-    vec4 _e77 = texture(_group_0_binding_4_fs, vec3(tc, 0));
+    vec4 _e77 = texture(_group_0_binding_4_fs, vec3(_e1, 0));
     vec4 _e78 = a;
     a = (_e78 + _e77);
-    vec4 _e83 = textureOffset(_group_0_binding_4_fs, vec3(tc, 0), ivec2(3, 1));
+    vec4 _e83 = textureOffset(_group_0_binding_4_fs, vec3(_e1, 0), ivec2(3, 1));
     vec4 _e84 = a;
     a = (_e84 + _e83);
-    vec4 _e89 = textureLod(_group_0_binding_4_fs, vec3(tc, 0), 2.3);
+    vec4 _e89 = textureLod(_group_0_binding_4_fs, vec3(_e1, 0), 2.3);
     vec4 _e90 = a;
     a = (_e90 + _e89);
-    vec4 _e95 = textureLodOffset(_group_0_binding_4_fs, vec3(tc, 0), 2.3, ivec2(3, 1));
+    vec4 _e95 = textureLodOffset(_group_0_binding_4_fs, vec3(_e1, 0), 2.3, ivec2(3, 1));
     vec4 _e96 = a;
     a = (_e96 + _e95);
-    vec4 _e102 = textureOffset(_group_0_binding_4_fs, vec3(tc, 0), ivec2(3, 1), 2.0);
+    vec4 _e102 = textureOffset(_group_0_binding_4_fs, vec3(_e1, 0), ivec2(3, 1), 2.0);
     vec4 _e103 = a;
     a = (_e103 + _e102);
-    vec4 _e108 = texture(_group_0_binding_6_fs, vec4(tc3_, 0u));
+    vec4 _e108 = texture(_group_0_binding_6_fs, vec4(_e3, 0u));
     vec4 _e109 = a;
     a = (_e109 + _e108);
-    vec4 _e114 = textureLod(_group_0_binding_6_fs, vec4(tc3_, 0u), 2.3);
+    vec4 _e114 = textureLod(_group_0_binding_6_fs, vec4(_e3, 0u), 2.3);
     vec4 _e115 = a;
     a = (_e115 + _e114);
-    vec4 _e121 = texture(_group_0_binding_6_fs, vec4(tc3_, 0u), 2.0);
+    vec4 _e121 = texture(_group_0_binding_6_fs, vec4(_e3, 0u), 2.0);
     vec4 _e122 = a;
     a = (_e122 + _e121);
-    vec4 _e127 = texture(_group_0_binding_6_fs, vec4(tc3_, 0));
+    vec4 _e127 = texture(_group_0_binding_6_fs, vec4(_e3, 0));
     vec4 _e128 = a;
     a = (_e128 + _e127);
-    vec4 _e133 = textureLod(_group_0_binding_6_fs, vec4(tc3_, 0), 2.3);
+    vec4 _e133 = textureLod(_group_0_binding_6_fs, vec4(_e3, 0), 2.3);
     vec4 _e134 = a;
     a = (_e134 + _e133);
-    vec4 _e140 = texture(_group_0_binding_6_fs, vec4(tc3_, 0), 2.0);
+    vec4 _e140 = texture(_group_0_binding_6_fs, vec4(_e3, 0), 2.0);
     vec4 _e141 = a;
     a = (_e141 + _e140);
     vec4 _e143 = a;

Diff for: naga/tests/out/hlsl/image.hlsl

@@ -258,73 +258,73 @@ float4 texture_sample() : SV_Target0
 {
     float4 a = (float4)0;
 
-    float2 tc = (0.5).xx;
-    float3 tc3_ = (0.5).xxx;
-    int2 offset = int2(int(3), int(1));
+    float2 _e1 = (0.5).xx;
+    float3 _e3 = (0.5).xxx;
+    int2 _e6 = int2(int(3), int(1));
     float4 _e11 = image_1d.Sample(sampler_reg, 0.5);
     float4 _e12 = a;
     a = (_e12 + _e11);
-    float4 _e16 = image_2d.Sample(sampler_reg, tc);
+    float4 _e16 = image_2d.Sample(sampler_reg, _e1);
     float4 _e17 = a;
     a = (_e17 + _e16);
-    float4 _e24 = image_2d.Sample(sampler_reg, tc, int2(int2(int(3), int(1))));
+    float4 _e24 = image_2d.Sample(sampler_reg, _e1, int2(int2(int(3), int(1))));
     float4 _e25 = a;
     a = (_e25 + _e24);
-    float4 _e29 = image_2d.SampleLevel(sampler_reg, tc, 2.3);
+    float4 _e29 = image_2d.SampleLevel(sampler_reg, _e1, 2.3);
     float4 _e30 = a;
     a = (_e30 + _e29);
-    float4 _e34 = image_2d.SampleLevel(sampler_reg, tc, 2.3, int2(int2(int(3), int(1))));
+    float4 _e34 = image_2d.SampleLevel(sampler_reg, _e1, 2.3, int2(int2(int(3), int(1))));
     float4 _e35 = a;
     a = (_e35 + _e34);
-    float4 _e40 = image_2d.SampleBias(sampler_reg, tc, 2.0, int2(int2(int(3), int(1))));
+    float4 _e40 = image_2d.SampleBias(sampler_reg, _e1, 2.0, int2(int2(int(3), int(1))));
     float4 _e41 = a;
     a = (_e41 + _e40);
-    float4 _e46 = image_2d_array.Sample(sampler_reg, float3(tc, 0u));
+    float4 _e46 = image_2d_array.Sample(sampler_reg, float3(_e1, 0u));
     float4 _e47 = a;
     a = (_e47 + _e46);
-    float4 _e52 = image_2d_array.Sample(sampler_reg, float3(tc, 0u), int2(int2(int(3), int(1))));
+    float4 _e52 = image_2d_array.Sample(sampler_reg, float3(_e1, 0u), int2(int2(int(3), int(1))));
     float4 _e53 = a;
     a = (_e53 + _e52);
-    float4 _e58 = image_2d_array.SampleLevel(sampler_reg, float3(tc, 0u), 2.3);
+    float4 _e58 = image_2d_array.SampleLevel(sampler_reg, float3(_e1, 0u), 2.3);
     float4 _e59 = a;
     a = (_e59 + _e58);
-    float4 _e64 = image_2d_array.SampleLevel(sampler_reg, float3(tc, 0u), 2.3, int2(int2(int(3), int(1))));
+    float4 _e64 = image_2d_array.SampleLevel(sampler_reg, float3(_e1, 0u), 2.3, int2(int2(int(3), int(1))));
     float4 _e65 = a;
     a = (_e65 + _e64);
-    float4 _e71 = image_2d_array.SampleBias(sampler_reg, float3(tc, 0u), 2.0, int2(int2(int(3), int(1))));
+    float4 _e71 = image_2d_array.SampleBias(sampler_reg, float3(_e1, 0u), 2.0, int2(int2(int(3), int(1))));
     float4 _e72 = a;
     a = (_e72 + _e71);
-    float4 _e77 = image_2d_array.Sample(sampler_reg, float3(tc, int(0)));
+    float4 _e77 = image_2d_array.Sample(sampler_reg, float3(_e1, int(0)));
     float4 _e78 = a;
     a = (_e78 + _e77);
-    float4 _e83 = image_2d_array.Sample(sampler_reg, float3(tc, int(0)), int2(int2(int(3), int(1))));
+    float4 _e83 = image_2d_array.Sample(sampler_reg, float3(_e1, int(0)), int2(int2(int(3), int(1))));
     float4 _e84 = a;
     a = (_e84 + _e83);
-    float4 _e89 = image_2d_array.SampleLevel(sampler_reg, float3(tc, int(0)), 2.3);
+    float4 _e89 = image_2d_array.SampleLevel(sampler_reg, float3(_e1, int(0)), 2.3);
     float4 _e90 = a;
     a = (_e90 + _e89);
-    float4 _e95 = image_2d_array.SampleLevel(sampler_reg, float3(tc, int(0)), 2.3, int2(int2(int(3), int(1))));
+    float4 _e95 = image_2d_array.SampleLevel(sampler_reg, float3(_e1, int(0)), 2.3, int2(int2(int(3), int(1))));
     float4 _e96 = a;
     a = (_e96 + _e95);
-    float4 _e102 = image_2d_array.SampleBias(sampler_reg, float3(tc, int(0)), 2.0, int2(int2(int(3), int(1))));
+    float4 _e102 = image_2d_array.SampleBias(sampler_reg, float3(_e1, int(0)), 2.0, int2(int2(int(3), int(1))));
     float4 _e103 = a;
     a = (_e103 + _e102);
-    float4 _e108 = image_cube_array.Sample(sampler_reg, float4(tc3_, 0u));
+    float4 _e108 = image_cube_array.Sample(sampler_reg, float4(_e3, 0u));
     float4 _e109 = a;
     a = (_e109 + _e108);
-    float4 _e114 = image_cube_array.SampleLevel(sampler_reg, float4(tc3_, 0u), 2.3);
+    float4 _e114 = image_cube_array.SampleLevel(sampler_reg, float4(_e3, 0u), 2.3);
     float4 _e115 = a;
     a = (_e115 + _e114);
-    float4 _e121 = image_cube_array.SampleBias(sampler_reg, float4(tc3_, 0u), 2.0);
+    float4 _e121 = image_cube_array.SampleBias(sampler_reg, float4(_e3, 0u), 2.0);
     float4 _e122 = a;
     a = (_e122 + _e121);
-    float4 _e127 = image_cube_array.Sample(sampler_reg, float4(tc3_, int(0)));
+    float4 _e127 = image_cube_array.Sample(sampler_reg, float4(_e3, int(0)));
     float4 _e128 = a;
     a = (_e128 + _e127);
-    float4 _e133 = image_cube_array.SampleLevel(sampler_reg, float4(tc3_, int(0)), 2.3);
+    float4 _e133 = image_cube_array.SampleLevel(sampler_reg, float4(_e3, int(0)), 2.3);
     float4 _e134 = a;
     a = (_e134 + _e133);
-    float4 _e140 = image_cube_array.SampleBias(sampler_reg, float4(tc3_, int(0)), 2.0);
+    float4 _e140 = image_cube_array.SampleBias(sampler_reg, float4(_e3, int(0)), 2.0);
     float4 _e141 = a;
     a = (_e141 + _e140);
     float4 _e143 = a;
@@ -335,30 +335,30 @@ float texture_sample_comparison() : SV_Target0
 {
     float a_1 = (float)0;
 
-    float2 tc_1 = (0.5).xx;
-    float3 tc3_1 = (0.5).xxx;
-    float _e8 = image_2d_depth.SampleCmp(sampler_cmp, tc_1, 0.5);
+    float2 tc = (0.5).xx;
+    float3 tc3_ = (0.5).xxx;
+    float _e8 = image_2d_depth.SampleCmp(sampler_cmp, tc, 0.5);
     float _e9 = a_1;
     a_1 = (_e9 + _e8);
-    float _e14 = image_2d_array_depth.SampleCmp(sampler_cmp, float3(tc_1, 0u), 0.5);
+    float _e14 = image_2d_array_depth.SampleCmp(sampler_cmp, float3(tc, 0u), 0.5);
     float _e15 = a_1;
     a_1 = (_e15 + _e14);
-    float _e20 = image_2d_array_depth.SampleCmp(sampler_cmp, float3(tc_1, int(0)), 0.5);
+    float _e20 = image_2d_array_depth.SampleCmp(sampler_cmp, float3(tc, int(0)), 0.5);
     float _e21 = a_1;
     a_1 = (_e21 + _e20);
-    float _e25 = image_cube_depth.SampleCmp(sampler_cmp, tc3_1, 0.5);
+    float _e25 = image_cube_depth.SampleCmp(sampler_cmp, tc3_, 0.5);
     float _e26 = a_1;
     a_1 = (_e26 + _e25);
-    float _e30 = image_2d_depth.SampleCmpLevelZero(sampler_cmp, tc_1, 0.5);
+    float _e30 = image_2d_depth.SampleCmpLevelZero(sampler_cmp, tc, 0.5);
     float _e31 = a_1;
     a_1 = (_e31 + _e30);
-    float _e36 = image_2d_array_depth.SampleCmpLevelZero(sampler_cmp, float3(tc_1, 0u), 0.5);
+    float _e36 = image_2d_array_depth.SampleCmpLevelZero(sampler_cmp, float3(tc, 0u), 0.5);
     float _e37 = a_1;
     a_1 = (_e37 + _e36);
-    float _e42 = image_2d_array_depth.SampleCmpLevelZero(sampler_cmp, float3(tc_1, int(0)), 0.5);
+    float _e42 = image_2d_array_depth.SampleCmpLevelZero(sampler_cmp, float3(tc, int(0)), 0.5);
     float _e43 = a_1;
     a_1 = (_e43 + _e42);
-    float _e47 = image_cube_depth.SampleCmpLevelZero(sampler_cmp, tc3_1, 0.5);
+    float _e47 = image_cube_depth.SampleCmpLevelZero(sampler_cmp, tc3_, 0.5);
     float _e48 = a_1;
     a_1 = (_e48 + _e47);
     float _e50 = a_1;
@@ -367,22 +367,22 @@ float texture_sample_comparison() : SV_Target0
 
 float4 gather() : SV_Target0
 {
-    float2 tc_2 = (0.5).xx;
-    float4 s2d = image_2d.GatherGreen(sampler_reg, tc_2);
-    float4 s2d_offset = image_2d.GatherAlpha(sampler_reg, tc_2, int2(int2(int(3), int(1))));
-    float4 s2d_depth = image_2d_depth.GatherCmp(sampler_cmp, tc_2, 0.5);
-    float4 s2d_depth_offset = image_2d_depth.GatherCmp(sampler_cmp, tc_2, 0.5, int2(int2(int(3), int(1))));
-    uint4 u = image_2d_u32_.Gather(sampler_reg, tc_2);
-    int4 i = image_2d_i32_.Gather(sampler_reg, tc_2);
+    float2 tc_1 = (0.5).xx;
+    float4 s2d = image_2d.GatherGreen(sampler_reg, tc_1);
+    float4 s2d_offset = image_2d.GatherAlpha(sampler_reg, tc_1, int2(int2(int(3), int(1))));
+    float4 s2d_depth = image_2d_depth.GatherCmp(sampler_cmp, tc_1, 0.5);
+    float4 s2d_depth_offset = image_2d_depth.GatherCmp(sampler_cmp, tc_1, 0.5, int2(int2(int(3), int(1))));
+    uint4 u = image_2d_u32_.Gather(sampler_reg, tc_1);
+    int4 i = image_2d_i32_.Gather(sampler_reg, tc_1);
     float4 f = (float4(u) + float4(i));
     return ((((s2d + s2d_offset) + s2d_depth) + s2d_depth_offset) + f);
 }
 
 float4 depth_no_comparison() : SV_Target0
 {
-    float2 tc_3 = (0.5).xx;
-    float s2d_1 = image_2d_depth.Sample(sampler_reg, tc_3);
-    float4 s2d_gather = image_2d_depth.Gather(sampler_reg, tc_3);
-    float s2d_level = image_2d_depth.SampleLevel(sampler_reg, tc_3, int(1));
+    float2 tc_2 = (0.5).xx;
+    float s2d_1 = image_2d_depth.Sample(sampler_reg, tc_2);
+    float4 s2d_gather = image_2d_depth.Gather(sampler_reg, tc_2);
+    float s2d_level = image_2d_depth.SampleLevel(sampler_reg, tc_2, int(1));
     return (((s2d_1).xxxx + s2d_gather) + (s2d_level).xxxx);
 }

Diff for: naga/tests/out/ir/local-const.compact.ron

@@ -58,22 +58,8 @@
             arguments: [],
             result: None,
             local_variables: [],
-            expressions: [
-                Literal(I32(4)),
-                Literal(U32(4)),
-                Literal(F32(4.0)),
-                Constant(0),
-                Constant(1),
-                Constant(2),
-            ],
-            named_expressions: {
-                0: "b",
-                1: "c",
-                2: "d",
-                3: "bg",
-                4: "cg",
-                5: "dg",
-            },
+            expressions: [],
+            named_expressions: {},
             body: [
                 Emit((
                     start: 0,

Diff for: naga/tests/out/ir/local-const.ron

@@ -58,22 +58,8 @@
             arguments: [],
             result: None,
             local_variables: [],
-            expressions: [
-                Literal(I32(4)),
-                Literal(U32(4)),
-                Literal(F32(4.0)),
-                Constant(0),
-                Constant(1),
-                Constant(2),
-            ],
-            named_expressions: {
-                0: "b",
-                1: "c",
-                2: "d",
-                3: "bg",
-                4: "cg",
-                5: "dg",
-            },
+            expressions: [],
+            named_expressions: {},
             body: [
                 Emit((
                     start: 0,