Fix several build warnings/error encountered with VS2013

This also fixes the newlines for spirv.hpp to be consistent with the rest of the files.
This commit is contained in:
Mark Adams
2016-01-06 13:41:02 -05:00
parent e23c9849c2
commit 364c21c8c0
4 changed files with 881 additions and 881 deletions

View File

@@ -2954,7 +2954,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
spv::Op opCode = spv::OpNop;
int libCall = -1;
int consumedOperands = operands.size();
size_t consumedOperands = operands.size();
spv::Id typeId0 = 0;
if (consumedOperands > 0)
typeId0 = builder.getTypeId(operands[0]);

View File

@@ -1365,7 +1365,7 @@ Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameter
case OpImageQuerySize:
case OpImageQuerySizeLod:
{
int numComponents;
int numComponents = 0;
switch (getTypeDimensionality(getImageType(parameters.sampler))) {
case Dim1D:
case DimBuffer:

View File

@@ -309,7 +309,7 @@ struct str_hash
unsigned long hash = 5381;
int c;
while ((c = *str++))
while ((c = *str++) != 0)
hash = ((hash << 5) + hash) + c;
return hash;