BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HLSL: Fix #1018: Give an error for mismatched return type.

Browse source
This commit is contained in:
John Kessenich 2017-08-19 17:29:44 -06:00
parent b207daa5d3
commit 778806a692
3 changed files with 84 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hlsl/hlslParseHelper.cpp
View file

@ -2239,7 +2239,7 @@ TIntermNode* HlslParseContext::handleReturnValue(const TSourceLoc& loc, TIntermT
value = intermediate.addConversion(EOpReturn, *currentFunctionType, value);
if (value && *currentFunctionType != value->getType())
value = intermediate.addUniShapeConversion(EOpReturn, *currentFunctionType, value);
if (value == nullptr) {
if (value == nullptr || *currentFunctionType != value->getType()) {
error(loc, "type does not match, or is not convertible to, the function's return type", "return", "");
return value;
}