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

Fixes to 8f1684b7bb881813365efd013b05bc0900a52a0c, merge pull request 52.

Browse Source
This commit is contained in:
John Kessenich 2015-08-06 22:02:24 -06:00
parent 8f1684b7bb
commit 306695360d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SPIRV/GlslangToSpv.cpp
View File

@ -1370,9 +1370,9 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
builder.addMemberDecoration(spvType, member, spv::DecorationOffset, glslangType.getQualifier().layoutXfbOffset); builder.addMemberDecoration(spvType, member, spv::DecorationOffset, glslangType.getQualifier().layoutXfbOffset);
// built-in variable decorations // built-in variable decorations
int builtIn = TranslateBuiltInDecoration(glslangType.getQualifier().builtIn); spv::BuiltIn builtIn = TranslateBuiltInDecoration(glslangType.getQualifier().builtIn);
if ((unsigned int)builtIn != spv::BadValue) if (builtIn != spv::BadValue)
builder.addMemberDecoration(spvType, member, spv::DecorationBuiltIn, builtIn); builder.addMemberDecoration(spvType, member, spv::DecorationBuiltIn, (int)builtIn);
} }
} }
@ -2518,9 +2518,9 @@ spv::Id TGlslangToSpvTraverser::getSymbolId(const glslang::TIntermSymbol* symbol
} }
// built-in variable decorations // built-in variable decorations
int builtIn = TranslateBuiltInDecoration(symbol->getQualifier().builtIn); spv::BuiltIn builtIn = TranslateBuiltInDecoration(symbol->getQualifier().builtIn);
if ((unsigned int)builtIn != spv::BadValue) if ((unsigned int)builtIn != spv::BadValue)
builder.addDecoration(id, spv::DecorationBuiltIn, builtIn); builder.addDecoration(id, spv::DecorationBuiltIn, (int)builtIn);
if (linkageOnly) if (linkageOnly)
builder.addDecoration(id, spv::DecorationNoStaticUse); builder.addDecoration(id, spv::DecorationNoStaticUse);

4
SPIRV/SpvBuilder.cpp
View File

@ -1032,7 +1032,7 @@ Id Builder::createRvalueSwizzle(Id typeId, Id source, std::vector<unsigned>& cha
// Comments in header // Comments in header
Id Builder::createLvalueSwizzle(Id typeId, Id target, Id source, std::vector<unsigned>& channels) Id Builder::createLvalueSwizzle(Id typeId, Id target, Id source, std::vector<unsigned>& channels)
{ {
assert((size_t)getNumComponents(source) == channels.size()); assert(getNumComponents(source) == (int)channels.size());
if (channels.size() == 1 && getNumComponents(source) == 1) if (channels.size() == 1 && getNumComponents(source) == 1)
return createCompositeInsert(source, target, typeId, channels.front()); return createCompositeInsert(source, target, typeId, channels.front());
@ -1471,7 +1471,7 @@ Id Builder::createCompare(Decoration precision, Id value1, Id value2, bool equal
// OpCompositeConstruct // OpCompositeConstruct
Id Builder::createCompositeConstruct(Id typeId, std::vector<Id>& constituents) Id Builder::createCompositeConstruct(Id typeId, std::vector<Id>& constituents)
{ {
assert((isAggregateType(typeId) || getNumTypeComponents(typeId) > 1) && (size_t)getNumTypeComponents(typeId) == constituents.size()); assert(isAggregateType(typeId) || (getNumTypeComponents(typeId) > 1 && getNumTypeComponents(typeId) == (int)constituents.size()));
Instruction* op = new Instruction(getUniqueId(), typeId, OpCompositeConstruct); Instruction* op = new Instruction(getUniqueId(), typeId, OpCompositeConstruct);
for (int c = 0; c < (int)constituents.size(); ++c) for (int c = 0; c < (int)constituents.size(); ++c)

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "2.2.687" #define GLSLANG_REVISION "2.2.699"
#define GLSLANG_DATE "03-Aug-2015" #define GLSLANG_DATE "06-Aug-2015"

2
glslang/MachineIndependent/Constant.cpp
View File

@ -172,7 +172,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* const
case EbtInt: case EbtInt:
if (rightUnionArray[i] == 0) if (rightUnionArray[i] == 0)
newConstArray[i].setIConst(0x7FFFFFFF); newConstArray[i].setIConst(0x7FFFFFFF);
else if (rightUnionArray[i].getIConst() == -1 && (unsigned int)unionArray[i].getIConst() == 0x80000000) else if (rightUnionArray[i].getIConst() == -1 && unionArray[i].getIConst() == 0x80000000)
newConstArray[i].setIConst(0x80000000); newConstArray[i].setIConst(0x80000000);
else else
newConstArray[i].setIConst(unionArray[i].getIConst() / rightUnionArray[i].getIConst()); newConstArray[i].setIConst(unionArray[i].getIConst() / rightUnionArray[i].getIConst());

2
glslang/MachineIndependent/Scan.h
View File

@ -172,7 +172,7 @@ protected:
void advance() void advance()
{ {
++currentChar; ++currentChar;
if (currentChar >= static_cast<size_t>(lengths[currentSource])) { if (currentChar >= lengths[currentSource]) {
++currentSource; ++currentSource;
if (currentSource < numSources) { if (currentSource < numSources) {
loc[currentSource].string = loc[currentSource - 1].string + 1; loc[currentSource].string = loc[currentSource - 1].string + 1;