diff options
| author | Darren Wihandi <65404740+fairywreath@users.noreply.github.com> | 2025-01-17 11:57:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-17 08:57:06 -0800 |
| commit | 91430870a8a6ec2825969823b892a9c8a0d588ab (patch) | |
| tree | fc78378a51cc1456729d61c0f8e7c9dbd8d6690d /tests | |
| parent | e743c17f72ab332f7eb467f02dd9567f3f8d3de0 (diff) | |
hoist entry point params for wgsl (#6116)
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/metal/nested-struct-fragment-input.slang | 4 | ||||
| -rw-r--r-- | tests/metal/stage-in-2.slang | 6 | ||||
| -rw-r--r-- | tests/wgsl/nested-varying-input.slang | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/tests/metal/nested-struct-fragment-input.slang b/tests/metal/nested-struct-fragment-input.slang index f70303306..77530f9fd 100644 --- a/tests/metal/nested-struct-fragment-input.slang +++ b/tests/metal/nested-struct-fragment-input.slang @@ -22,7 +22,7 @@ // METAL-NOT: [[ATTR3]] // METAL-DAG: [[ATTR4:COARSEVERTEX_(1|2|3|4)]] -// WGSL:struct FragmentStageInput +// WGSL:struct pixelInput // WGSL-DAG:@location(0) [[VAR0:[A-Za-z_0-9]+]] // WGSL-DAG:@location(1) [[VAR1:[A-Za-z_0-9]+]] // WGSL-DAG:@location(2) [[VAR2:[A-Za-z_0-9]+]] @@ -78,7 +78,7 @@ float4 fragmentMain(FragmentStageInput input) // METAL-DAG: {{.*}}->p3{{.*}}->p2{{.*}}->p1{{.*}}= // METAL-DAG: {{.*}}->p3{{.*}}->p3{{.*}}->p1{{.*}}= - // WGSL: var [[UnpackedInput:[A-Za-z_0-9]+]] : FragmentStageInput + // WGSL: var [[UnpackedInput:[A-Za-z_0-9]+]] : pixelInput // WGSL-DAG: [[UnpackedInput]].{{[A-Za-z_0-9]+}}.{{[A-Za-z_0-9]+}} = [[InputVar]].[[VAR7]]; // WGSL-DAG: [[UnpackedInput]].{{[A-Za-z_0-9]+}}.{{[A-Za-z_0-9]+}}.{{[A-Za-z_0-9]+}} = [[InputVar]].[[VAR6]]; diff --git a/tests/metal/stage-in-2.slang b/tests/metal/stage-in-2.slang index 5b885af49..6ee3b8c51 100644 --- a/tests/metal/stage-in-2.slang +++ b/tests/metal/stage-in-2.slang @@ -15,10 +15,8 @@ //WGSLSPIRV: %vertexMain = OpFunction % //WGSLSPIRV: %fragmentMain = OpFunction % -//WGSL: struct [[CoarseVertex:CoarseVertex[_0-9]*]] -//WGSL-NEXT: { -//WGSL-NEXT: @location(0) color -//WGSL: fn fragmentMain({{.*}}[[CoarseVertex]] +//WGSL: @location(0) output +//WGSL: @location(0) color // Uniform data to be passed from application -> shader. cbuffer Uniforms diff --git a/tests/wgsl/nested-varying-input.slang b/tests/wgsl/nested-varying-input.slang index 2cdf4f7eb..d2566a6b9 100644 --- a/tests/wgsl/nested-varying-input.slang +++ b/tests/wgsl/nested-varying-input.slang @@ -22,17 +22,17 @@ struct NestedVertexOutput struct VertexOutput { - //VERT: @builtin(position) position - //FRAG: @builtin(position) position - float4 position : SV_Position; - //VERT: @location(0) uv - //FRAG: @location(0) uv + //FRAG-DAG: @location(0) uv float2 uv : TEXCOORD0; //VERT: @location(1) color - //FRAG: @location(1) color + //FRAG-DAG: @location(1) color NestedVertexOutput nested; + + //VERT: @builtin(position) position + //FRAG-DAG: @builtin(position) position + float4 position : SV_Position; }; VertexOutput vertexMain() @@ -44,10 +44,12 @@ VertexOutput vertexMain() return out; } -FragmentOutput fragmentMain(VertexOutput input) +//FRAG-DAG: @location(3) color3 +//FRAG-DAG: @location(6) color6 +FragmentOutput fragmentMain(VertexOutput input, float4 color3: COLOR3, float4 color6: COLOR6) { FragmentOutput out; - out.color0 = input.nested.color; - out.color1 = input.nested.color; + out.color0 = input.nested.color + color3; + out.color1 = input.nested.color + color6; return out; } |