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

glslang portability: Resolve OSX errors, some other OS warnings.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31468 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-06-10 22:05:48 +00:00
parent 3ef22f2139
commit 79eaa91e6f
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/SpvBuilder.cpp
View File

@@ -301,7 +301,7 @@ Id Builder::makeSampler(Id sampledType, Dim dim, samplerContent content, bool ar
type = groupedTypes[OpTypeSampler][t];
if (type->getIdOperand(0) == sampledType &&
type->getImmediateOperand(1) == (unsigned int)dim &&
type->getImmediateOperand(2) == content &&
type->getImmediateOperand(2) == (unsigned int)content &&
type->getImmediateOperand(3) == (arrayed ? 1u : 0u) &&
type->getImmediateOperand(4) == ( shadow ? 1u : 0u) &&
type->getImmediateOperand(5) == ( ms ? 1u : 0u))
@@ -1842,7 +1842,7 @@ void Builder::clearAccessChain()
}
// Comments in header
void Builder::accessChainPushSwizzle(std::vector<unsigned>& swizzle, int width)
void Builder::accessChainPushSwizzle(std::vector<unsigned>& swizzle)
{
// if needed, propagate the swizzle for the current access chain
if (accessChain.swizzle.size()) {