diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index 21a04b0e..eeb40598 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI case EShLangTessEvaluation: builder.addCapability(spv::CapabilityTessellationPointSize); break; + default: + break; } return spv::BuiltInPointSize; diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp index bc405312..74ed611b 100644 --- a/SPIRV/SpvBuilder.cpp +++ b/SPIRV/SpvBuilder.cpp @@ -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) diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h index 00908b0b..60bf68ed 100644 --- a/glslang/MachineIndependent/localintermediate.h +++ b/glslang/MachineIndependent/localintermediate.h @@ -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; }