commit c8fbbab419a68975d221562f96f8f6ae734f8004
author Dejan Mircevski <deki@google.com> Mon Jan 11 14:48:36 2016 -0500
committer Dejan Mircevski <deki@google.com> Mon Jan 11 14:48:36 2016 -0500
tree e698e1ec061bdf4b136eb2f245b35180f132e604
parent 7819bee82c5caafba1f2fdae2b8f1a9a9419bd67

Update .out files with new loop SPIR-V.

Also update breakForLoop and call builder.closeLoop() in code
generation.

Remove dead code.

Change-Id: Ic8ce5b208530f8787989ef45a2efa405f1b45310

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 06ab094..e5e2169 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -142,7 +142,6 @@
     std::unordered_map<const glslang::TTypeList*, spv::Id> structMap;
     std::unordered_map<const glslang::TTypeList*, std::vector<int> > memberRemapper;  // for mapping glslang block indices to spv indices (e.g., due to hidden members)
     std::stack<bool> breakForLoop;  // false means break for switch
-    std::stack<glslang::TIntermTyped*> loopTerminal;  // code from the last part of a for loop: for(...; ...; terminal), needed for e.g., continue };
 };
 
 //
@@ -1354,10 +1353,12 @@
         builder.createLoopMerge(&blocks.merge, &blocks.continue_target, spv::LoopControlMaskNone);
         builder.createConditionalBranch(condition, &blocks.body, &blocks.merge);
 
+        breakForLoop.push(true);
         builder.setBuildPoint(&blocks.body);
         if (node->getBody())
             node->getBody()->traverse(this);
         builder.createBranch(&blocks.continue_target);
+        breakForLoop.pop();
 
         builder.setBuildPoint(&blocks.continue_target);
         if (node->getTerminal())
@@ -1366,10 +1367,12 @@
     } else {
         builder.createBranch(&blocks.body);
 
+        breakForLoop.push(true);
         builder.setBuildPoint(&blocks.body);
         if (node->getBody())
             node->getBody()->traverse(this);
         builder.createBranch(&blocks.continue_target);
+        breakForLoop.pop();
 
         builder.setBuildPoint(&blocks.continue_target);
         if (node->getTerminal())
@@ -1387,6 +1390,7 @@
     }
 
     builder.setBuildPoint(&blocks.merge);
+    builder.closeLoop();
     return false;
 }
 
@@ -1406,8 +1410,6 @@
             builder.addSwitchBreak();
         break;
     case glslang::EOpContinue:
-        if (loopTerminal.top())
-            loopTerminal.top()->traverse(this);
         builder.createLoopContinue();
         break;
     case glslang::EOpReturn: