Fix #2020: PR #1977 broke HLSL member consistency, this finishes it...

using an unitialized member.  This commit consistently does not use those
HLSL members unless ENABLE_HLSL is on.
This commit is contained in:
John Kessenich 2019-12-09 23:48:50 -07:00
parent 1afa2b8cc5
commit 1843c0c415
2 changed files with 10 additions and 8 deletions

View file

@ -114,6 +114,7 @@ void TType::buildMangledName(TString& mangledName) const
default: break; // some compilers want this
}
#ifdef ENABLE_HLSL
if (sampler.hasReturnStruct()) {
// Name mangle for sampler return struct uses struct table index.
mangledName += "-tx-struct";
@ -129,6 +130,7 @@ void TType::buildMangledName(TString& mangledName) const
case 4: break; // default to prior name mangle behavior
}
}
#endif
if (sampler.isMultiSample())
mangledName += "M";