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

Merge pull request #1466 from Kangz/warning_fixes

Browse Source 
Fix -Wignored-qualifier and -Wunused-variable warnings
This commit is contained in:
John Kessenich 2018-08-09 12:49:56 -07:00 committed by GitHub
commit c4510e5ebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GlslangToSpv.cpp
View File

@ -5377,8 +5377,10 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
// Create group invocation operations. // Create group invocation operations.
spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op, spv::Id typeId, std::vector<spv::Id>& operands, glslang::TBasicType typeProxy) spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op, spv::Id typeId, std::vector<spv::Id>& operands, glslang::TBasicType typeProxy)
{ {
#ifdef AMD_EXTENSIONS
bool isUnsigned = isTypeUnsignedInt(typeProxy); bool isUnsigned = isTypeUnsignedInt(typeProxy);
bool isFloat = isTypeFloat(typeProxy); bool isFloat = isTypeFloat(typeProxy);
#endif
spv::Op opCode = spv::OpNop; spv::Op opCode = spv::OpNop;
std::vector<spv::Id> spvGroupOperands; std::vector<spv::Id> spvGroupOperands;

2
glslang/MachineIndependent/reflection.h
View File

@ -59,7 +59,7 @@ public:
name(pName), offset(pOffset), name(pName), offset(pOffset),
glDefineType(pGLDefineType), size(pSize), index(pIndex), counterIndex(-1), stages(EShLanguageMask(0)), type(pType.clone()) { } glDefineType(pGLDefineType), size(pSize), index(pIndex), counterIndex(-1), stages(EShLanguageMask(0)), type(pType.clone()) { }
const TType* const getType() const { return type; } const TType* getType() const { return type; }
int getBinding() const int getBinding() const
{ {
if (type == nullptr || !type->getQualifier().hasBinding()) if (type == nullptr || !type->getQualifier().hasBinding())