encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-14 19:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

writer/hlsl: Don't explode on unhandled member decorations

Browse Source 
[[align(n)]], [[size(n)]] are valid decorations that should not cause the writer to fail.
Instead of allow-listing these, just handle the cases it actually cares about.

Fixed: tint:686
Change-Id: I7c60d251fcaee424fe1c1a1f1f58123eea8c99aa
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/46380
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton 2021-03-30 19:54:08 +00:00 committed by Commit Bot service account
parent 02571d15e8
commit ced00a2380
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/writer/hlsl/generator_impl.cc
View File

@ -2610,8 +2610,7 @@ bool GeneratorImpl::EmitStructType(std::ostream& out,
out << " " << namer_.NameFor(builder_.Symbols().NameFor(mem->symbol())); out << " " << namer_.NameFor(builder_.Symbols().NameFor(mem->symbol()));
} }
if (mem->decorations().size() > 0) { for (auto* deco : mem->decorations()) {
auto* deco = mem->decorations()[0];
if (auto* location = deco->As<ast::LocationDecoration>()) { if (auto* location = deco->As<ast::LocationDecoration>()) {
out << " : TEXCOORD" << location->value(); out << " : TEXCOORD" << location->value();
} else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) { } else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
@ -2621,11 +2620,6 @@ bool GeneratorImpl::EmitStructType(std::ostream& out,
return false; return false;
} }
out << " : " << attr; out << " : " << attr;
} else if (deco->Is<ast::StructMemberOffsetDecoration>()) {
// Nothing to do, offsets are handled at the point of access.
} else {
diagnostics_.add_error("unsupported struct member decoration");
return false;
} }
} }