Run format_all.sh.

This commit is contained in:
Hans-Kristian Arntzen 2018-04-10 12:32:14 +02:00
parent 8175e2e200
commit 9c2761f69a

View File

@ -2860,7 +2860,8 @@ string CompilerMSL::member_attribute_qualifier(const SPIRType &type, uint32_t in
}
uint32_t locn = get_ordered_member_location(type.self, index);
if (locn != k_unknown_location && has_member_decoration(type.self, index, DecorationIndex))
return join(" [[color(", locn, "), index(", get_member_decoration(type.self, index, DecorationIndex), ")]]");
return join(" [[color(", locn, "), index(", get_member_decoration(type.self, index, DecorationIndex),
")]]");
else if (locn != k_unknown_location)
return join(" [[color(", locn, ")]]");
else if (has_member_decoration(type.self, index, DecorationIndex))
@ -3321,11 +3322,7 @@ void CompilerMSL::replace_illegal_names()
// FIXME: MSL and GLSL are doing two different things here.
// Agree on convention and remove this override.
static const unordered_set<string> keywords = {
"kernel",
"vertex",
"fragment",
"compute",
"bias",
"kernel", "vertex", "fragment", "compute", "bias",
};
static const unordered_set<string> illegal_func_names = {