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

Merge pull request #11 from baldurk/size-t-int-warning-fixes

Browse Source 
Fix warnings compiling on x64 with size_t to int casts
This commit is contained in:
John Kessenich 2015-07-14 12:25:55 -06:00
commit eebb20511f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPIRV/GlslangToSpv.cpp
View File

@ -1099,9 +1099,9 @@ bool TGlslangToSpvTraverser::visitSwitch(glslang::TVisit /* visit */, glslang::T
for (glslang::TIntermSequence::iterator c = sequence.begin(); c != sequence.end(); ++c) { for (glslang::TIntermSequence::iterator c = sequence.begin(); c != sequence.end(); ++c) {
TIntermNode* child = *c; TIntermNode* child = *c;
if (child->getAsBranchNode() && child->getAsBranchNode()->getFlowOp() == glslang::EOpDefault) if (child->getAsBranchNode() && child->getAsBranchNode()->getFlowOp() == glslang::EOpDefault)
defaultSegment = codeSegments.size(); defaultSegment = (int)codeSegments.size();
else if (child->getAsBranchNode() && child->getAsBranchNode()->getFlowOp() == glslang::EOpCase) { else if (child->getAsBranchNode() && child->getAsBranchNode()->getFlowOp() == glslang::EOpCase) {
valueIndexToSegment[caseValues.size()] = codeSegments.size(); valueIndexToSegment[caseValues.size()] = (int)codeSegments.size();
caseValues.push_back(child->getAsBranchNode()->getExpression()->getAsConstantUnion()->getConstArray()[0].getIConst()); caseValues.push_back(child->getAsBranchNode()->getExpression()->getAsConstantUnion()->getConstArray()[0].getIConst());
} else } else
codeSegments.push_back(child); codeSegments.push_back(child);
@ -1115,7 +1115,7 @@ bool TGlslangToSpvTraverser::visitSwitch(glslang::TVisit /* visit */, glslang::T
// make the switch statement // make the switch statement
std::vector<spv::Block*> segmentBlocks; // returned, as the blocks allocated in the call std::vector<spv::Block*> segmentBlocks; // returned, as the blocks allocated in the call
builder.makeSwitch(selector, codeSegments.size(), caseValues, valueIndexToSegment, defaultSegment, segmentBlocks); builder.makeSwitch(selector, (int)codeSegments.size(), caseValues, valueIndexToSegment, defaultSegment, segmentBlocks);
// emit all the code in the segments // emit all the code in the segments
breakForLoop.push(false); breakForLoop.push(false);

4
SPIRV/SpvBuilder.cpp
View File

@ -704,7 +704,7 @@ void Builder::closeMain()
Function* Builder::makeFunctionEntry(Id returnType, const char* name, std::vector<Id>& paramTypes, Block **entry) Function* Builder::makeFunctionEntry(Id returnType, const char* name, std::vector<Id>& paramTypes, Block **entry)
{ {
Id typeId = makeFunctionType(returnType, paramTypes); Id typeId = makeFunctionType(returnType, paramTypes);
Id firstParamId = paramTypes.size() == 0 ? 0 : getUniqueIds(paramTypes.size()); Id firstParamId = paramTypes.size() == 0 ? 0 : getUniqueIds((int)paramTypes.size());
Function* function = new Function(getUniqueId(), returnType, typeId, firstParamId, module); Function* function = new Function(getUniqueId(), returnType, typeId, firstParamId, module);
if (entry) { if (entry) {
@ -1943,7 +1943,7 @@ Id Builder::accessChainLoad(Decoration /*precision*/)
// static swizzle // static swizzle
Id resultType = componentType; Id resultType = componentType;
if (accessChain.swizzle.size() > 1) if (accessChain.swizzle.size() > 1)
resultType = makeVectorType(componentType, accessChain.swizzle.size()); resultType = makeVectorType(componentType, (int)accessChain.swizzle.size());
id = createRvalueSwizzle(resultType, id, accessChain.swizzle); id = createRvalueSwizzle(resultType, id, accessChain.swizzle);
} }

2
glslang/MachineIndependent/Scan.h
View File

@ -106,7 +106,7 @@ public:
} }
--ch; --ch;
} }
loc[currentSource].column = currentChar - ch; loc[currentSource].column = (int)(currentChar - ch);
} }
} else { } else {
do { do {