Commit ced70f4e by John Kessenich

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

Minor warning fixes
parents 51843533 1be2ffa7
...@@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI ...@@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
case EShLangTessEvaluation: case EShLangTessEvaluation:
builder.addCapability(spv::CapabilityTessellationPointSize); builder.addCapability(spv::CapabilityTessellationPointSize);
break; break;
default:
break;
} }
return spv::BuiltInPointSize; return spv::BuiltInPointSize;
......
...@@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType() ...@@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType()
if (accessChain.swizzle.size() == 1) if (accessChain.swizzle.size() == 1)
type = getContainedTypeId(type); type = getContainedTypeId(type);
else if (accessChain.swizzle.size() > 1) else if (accessChain.swizzle.size() > 1)
type = makeVectorType(getContainedTypeId(type), accessChain.swizzle.size()); type = makeVectorType(getContainedTypeId(type), (int)accessChain.swizzle.size());
// dereference component selection // dereference component selection
if (accessChain.component) if (accessChain.component)
......
...@@ -267,7 +267,7 @@ public: ...@@ -267,7 +267,7 @@ public:
localSizeSpecId[dim] = id; localSizeSpecId[dim] = id;
return true; return true;
} }
unsigned int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; } int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; }
void setXfbMode() { xfbMode = true; } void setXfbMode() { xfbMode = true; }
bool getXfbMode() const { return xfbMode; } bool getXfbMode() const { return xfbMode; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment