encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-18 01:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint/transform/std140: Correctly handle nested / bare matrices

Browse Source 
Fixed tint:1673
Fixed tint:1674

Change-Id: Ifa5d2a69131cc1e4679d4d43143f857c7ba46dbd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102640
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton
2022-09-17 01:47:59 +00:00
committed by Dawn LUCI CQ
parent 84b43d61fa
commit 90b29e500a
67 changed files with 3714 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/tint/buffer/uniform/std140/struct/mat3x2/dynamic_index_via_ptr.wgsl.expected.glsl
View File

@@ -52,7 +52,7 @@ Inner conv_Inner(Inner_std140 val) {
return Inner(mat3x2(val.m_0, val.m_1, val.m_2), val.pad, val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9);
}
Inner[4] conv_arr_4_Inner(Inner_std140 val[4]) {
Inner[4] conv_arr4_Inner(Inner_std140 val[4]) {
Inner arr[4] = Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -63,10 +63,10 @@ Inner[4] conv_arr_4_Inner(Inner_std140 val[4]) {
}
Outer conv_Outer(Outer_std140 val) {
return Outer(conv_arr_4_Inner(val.a));
return Outer(conv_arr4_Inner(val.a));
}
Outer[4] conv_arr_4_Outer(Outer_std140 val[4]) {
Outer[4] conv_arr4_Outer(Outer_std140 val[4]) {
Outer arr[4] = Outer[4](Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -125,18 +125,18 @@ float load_a_inner_p0_a_p1_m_p2_p3(uint p0, uint p1, uint p2, uint p3) {
}
void f() {
Outer p_a[4] = conv_arr_4_Outer(a.inner);
Outer p_a[4] = conv_arr4_Outer(a.inner);
int tint_symbol = i();
Outer p_a_i = conv_Outer(a.inner[tint_symbol]);
Inner p_a_i_a[4] = conv_arr_4_Inner(a.inner[tint_symbol].a);
Inner p_a_i_a[4] = conv_arr4_Inner(a.inner[tint_symbol].a);
int tint_symbol_1 = i();
Inner p_a_i_a_i = conv_Inner(a.inner[tint_symbol].a[tint_symbol_1]);
mat3x2 p_a_i_a_i_m = load_a_inner_p0_a_p1_m(uint(tint_symbol), uint(tint_symbol_1));
int tint_symbol_2 = i();
vec2 p_a_i_a_i_m_i = load_a_inner_p0_a_p1_m_p2(uint(tint_symbol), uint(tint_symbol_1), uint(tint_symbol_2));
Outer l_a[4] = conv_arr_4_Outer(a.inner);
Outer l_a[4] = conv_arr4_Outer(a.inner);
Outer l_a_i = conv_Outer(a.inner[tint_symbol]);
Inner l_a_i_a[4] = conv_arr_4_Inner(a.inner[tint_symbol].a);
Inner l_a_i_a[4] = conv_arr4_Inner(a.inner[tint_symbol].a);
Inner l_a_i_a_i = conv_Inner(a.inner[tint_symbol].a[tint_symbol_1]);
mat3x2 l_a_i_a_i_m = load_a_inner_p0_a_p1_m(uint(tint_symbol), uint(tint_symbol_1));
vec2 l_a_i_a_i_m_i = load_a_inner_p0_a_p1_m_p2(uint(tint_symbol), uint(tint_symbol_1), uint(tint_symbol_2));

14
test/tint/buffer/uniform/std140/struct/mat3x2/dynamic_index_via_ptr.wgsl.expected.spvasm
View File

@@ -22,7 +22,7 @@
OpMemberName %Inner 0 "m"
OpName %conv_Inner "conv_Inner"
OpName %val "val"
OpName %conv_arr_4_Inner "conv_arr_4_Inner"
OpName %conv_arr4_Inner "conv_arr4_Inner"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i_0 "i"
@@ -31,7 +31,7 @@
OpMemberName %Outer 0 "a"
OpName %conv_Outer "conv_Outer"
OpName %val_1 "val"
OpName %conv_arr_4_Outer "conv_arr_4_Outer"
OpName %conv_arr4_Outer "conv_arr4_Outer"
OpName %val_2 "val"
OpName %arr_0 "arr"
OpName %i_1 "i"
@@ -141,7 +141,7 @@
%33 = OpCompositeConstruct %Inner %32
OpReturnValue %33
OpFunctionEnd
%conv_arr_4_Inner = OpFunction %_arr_Inner_uint_4 None %34
%conv_arr4_Inner = OpFunction %_arr_Inner_uint_4 None %34
%val_0 = OpFunctionParameter %_arr_Inner_std140_uint_4
%38 = OpLabel
%arr = OpVariable %_ptr_Function__arr_Inner_uint_4 Function %41
@@ -182,11 +182,11 @@
%val_1 = OpFunctionParameter %Outer_std140
%74 = OpLabel
%76 = OpCompositeExtract %_arr_Inner_std140_uint_4 %val_1 0
%75 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr_4_Inner %76
%75 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr4_Inner %76
%77 = OpCompositeConstruct %Outer %75
OpReturnValue %77
OpFunctionEnd
%conv_arr_4_Outer = OpFunction %_arr_Outer_uint_4 None %78
%conv_arr4_Outer = OpFunction %_arr_Outer_uint_4 None %78
%val_2 = OpFunctionParameter %_arr_Outer_std140_uint_4
%82 = OpLabel
%arr_0 = OpVariable %_ptr_Function__arr_Outer_uint_4 Function %85
@@ -293,13 +293,13 @@
%175 = OpFunctionCall %int %i
%178 = OpAccessChain %_ptr_Uniform__arr_Outer_std140_uint_4 %a %uint_0
%179 = OpLoad %_arr_Outer_std140_uint_4 %178
%176 = OpFunctionCall %_arr_Outer_uint_4 %conv_arr_4_Outer %179
%176 = OpFunctionCall %_arr_Outer_uint_4 %conv_arr4_Outer %179
%182 = OpAccessChain %_ptr_Uniform_Outer_std140 %a %uint_0 %173
%183 = OpLoad %Outer_std140 %182
%180 = OpFunctionCall %Outer %conv_Outer %183
%186 = OpAccessChain %_ptr_Uniform__arr_Inner_std140_uint_4 %a %uint_0 %173 %uint_0
%187 = OpLoad %_arr_Inner_std140_uint_4 %186
%184 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr_4_Inner %187
%184 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr4_Inner %187
%189 = OpAccessChain %_ptr_Uniform_Inner_std140 %a %uint_0 %173 %uint_0 %174
%190 = OpLoad %Inner_std140 %189
%188 = OpFunctionCall %Inner %conv_Inner %190

14
test/tint/buffer/uniform/std140/struct/mat3x2/static_index_via_ptr.wgsl.expected.glsl
View File

@@ -46,7 +46,7 @@ Inner conv_Inner(Inner_std140 val) {
return Inner(mat3x2(val.m_0, val.m_1, val.m_2), val.pad, val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9);
}
Inner[4] conv_arr_4_Inner(Inner_std140 val[4]) {
Inner[4] conv_arr4_Inner(Inner_std140 val[4]) {
Inner arr[4] = Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -57,10 +57,10 @@ Inner[4] conv_arr_4_Inner(Inner_std140 val[4]) {
}
Outer conv_Outer(Outer_std140 val) {
return Outer(conv_arr_4_Inner(val.a));
return Outer(conv_arr4_Inner(val.a));
}
Outer[4] conv_arr_4_Outer(Outer_std140 val[4]) {
Outer[4] conv_arr4_Outer(Outer_std140 val[4]) {
Outer arr[4] = Outer[4](Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))), Outer(Inner[4](Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u), Inner(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -75,15 +75,15 @@ mat3x2 load_a_inner_3_a_2_m() {
}
void f() {
Outer p_a[4] = conv_arr_4_Outer(a.inner);
Outer p_a[4] = conv_arr4_Outer(a.inner);
Outer p_a_3 = conv_Outer(a.inner[3u]);
Inner p_a_3_a[4] = conv_arr_4_Inner(a.inner[3u].a);
Inner p_a_3_a[4] = conv_arr4_Inner(a.inner[3u].a);
Inner p_a_3_a_2 = conv_Inner(a.inner[3u].a[2u]);
mat3x2 p_a_3_a_2_m = load_a_inner_3_a_2_m();
vec2 p_a_3_a_2_m_1 = a.inner[3u].a[2u].m_1;
Outer l_a[4] = conv_arr_4_Outer(a.inner);
Outer l_a[4] = conv_arr4_Outer(a.inner);
Outer l_a_3 = conv_Outer(a.inner[3u]);
Inner l_a_3_a[4] = conv_arr_4_Inner(a.inner[3u].a);
Inner l_a_3_a[4] = conv_arr4_Inner(a.inner[3u].a);
Inner l_a_3_a_2 = conv_Inner(a.inner[3u].a[2u]);
mat3x2 l_a_3_a_2_m = load_a_inner_3_a_2_m();
vec2 l_a_3_a_2_m_1 = a.inner[3u].a[2u].m_1;

14
test/tint/buffer/uniform/std140/struct/mat3x2/static_index_via_ptr.wgsl.expected.spvasm
View File

@@ -20,7 +20,7 @@
OpMemberName %Inner 0 "m"
OpName %conv_Inner "conv_Inner"
OpName %val "val"
OpName %conv_arr_4_Inner "conv_arr_4_Inner"
OpName %conv_arr4_Inner "conv_arr4_Inner"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i "i"
@@ -29,7 +29,7 @@
OpMemberName %Outer 0 "a"
OpName %conv_Outer "conv_Outer"
OpName %val_1 "val"
OpName %conv_arr_4_Outer "conv_arr_4_Outer"
OpName %conv_arr4_Outer "conv_arr4_Outer"
OpName %val_2 "val"
OpName %arr_0 "arr"
OpName %i_0 "i"
@@ -111,7 +111,7 @@
%22 = OpCompositeConstruct %Inner %21
OpReturnValue %22
OpFunctionEnd
%conv_arr_4_Inner = OpFunction %_arr_Inner_uint_4 None %23
%conv_arr4_Inner = OpFunction %_arr_Inner_uint_4 None %23
%val_0 = OpFunctionParameter %_arr_Inner_std140_uint_4
%27 = OpLabel
%arr = OpVariable %_ptr_Function__arr_Inner_uint_4 Function %30
@@ -152,11 +152,11 @@
%val_1 = OpFunctionParameter %Outer_std140
%63 = OpLabel
%65 = OpCompositeExtract %_arr_Inner_std140_uint_4 %val_1 0
%64 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr_4_Inner %65
%64 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr4_Inner %65
%66 = OpCompositeConstruct %Outer %64
OpReturnValue %66
OpFunctionEnd
%conv_arr_4_Outer = OpFunction %_arr_Outer_uint_4 None %67
%conv_arr4_Outer = OpFunction %_arr_Outer_uint_4 None %67
%val_2 = OpFunctionParameter %_arr_Outer_std140_uint_4
%71 = OpLabel
%arr_0 = OpVariable %_ptr_Function__arr_Outer_uint_4 Function %74
@@ -209,13 +209,13 @@
%122 = OpLabel
%125 = OpAccessChain %_ptr_Uniform__arr_Outer_std140_uint_4 %a %uint_0
%126 = OpLoad %_arr_Outer_std140_uint_4 %125
%123 = OpFunctionCall %_arr_Outer_uint_4 %conv_arr_4_Outer %126
%123 = OpFunctionCall %_arr_Outer_uint_4 %conv_arr4_Outer %126
%129 = OpAccessChain %_ptr_Uniform_Outer_std140 %a %uint_0 %uint_3
%130 = OpLoad %Outer_std140 %129
%127 = OpFunctionCall %Outer %conv_Outer %130
%133 = OpAccessChain %_ptr_Uniform__arr_Inner_std140_uint_4 %a %uint_0 %uint_3 %uint_0
%134 = OpLoad %_arr_Inner_std140_uint_4 %133
%131 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr_4_Inner %134
%131 = OpFunctionCall %_arr_Inner_uint_4 %conv_arr4_Inner %134
%136 = OpAccessChain %_ptr_Uniform_Inner_std140 %a %uint_0 %uint_3 %uint_0 %uint_2
%137 = OpLoad %Inner_std140 %136
%135 = OpFunctionCall %Inner %conv_Inner %137

4
test/tint/buffer/uniform/std140/struct/mat3x2/to_fn.wgsl.expected.glsl
View File

@@ -61,7 +61,7 @@ S conv_S(S_std140 val) {
return S(val.before, val.pad, mat3x2(val.m_0, val.m_1, val.m_2), val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9, val.pad_10, val.after, val.pad_11);
}
S[4] conv_arr_4_S(S_std140 val[4]) {
S[4] conv_arr4_S(S_std140 val[4]) {
S arr[4] = S[4](S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -76,7 +76,7 @@ mat3x2 load_u_inner_2_m() {
}
void f() {
a(conv_arr_4_S(u.inner));
a(conv_arr4_S(u.inner));
b(conv_S(u.inner[2u]));
c(load_u_inner_2_m());
d(u.inner[0u].m_1.yx);

6
test/tint/buffer/uniform/std140/struct/mat3x2/to_fn.wgsl.expected.spvasm
View File

@@ -32,7 +32,7 @@
OpName %f_1 "f_1"
OpName %conv_S "conv_S"
OpName %val "val"
OpName %conv_arr_4_S "conv_arr_4_S"
OpName %conv_arr4_S "conv_arr4_S"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i "i"
@@ -132,7 +132,7 @@
%45 = OpCompositeConstruct %S %39 %43 %44
OpReturnValue %45
OpFunctionEnd
%conv_arr_4_S = OpFunction %_arr_S_uint_4 None %46
%conv_arr4_S = OpFunction %_arr_S_uint_4 None %46
%val_0 = OpFunctionParameter %_arr_S_std140_uint_4
%49 = OpLabel
%arr = OpVariable %_ptr_Function__arr_S_uint_4 Function %52
@@ -185,7 +185,7 @@
%103 = OpLabel
%107 = OpAccessChain %_ptr_Uniform__arr_S_std140_uint_4 %u %uint_0
%108 = OpLoad %_arr_S_std140_uint_4 %107
%105 = OpFunctionCall %_arr_S_uint_4 %conv_arr_4_S %108
%105 = OpFunctionCall %_arr_S_uint_4 %conv_arr4_S %108
%104 = OpFunctionCall %void %a %105
%111 = OpAccessChain %_ptr_Uniform_S_std140 %u %uint_0 %uint_2
%112 = OpLoad %S_std140 %111

4
test/tint/buffer/uniform/std140/struct/mat3x2/to_private.wgsl.expected.glsl
View File

@@ -47,7 +47,7 @@ S conv_S(S_std140 val) {
return S(val.before, val.pad, mat3x2(val.m_0, val.m_1, val.m_2), val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9, val.pad_10, val.after, val.pad_11);
}
S[4] conv_arr_4_S(S_std140 val[4]) {
S[4] conv_arr4_S(S_std140 val[4]) {
S arr[4] = S[4](S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -62,7 +62,7 @@ mat3x2 load_u_inner_2_m() {
}
void f() {
p = conv_arr_4_S(u.inner);
p = conv_arr4_S(u.inner);
p[1] = conv_S(u.inner[2u]);
p[3].m = load_u_inner_2_m();
p[1].m[0] = u.inner[0u].m_1.yx;

6
test/tint/buffer/uniform/std140/struct/mat3x2/to_private.wgsl.expected.spvasm
View File

@@ -23,7 +23,7 @@
OpName %p "p"
OpName %conv_S "conv_S"
OpName %val "val"
OpName %conv_arr_4_S "conv_arr_4_S"
OpName %conv_arr4_S "conv_arr4_S"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i "i"
@@ -101,7 +101,7 @@
%27 = OpCompositeConstruct %S %21 %25 %26
OpReturnValue %27
OpFunctionEnd
%conv_arr_4_S = OpFunction %_arr_S_uint_4 None %28
%conv_arr4_S = OpFunction %_arr_S_uint_4 None %28
%val_0 = OpFunctionParameter %_arr_S_std140_uint_4
%31 = OpLabel
%arr = OpVariable %_ptr_Function__arr_S_uint_4 Function %16
@@ -154,7 +154,7 @@
%85 = OpLabel
%88 = OpAccessChain %_ptr_Uniform__arr_S_std140_uint_4 %u %uint_0
%89 = OpLoad %_arr_S_std140_uint_4 %88
%86 = OpFunctionCall %_arr_S_uint_4 %conv_arr_4_S %89
%86 = OpFunctionCall %_arr_S_uint_4 %conv_arr4_S %89
OpStore %p %86
%92 = OpAccessChain %_ptr_Private_S %p %int_1
%94 = OpAccessChain %_ptr_Uniform_S_std140 %u %uint_0 %uint_2

4
test/tint/buffer/uniform/std140/struct/mat3x2/to_storage.wgsl.expected.glsl
View File

@@ -50,7 +50,7 @@ S conv_S(S_std140 val) {
return S(val.before, val.pad, mat3x2(val.m_0, val.m_1, val.m_2), val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9, val.pad_10, val.after, val.pad_11);
}
S[4] conv_arr_4_S(S_std140 val[4]) {
S[4] conv_arr4_S(S_std140 val[4]) {
S arr[4] = S[4](S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -65,7 +65,7 @@ mat3x2 load_u_inner_2_m() {
}
void f() {
s.inner = conv_arr_4_S(u.inner);
s.inner = conv_arr4_S(u.inner);
s.inner[1] = conv_S(u.inner[2u]);
s.inner[3].m = load_u_inner_2_m();
s.inner[1].m[0] = u.inner[0u].m_1.yx;

6
test/tint/buffer/uniform/std140/struct/mat3x2/to_storage.wgsl.expected.spvasm
View File

@@ -25,7 +25,7 @@
OpName %s "s"
OpName %conv_S "conv_S"
OpName %val "val"
OpName %conv_arr_4_S "conv_arr_4_S"
OpName %conv_arr4_S "conv_arr4_S"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i "i"
@@ -109,7 +109,7 @@
%27 = OpCompositeConstruct %S %21 %25 %26
OpReturnValue %27
OpFunctionEnd
%conv_arr_4_S = OpFunction %_arr_S_uint_4 None %28
%conv_arr4_S = OpFunction %_arr_S_uint_4 None %28
%val_0 = OpFunctionParameter %_arr_S_std140_uint_4
%31 = OpLabel
%arr = OpVariable %_ptr_Function__arr_S_uint_4 Function %34
@@ -163,7 +163,7 @@
%88 = OpAccessChain %_ptr_StorageBuffer__arr_S_uint_4 %s %uint_0
%91 = OpAccessChain %_ptr_Uniform__arr_S_std140_uint_4 %u %uint_0
%92 = OpLoad %_arr_S_std140_uint_4 %91
%89 = OpFunctionCall %_arr_S_uint_4 %conv_arr_4_S %92
%89 = OpFunctionCall %_arr_S_uint_4 %conv_arr4_S %92
OpStore %88 %89
%95 = OpAccessChain %_ptr_StorageBuffer_S %s %uint_0 %int_1
%97 = OpAccessChain %_ptr_Uniform_S_std140 %u %uint_0 %uint_2

4
test/tint/buffer/uniform/std140/struct/mat3x2/to_workgroup.wgsl.expected.glsl
View File

@@ -47,7 +47,7 @@ S conv_S(S_std140 val) {
return S(val.before, val.pad, mat3x2(val.m_0, val.m_1, val.m_2), val.pad_1, val.pad_2, val.pad_3, val.pad_4, val.pad_5, val.pad_6, val.pad_7, val.pad_8, val.pad_9, val.pad_10, val.after, val.pad_11);
}
S[4] conv_arr_4_S(S_std140 val[4]) {
S[4] conv_arr4_S(S_std140 val[4]) {
S arr[4] = S[4](S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u), S(0, 0u, mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0u));
{
for(uint i = 0u; (i < 4u); i = (i + 1u)) {
@@ -70,7 +70,7 @@ void f(uint local_invocation_index) {
}
}
barrier();
w = conv_arr_4_S(u.inner);
w = conv_arr4_S(u.inner);
w[1] = conv_S(u.inner[2u]);
w[3].m = load_u_inner_2_m();
w[1].m[0] = u.inner[0u].m_1.yx;

6
test/tint/buffer/uniform/std140/struct/mat3x2/to_workgroup.wgsl.expected.spvasm
View File

@@ -24,7 +24,7 @@
OpName %w "w"
OpName %conv_S "conv_S"
OpName %val "val"
OpName %conv_arr_4_S "conv_arr_4_S"
OpName %conv_arr4_S "conv_arr4_S"
OpName %val_0 "val"
OpName %arr "arr"
OpName %i "i"
@@ -111,7 +111,7 @@
%28 = OpCompositeConstruct %S %22 %26 %27
OpReturnValue %28
OpFunctionEnd
%conv_arr_4_S = OpFunction %_arr_S_uint_4 None %29
%conv_arr4_S = OpFunction %_arr_S_uint_4 None %29
%val_0 = OpFunctionParameter %_arr_S_std140_uint_4
%32 = OpLabel
%arr = OpVariable %_ptr_Function__arr_S_uint_4 Function %35
@@ -191,7 +191,7 @@
OpControlBarrier %uint_2 %uint_2 %uint_264
%109 = OpAccessChain %_ptr_Uniform__arr_S_std140_uint_4 %u %uint_0
%110 = OpLoad %_arr_S_std140_uint_4 %109
%107 = OpFunctionCall %_arr_S_uint_4 %conv_arr_4_S %110
%107 = OpFunctionCall %_arr_S_uint_4 %conv_arr4_S %110
OpStore %w %107
%112 = OpAccessChain %_ptr_Workgroup_S %w %int_1
%114 = OpAccessChain %_ptr_Uniform_S_std140 %u %uint_0 %uint_2