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

Merge pull request #226 from baldurk/warning-fixes

Browse Source 
A couple of small warning fixes
This commit is contained in:
John Kessenich 2016-04-11 10:23:50 -06:00
commit d99524197f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GlslangToSpv.cpp
View File

@ -2125,7 +2125,7 @@ void TGlslangToSpvTraverser::updateMemberOffset(const glslang::TType& /*structTy
bool TGlslangToSpvTraverser::isShaderEntrypoint(const glslang::TIntermAggregate* node) bool TGlslangToSpvTraverser::isShaderEntrypoint(const glslang::TIntermAggregate* node)
{ {
// have to ignore mangling and just look at the base name // have to ignore mangling and just look at the base name
int firstOpen = node->getName().find('('); size_t firstOpen = node->getName().find('(');
return node->getName().compare(0, firstOpen, glslangIntermediate->getEntryPoint().c_str()) == 0; return node->getName().compare(0, firstOpen, glslangIntermediate->getEntryPoint().c_str()) == 0;
} }

4
glslang/Include/Types.h
View File

@ -999,9 +999,9 @@ public:
qualifier.storage = EvqGlobal; qualifier.storage = EvqGlobal;
} }
void init(const TSourceLoc& loc, bool global = false) void init(const TSourceLoc& l, bool global = false)
{ {
initType(loc); initType(l);
sampler.clear(); sampler.clear();
initQualifiers(global); initQualifiers(global);
shaderQualifiers.init(); shaderQualifiers.init();