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

Merge pull request #126 from mgadams/win32_warnings

Browse Source 
Fix several build warnings/error encountered with VS2013
This commit is contained in:
John Kessenich 2016-01-13 19:11:05 -07:00
commit 5caf936428
4 changed files with 881 additions and 881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GlslangToSpv.cpp
View File

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

2
SPIRV/SpvBuilder.cpp
View File

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

1756
SPIRV/spirv.hpp
View File

File diff suppressed because it is too large Load Diff

2
glslang/MachineIndependent/Scan.cpp
View File

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