encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

writer/msl: Enable validation for entry point tests 

Fix a test that did not have the position builtin as a vertex shader
output.

Change-Id: I8dceba59d8327938e725e7d5e62b4b9c43695710
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/47820
Reviewed-by: Ben Clayton <bclayton@chromium.org>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
This commit is contained in:
James Price 2021-04-14 22:14:08 +00:00 committed by Commit Bot service account
parent 43b84d69dd
commit 0ba48eeb52
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/writer/msl/generator_impl_function_test.cc
View File

@ -121,6 +121,8 @@ fragment tint_symbol_2 frag_main(tint_symbol_1 tint_symbol [[stage_in]]) {
} }
)"); )");
Validate();
} }
TEST_F(MslGeneratorImplTest, Emit_Decoration_EntryPoint_WithInOut_Builtins) { TEST_F(MslGeneratorImplTest, Emit_Decoration_EntryPoint_WithInOut_Builtins) {
@ -154,6 +156,8 @@ fragment tint_symbol_2 frag_main(tint_symbol_1 tint_symbol [[stage_in]]) {
} }
)"); )");
Validate();
} }
TEST_F(MslGeneratorImplTest, TEST_F(MslGeneratorImplTest,
@ -161,9 +165,10 @@ TEST_F(MslGeneratorImplTest,
// struct Interface { // struct Interface {
// [[location(1)]] col1 : f32; // [[location(1)]] col1 : f32;
// [[location(2)]] col2 : f32; // [[location(2)]] col2 : f32;
// [[builtin(position)]] pos : vec4<f32>;
// }; // };
// fn vert_main() -> Interface { // fn vert_main() -> Interface {
// return Interface(0.4, 0.6); // return Interface(0.4, 0.6, vec4<f32>());
// } // }
// fn frag_main(colors : Interface) { // fn frag_main(colors : Interface) {
// const r = colors.col1; // const r = colors.col1;
@ -171,13 +176,16 @@ TEST_F(MslGeneratorImplTest,
// } // }
auto* interface_struct = Structure( auto* interface_struct = Structure(
"Interface", "Interface",
{Member("col1", ty.f32(), {create<ast::LocationDecoration>(1)}), {
Member("col2", ty.f32(), {create<ast::LocationDecoration>(2)})}); Member("col1", ty.f32(), {Location(1)}),
Member("col2", ty.f32(), {Location(2)}),
Member("pos", ty.vec4<f32>(), {Builtin(ast::Builtin::kPosition)}),
});
Func("vert_main", {}, interface_struct, Func("vert_main", {}, interface_struct,
{create<ast::ReturnStatement>( {Return(Construct(interface_struct, Expr(0.5f), Expr(0.25f),
Construct(interface_struct, Expr(0.5f), Expr(0.25f)))}, Construct(ty.vec4<f32>())))},
{create<ast::StageDecoration>(ast::PipelineStage::kVertex)}); {Stage(ast::PipelineStage::kVertex)});
Func("frag_main", {Param("colors", interface_struct)}, ty.void_(), Func("frag_main", {Param("colors", interface_struct)}, ty.void_(),
{ {
@ -197,29 +205,34 @@ using namespace metal;
struct Interface { struct Interface {
float col1; float col1;
float col2; float col2;
float4 pos;
}; };
struct tint_symbol { struct tint_symbol {
float col1 [[user(locn1)]]; float col1 [[user(locn1)]];
float col2 [[user(locn2)]]; float col2 [[user(locn2)]];
float4 pos [[position]];
}; };
struct tint_symbol_3 { struct tint_symbol_3 {
float col1 [[user(locn1)]]; float col1 [[user(locn1)]];
float col2 [[user(locn2)]]; float col2 [[user(locn2)]];
float4 pos [[position]];
}; };
vertex tint_symbol vert_main() { vertex tint_symbol vert_main() {
const Interface tint_symbol_1 = {0.5f, 0.25f}; const Interface tint_symbol_1 = {0.5f, 0.25f, float4(0.0f)};
return {tint_symbol_1.col1, tint_symbol_1.col2}; return {tint_symbol_1.col1, tint_symbol_1.col2, tint_symbol_1.pos};
} }
fragment void frag_main(tint_symbol_3 tint_symbol_2 [[stage_in]]) { fragment void frag_main(tint_symbol_3 tint_symbol_2 [[stage_in]]) {
const Interface colors = {tint_symbol_2.col1, tint_symbol_2.col2}; const Interface colors = {tint_symbol_2.col1, tint_symbol_2.col2, tint_symbol_2.pos};
const float r = colors.col1; const float r = colors.col1;
const float g = colors.col2; const float g = colors.col2;
return; return;
} }
)"); )");
Validate();
} }
TEST_F(MslGeneratorImplTest, TEST_F(MslGeneratorImplTest,
@ -288,6 +301,8 @@ vertex tint_symbol_2 vert_main2() {
} }
)"); )");
Validate();
} }
TEST_F(MslGeneratorImplTest, TEST_F(MslGeneratorImplTest,