mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: allow trailing commas in initializer lists & scalar initialization

Browse Source
This commit is contained in:
steve-lunarg
2016-07-30 10:36:09 -06:00
parent b38f071605
commit fe5a3ff2f3
5 changed files with 199 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hlsl/hlslParseHelper.cpp
View File

@@ -3727,7 +3727,12 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
error(loc, "wrong vector size (or rows in a matrix column):", "initializer list", type.getCompleteString().c_str());
return nullptr;
}
} else {
} else if (type.isScalar()) {
if ((int)initList->getSequence().size() != 1) {
error(loc, "scalar expected one element:", "initializer list", type.getCompleteString().c_str());
return nullptr;
}
} else {
error(loc, "unexpected initializer-list type:", "initializer list", type.getCompleteString().c_str());
return nullptr;
}