mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-10 05:57:51 +00:00
transform/shader_io: Generate a wrapper function
This is a major reworking of this transform. The old transform code was getting unwieldy, with part of the complication coming from the handling of multiple return statements. By generating a wrapper function instead, we can avoid a lot of this complexity. The original entry point function is stripped of all shader IO attributes (as well as `stage` and `workgroup_size`), but the body is left unmodified. A new entry point wrapper function is introduced which calls the original function, packing/unpacking the shader inputs as necessary, and propagates the result to the corresponding shader outputs. The new code has been refactored to use a state object with the different parts of the transform split into separate functions, which makes it much more manageable. Fixed: tint:1076 Bug: tint:920 Change-Id: I3490a0ea7a3509a4e198ce730e476516649d8d96 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60521 Auto-Submit: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: James Price <jrprice@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price
committed by
Tint LUCI CQ
Tint LUCI CQ
parent
3e92e9f8ba
commit
a5d73ce965
@@ -12,11 +12,11 @@ static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
|
||||
void main_1() {
|
||||
int index = 0;
|
||||
const struct_base tint_symbol_2 = {1, 1, 1};
|
||||
const struct_base tint_symbol_3 = {1, 1, 1};
|
||||
const struct_base tint_symbol_4 = {1, 1, 1};
|
||||
const struct_base tint_symbol_5 = {1, 1, 1};
|
||||
const struct_base tint_symbol_6[3] = {tint_symbol_3, tint_symbol_4, tint_symbol_5};
|
||||
struct_array = tint_symbol_6;
|
||||
const struct_base tint_symbol_5[3] = {tint_symbol_2, tint_symbol_3, tint_symbol_4};
|
||||
struct_array = tint_symbol_5;
|
||||
index = 1;
|
||||
struct_array[1].rightIndex = 1;
|
||||
const int x_39 = struct_array[1].leftIndex;
|
||||
@@ -45,9 +45,15 @@ struct tint_symbol {
|
||||
float4 x_GLF_color_1 : SV_Target0;
|
||||
};
|
||||
|
||||
tint_symbol main() {
|
||||
main_out main_inner() {
|
||||
main_1();
|
||||
const main_out tint_symbol_1 = {x_GLF_color};
|
||||
const tint_symbol tint_symbol_7 = {tint_symbol_1.x_GLF_color_1};
|
||||
return tint_symbol_7;
|
||||
const main_out tint_symbol_6 = {x_GLF_color};
|
||||
return tint_symbol_6;
|
||||
}
|
||||
|
||||
tint_symbol main() {
|
||||
const main_out inner_result = main_inner();
|
||||
tint_symbol wrapper_result = (tint_symbol)0;
|
||||
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
|
||||
return wrapper_result;
|
||||
}
|
||||
|
||||
@@ -19,40 +19,46 @@ struct tint_symbol_1 {
|
||||
float4 x_GLF_color_1 [[color(0)]];
|
||||
};
|
||||
|
||||
void main_1(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_8, thread float4* const tint_symbol_9) {
|
||||
void main_1(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_7, thread float4* const tint_symbol_8) {
|
||||
int index = 0;
|
||||
struct_base const tint_symbol_2 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_3 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_4 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_5 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
tint_array_wrapper const tint_symbol_6 = {.arr={tint_symbol_3, tint_symbol_4, tint_symbol_5}};
|
||||
*(tint_symbol_8) = tint_symbol_6;
|
||||
tint_array_wrapper const tint_symbol_5 = {.arr={tint_symbol_2, tint_symbol_3, tint_symbol_4}};
|
||||
*(tint_symbol_7) = tint_symbol_5;
|
||||
index = 1;
|
||||
(*(tint_symbol_8)).arr[1].rightIndex = 1;
|
||||
int const x_39 = (*(tint_symbol_8)).arr[1].leftIndex;
|
||||
(*(tint_symbol_7)).arr[1].rightIndex = 1;
|
||||
int const x_39 = (*(tint_symbol_7)).arr[1].leftIndex;
|
||||
if ((x_39 == 1)) {
|
||||
float const x_45 = x_8.injectionSwitch.x;
|
||||
int const x_48 = (*(tint_symbol_8)).arr[int(x_45)].rightIndex;
|
||||
int const x_48 = (*(tint_symbol_7)).arr[int(x_45)].rightIndex;
|
||||
index = x_48;
|
||||
} else {
|
||||
float const x_50 = x_8.injectionSwitch.y;
|
||||
int const x_53 = (*(tint_symbol_8)).arr[int(x_50)].leftIndex;
|
||||
int const x_53 = (*(tint_symbol_7)).arr[int(x_50)].leftIndex;
|
||||
index = x_53;
|
||||
}
|
||||
int const x_55 = (*(tint_symbol_8)).arr[1].leftIndex;
|
||||
int const x_55 = (*(tint_symbol_7)).arr[1].leftIndex;
|
||||
if ((x_55 == 1)) {
|
||||
*(tint_symbol_9) = float4(1.0f, 0.0f, 0.0f, 1.0f);
|
||||
*(tint_symbol_8) = float4(1.0f, 0.0f, 0.0f, 1.0f);
|
||||
} else {
|
||||
*(tint_symbol_9) = float4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
*(tint_symbol_8) = float4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
fragment tint_symbol_1 tint_symbol(constant buf0& x_8 [[buffer(0)]]) {
|
||||
thread tint_array_wrapper tint_symbol_10 = {};
|
||||
thread float4 tint_symbol_11 = 0.0f;
|
||||
main_1(x_8, &(tint_symbol_10), &(tint_symbol_11));
|
||||
main_out const tint_symbol_2 = {.x_GLF_color_1=tint_symbol_11};
|
||||
tint_symbol_1 const tint_symbol_7 = {.x_GLF_color_1=tint_symbol_2.x_GLF_color_1};
|
||||
return tint_symbol_7;
|
||||
main_out tint_symbol_inner(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_9, thread float4* const tint_symbol_10) {
|
||||
main_1(x_8, tint_symbol_9, tint_symbol_10);
|
||||
main_out const tint_symbol_6 = {.x_GLF_color_1=*(tint_symbol_10)};
|
||||
return tint_symbol_6;
|
||||
}
|
||||
|
||||
fragment tint_symbol_1 tint_symbol(constant buf0& x_8 [[buffer(0)]]) {
|
||||
thread tint_array_wrapper tint_symbol_11 = {};
|
||||
thread float4 tint_symbol_12 = 0.0f;
|
||||
main_out const inner_result = tint_symbol_inner(x_8, &(tint_symbol_11), &(tint_symbol_12));
|
||||
tint_symbol_1 wrapper_result = {};
|
||||
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
|
||||
return wrapper_result;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@ static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
|
||||
void main_1() {
|
||||
int index = 0;
|
||||
const struct_base tint_symbol_2 = {1, 1, 1};
|
||||
const struct_base tint_symbol_3 = {1, 1, 1};
|
||||
const struct_base tint_symbol_4 = {1, 1, 1};
|
||||
const struct_base tint_symbol_5 = {1, 1, 1};
|
||||
const struct_base tint_symbol_6[3] = {tint_symbol_3, tint_symbol_4, tint_symbol_5};
|
||||
struct_array = tint_symbol_6;
|
||||
const struct_base tint_symbol_5[3] = {tint_symbol_2, tint_symbol_3, tint_symbol_4};
|
||||
struct_array = tint_symbol_5;
|
||||
index = 1;
|
||||
struct_array[1].rightIndex = 1;
|
||||
const int x_39 = struct_array[1].leftIndex;
|
||||
@@ -45,9 +45,15 @@ struct tint_symbol {
|
||||
float4 x_GLF_color_1 : SV_Target0;
|
||||
};
|
||||
|
||||
tint_symbol main() {
|
||||
main_out main_inner() {
|
||||
main_1();
|
||||
const main_out tint_symbol_1 = {x_GLF_color};
|
||||
const tint_symbol tint_symbol_7 = {tint_symbol_1.x_GLF_color_1};
|
||||
return tint_symbol_7;
|
||||
const main_out tint_symbol_6 = {x_GLF_color};
|
||||
return tint_symbol_6;
|
||||
}
|
||||
|
||||
tint_symbol main() {
|
||||
const main_out inner_result = main_inner();
|
||||
tint_symbol wrapper_result = (tint_symbol)0;
|
||||
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
|
||||
return wrapper_result;
|
||||
}
|
||||
|
||||
@@ -19,40 +19,46 @@ struct tint_symbol_1 {
|
||||
float4 x_GLF_color_1 [[color(0)]];
|
||||
};
|
||||
|
||||
void main_1(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_8, thread float4* const tint_symbol_9) {
|
||||
void main_1(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_7, thread float4* const tint_symbol_8) {
|
||||
int index = 0;
|
||||
struct_base const tint_symbol_2 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_3 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_4 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
struct_base const tint_symbol_5 = {.data=1, .leftIndex=1, .rightIndex=1};
|
||||
tint_array_wrapper const tint_symbol_6 = {.arr={tint_symbol_3, tint_symbol_4, tint_symbol_5}};
|
||||
*(tint_symbol_8) = tint_symbol_6;
|
||||
tint_array_wrapper const tint_symbol_5 = {.arr={tint_symbol_2, tint_symbol_3, tint_symbol_4}};
|
||||
*(tint_symbol_7) = tint_symbol_5;
|
||||
index = 1;
|
||||
(*(tint_symbol_8)).arr[1].rightIndex = 1;
|
||||
int const x_39 = (*(tint_symbol_8)).arr[1].leftIndex;
|
||||
(*(tint_symbol_7)).arr[1].rightIndex = 1;
|
||||
int const x_39 = (*(tint_symbol_7)).arr[1].leftIndex;
|
||||
if ((x_39 == 1)) {
|
||||
float const x_45 = x_8.injectionSwitch.x;
|
||||
int const x_48 = (*(tint_symbol_8)).arr[int(x_45)].rightIndex;
|
||||
int const x_48 = (*(tint_symbol_7)).arr[int(x_45)].rightIndex;
|
||||
index = x_48;
|
||||
} else {
|
||||
float const x_50 = x_8.injectionSwitch.y;
|
||||
int const x_53 = (*(tint_symbol_8)).arr[int(x_50)].leftIndex;
|
||||
int const x_53 = (*(tint_symbol_7)).arr[int(x_50)].leftIndex;
|
||||
index = x_53;
|
||||
}
|
||||
int const x_55 = (*(tint_symbol_8)).arr[1].leftIndex;
|
||||
int const x_55 = (*(tint_symbol_7)).arr[1].leftIndex;
|
||||
if ((x_55 == 1)) {
|
||||
*(tint_symbol_9) = float4(1.0f, 0.0f, 0.0f, 1.0f);
|
||||
*(tint_symbol_8) = float4(1.0f, 0.0f, 0.0f, 1.0f);
|
||||
} else {
|
||||
*(tint_symbol_9) = float4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
*(tint_symbol_8) = float4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
fragment tint_symbol_1 tint_symbol(constant buf0& x_8 [[buffer(0)]]) {
|
||||
thread tint_array_wrapper tint_symbol_10 = {};
|
||||
thread float4 tint_symbol_11 = 0.0f;
|
||||
main_1(x_8, &(tint_symbol_10), &(tint_symbol_11));
|
||||
main_out const tint_symbol_2 = {.x_GLF_color_1=tint_symbol_11};
|
||||
tint_symbol_1 const tint_symbol_7 = {.x_GLF_color_1=tint_symbol_2.x_GLF_color_1};
|
||||
return tint_symbol_7;
|
||||
main_out tint_symbol_inner(constant buf0& x_8, thread tint_array_wrapper* const tint_symbol_9, thread float4* const tint_symbol_10) {
|
||||
main_1(x_8, tint_symbol_9, tint_symbol_10);
|
||||
main_out const tint_symbol_6 = {.x_GLF_color_1=*(tint_symbol_10)};
|
||||
return tint_symbol_6;
|
||||
}
|
||||
|
||||
fragment tint_symbol_1 tint_symbol(constant buf0& x_8 [[buffer(0)]]) {
|
||||
thread tint_array_wrapper tint_symbol_11 = {};
|
||||
thread float4 tint_symbol_12 = 0.0f;
|
||||
main_out const inner_result = tint_symbol_inner(x_8, &(tint_symbol_11), &(tint_symbol_12));
|
||||
tint_symbol_1 wrapper_result = {};
|
||||
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
|
||||
return wrapper_result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user