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

Merge pull request #178 from baldurk/minor-warning-fix

Browse Source 
Minor warning fixes
This commit is contained in:
John Kessenich 2016-02-27 21:14:15 -07:00
commit ced70f4e28
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GlslangToSpv.cpp
View File

@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
case EShLangTessEvaluation:
builder.addCapability(spv::CapabilityTessellationPointSize);
break;
default:
break;
}
return spv::BuiltInPointSize;

2
SPIRV/SpvBuilder.cpp
View File

@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType()
if (accessChain.swizzle.size() == 1)
type = getContainedTypeId(type);
else if (accessChain.swizzle.size() > 1)
type = makeVectorType(getContainedTypeId(type), accessChain.swizzle.size());
type = makeVectorType(getContainedTypeId(type), (int)accessChain.swizzle.size());
// dereference component selection
if (accessChain.component)

2
glslang/MachineIndependent/localintermediate.h
View File

@ -267,7 +267,7 @@ public:
localSizeSpecId[dim] = id;
return true;
}
unsigned int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; }
int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; }
void setXfbMode() { xfbMode = true; }
bool getXfbMode() const { return xfbMode; }