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

Merge pull request #1294 from dgkoch/dgkoch_build_fixes4

Browse Source 
Fix build several build errors
This commit is contained in:
John Kessenich 2018-03-14 01:05:56 -06:00 committed by GitHub
commit 075c8c11e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/SpvBuilder.cpp
View File

@ -2530,7 +2530,7 @@ void Builder::remapDynamicSwizzle()
if (accessChain.component != NoResult && accessChain.swizzle.size() > 1) { if (accessChain.component != NoResult && accessChain.swizzle.size() > 1) {
// build a vector of the swizzle for the component to map into // build a vector of the swizzle for the component to map into
std::vector<Id> components; std::vector<Id> components;
for (int c = 0; c < accessChain.swizzle.size(); ++c) for (int c = 0; c < (int)accessChain.swizzle.size(); ++c)
components.push_back(makeUintConstant(accessChain.swizzle[c])); components.push_back(makeUintConstant(accessChain.swizzle[c]));
Id mapType = makeVectorType(makeUintType(32), (int)accessChain.swizzle.size()); Id mapType = makeVectorType(makeUintType(32), (int)accessChain.swizzle.size());
Id map = makeCompositeConstant(mapType, components); Id map = makeCompositeConstant(mapType, components);

2
glslang/MachineIndependent/attribute.cpp
View File

@ -82,7 +82,7 @@ const TConstUnion* TAttributeArgs::getConstUnion(TBasicType basicType, int argNu
if (args == nullptr) if (args == nullptr)
return nullptr; return nullptr;
if (argNum >= args->getSequence().size()) if (argNum >= (int)args->getSequence().size())
return nullptr; return nullptr;
const TConstUnion* constVal = &args->getSequence()[argNum]->getAsConstantUnion()->getConstArray()[0]; const TConstUnion* constVal = &args->getSequence()[argNum]->getAsConstantUnion()->getConstArray()[0];

6
hlsl/hlslParseHelper.cpp
View File

@ -65,10 +65,10 @@ HlslParseContext::HlslParseContext(TSymbolTable& symbolTable, TIntermediate& int
entryPointFunction(nullptr), entryPointFunction(nullptr),
entryPointFunctionBody(nullptr), entryPointFunctionBody(nullptr),
gsStreamOutput(nullptr), gsStreamOutput(nullptr),
clipDistanceInput(nullptr),
cullDistanceInput(nullptr),
clipDistanceOutput(nullptr), clipDistanceOutput(nullptr),
cullDistanceOutput(nullptr) cullDistanceOutput(nullptr),
clipDistanceInput(nullptr),
cullDistanceInput(nullptr)
{ {
globalUniformDefaults.clear(); globalUniformDefaults.clear();
globalUniformDefaults.layoutMatrix = ElmRowMajor; globalUniformDefaults.layoutMatrix = ElmRowMajor;