Merge pull request #2857 from jeremy-lunarg/hayes-fix-warnings

Fix GCC sign-compare warnings

diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index 838f916..0b0e48a 100644 (file)
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -433,11 +433,11 @@ Id Builder::makeGenericType(spv::Op opcode, std::vector<spv::IdImmediate>& opera
     Instruction* type;
     for (int t = 0; t < (int)groupedTypes[opcode].size(); ++t) {
         type = groupedTypes[opcode][t];
-        if (type->getNumOperands() != operands.size())
+        if (static_cast<size_t>(type->getNumOperands()) != operands.size())
             continue; // Number mismatch, find next
 
         bool match = true;
-        for (int op = 0; match && op < operands.size(); ++op) {
+        for (size_t op = 0; match && op < operands.size(); ++op) {
             match = (operands[op].isId ? type->getIdOperand(op) : type->getImmediateOperand(op)) == operands[op].word;
         }
         if (match)
@@ -446,7 +446,7 @@ Id Builder::makeGenericType(spv::Op opcode, std::vector<spv::IdImmediate>& opera
 
     // not found, make it
     type = new Instruction(getUniqueId(), NoType, opcode);
-    for (int op = 0; op < operands.size(); ++op) {
+    for (size_t op = 0; op < operands.size(); ++op) {
         if (operands[op].isId)
             type->addIdOperand(operands[op].word);
         else

diff --git a/gtests/GlslMapIO.FromFile.cpp b/gtests/GlslMapIO.FromFile.cpp
index 73fdec4..aabb4ae 100644 (file)
--- a/gtests/GlslMapIO.FromFile.cpp
+++ b/gtests/GlslMapIO.FromFile.cpp
@@ -113,11 +113,13 @@ bool verifyIOMapping(std::string& linkingError, glslang::TProgram& program) {
                     bool found = false;
                     for (auto outIt : pipeOut) {
                         if (outIt.second->getType()->isStruct()) {
-                            unsigned int baseLoc = outIt.second->getType()->getQualifier().hasLocation() ? outIt.second->getType()->getQualifier().layoutLocation : -1;
-                            for (int j = 0; j < outIt.second->getType()->getStruct()->size(); j++) {
+                            unsigned int baseLoc = outIt.second->getType()->getQualifier().hasLocation() ?
+                                outIt.second->getType()->getQualifier().layoutLocation :
+                                std::numeric_limits<unsigned int>::max();
+                            for (size_t j = 0; j < outIt.second->getType()->getStruct()->size(); j++) {
                                 baseLoc = (*outIt.second->getType()->getStruct())[j].type->getQualifier().hasLocation() ?
                                     (*outIt.second->getType()->getStruct())[j].type->getQualifier().layoutLocation : baseLoc;
-                                if (baseLoc != -1) {
+                                if (baseLoc != std::numeric_limits<unsigned int>::max()) {
                                     if (baseLoc == in.getType()->getQualifier().layoutLocation) {
                                         found = true;
                                         break;
@@ -134,10 +136,10 @@ bool verifyIOMapping(std::string& linkingError, glslang::TProgram& program) {
                 }
                 else {
                     unsigned int baseLoc = in.getType()->getQualifier().hasLocation() ? in.getType()->getQualifier().layoutLocation : -1;
-                    for (int j = 0; j < in.getType()->getStruct()->size(); j++) {
+                    for (size_t j = 0; j < in.getType()->getStruct()->size(); j++) {
                         baseLoc = (*in.getType()->getStruct())[j].type->getQualifier().hasLocation() ?
                             (*in.getType()->getStruct())[j].type->getQualifier().layoutLocation : baseLoc;
-                        if (baseLoc != -1) {
+                        if (baseLoc != std::numeric_limits<unsigned int>::max()) {
                             bool isMemberFound = false;
                             for (auto outIt : pipeOut) {
                                 if (baseLoc == outIt.second->getType()->getQualifier().layoutLocation) {
@@ -350,4 +352,4 @@ INSTANTIATE_TEST_SUITE_P(
 
 }  // anonymous namespace
 }  // namespace glslangtest
-#endif 
\ No newline at end of file
+#endif