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

Various build fixes when using newer GCC versions with warnings enabled

Browse Source 
Encountered with GCC-4.7.3 in a build environment where warnings are enabled
and treated as errors.
This commit is contained in:
Mark Adams 2015-10-26 12:38:46 -04:00
parent fac0d1c72b
commit c11e95f6e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SPIRV/disassemble.cpp
View File

@ -316,7 +316,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
nextNestedControl = 0; nextNestedControl = 0;
} }
} else if (opCode == OpExtInstImport) { } else if (opCode == OpExtInstImport) {
idDescriptor[resultId] = (char*)(&stream[word]); idDescriptor[resultId] = (const char*)(&stream[word]);
} }
else { else {
if (idDescriptor[resultId].size() == 0) { if (idDescriptor[resultId].size() == 0) {
@ -391,7 +391,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
disassembleIds(1); disassembleIds(1);
// Get names for printing "(XXX)" for readability, *after* this id // Get names for printing "(XXX)" for readability, *after* this id
if (opCode == OpName) if (opCode == OpName)
idDescriptor[stream[word - 1]] = (char*)(&stream[word]); idDescriptor[stream[word - 1]] = (const char*)(&stream[word]);
break; break;
case OperandOptionalId: case OperandOptionalId:
case OperandVariableIds: case OperandVariableIds:
@ -404,8 +404,8 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
return; return;
case OperandOptionalLiteral: case OperandOptionalLiteral:
case OperandVariableLiterals: case OperandVariableLiterals:
if (opCode == OpDecorate && stream[word - 1] == DecorationBuiltIn || if ((opCode == OpDecorate && stream[word - 1] == DecorationBuiltIn) ||
opCode == OpMemberDecorate && stream[word - 1] == DecorationBuiltIn) { (opCode == OpMemberDecorate && stream[word - 1] == DecorationBuiltIn)) {
out << BuiltInString(stream[word++]); out << BuiltInString(stream[word++]);
--numOperands; --numOperands;
++op; ++op;
@ -442,7 +442,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
disassembleImmediates(1); disassembleImmediates(1);
if (opCode == OpExtInst) { if (opCode == OpExtInst) {
ExtInstSet extInstSet = GLSL450Inst; ExtInstSet extInstSet = GLSL450Inst;
if (0 == memcmp("OpenCL", (char*)(idDescriptor[stream[word-2]].c_str()), 6)) { if (0 == memcmp("OpenCL", (const char*)(idDescriptor[stream[word-2]].c_str()), 6)) {
extInstSet = OpenCLExtInst; extInstSet = OpenCLExtInst;
} }
unsigned entrypoint = stream[word - 1]; unsigned entrypoint = stream[word - 1];

2
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -242,7 +242,7 @@ TVariable::TVariable(const TVariable& copyOf) : TSymbol(copyOf)
userType = copyOf.userType; userType = copyOf.userType;
numExtensions = 0; numExtensions = 0;
extensions = 0; extensions = 0;
if (copyOf.numExtensions > 0) if (copyOf.numExtensions != 0)
setExtensions(copyOf.numExtensions, copyOf.extensions); setExtensions(copyOf.numExtensions, copyOf.extensions);
if (! copyOf.unionArray.empty()) { if (! copyOf.unionArray.empty()) {