Treat return statements in loops as loop discontinuities.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1719
+#define BUILD_REVISION 1722
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/DetectDiscontinuity.cpp

@@ -16,11 +16,26 @@ namespace sh
 {
 bool DetectLoopDiscontinuity::traverse(TIntermNode *node)
 {
+    mLoopDepth = 0;
     mLoopDiscontinuity = false;
     node->traverse(this);
     return mLoopDiscontinuity;
 }
 
+bool DetectLoopDiscontinuity::visitLoop(Visit visit, TIntermLoop *loop)
+{
+    if (visit == PreVisit)
+    {
+        ++mLoopDepth;
+    }
+    else if (visit == PostVisit)
+    {
+        --mLoopDepth;
+    }
+
+    return true;
+}
+
 bool DetectLoopDiscontinuity::visitBranch(Visit visit, TIntermBranch *node)
 {
     if (mLoopDiscontinuity)
@@ -28,14 +43,19 @@ bool DetectLoopDiscontinuity::visitBranch(Visit visit, TIntermBranch *node)
         return false;
     }
 
+    if (!mLoopDepth)
+    {
+        return true;
+    }
+
     switch (node->getFlowOp())
     {
       case EOpKill:
         break;
       case EOpBreak:
       case EOpContinue:
-        mLoopDiscontinuity = true;
       case EOpReturn:
+        mLoopDiscontinuity = true;
         break;
       default: UNREACHABLE();
     }

src/compiler/DetectDiscontinuity.h

@@ -23,8 +23,10 @@ class DetectLoopDiscontinuity : public TIntermTraverser
 
   protected:
     bool visitBranch(Visit visit, TIntermBranch *node);
+    bool visitLoop(Visit visit, TIntermLoop *loop);
     bool visitAggregate(Visit visit, TIntermAggregate *node);
 
+    int mLoopDepth;
     bool mLoopDiscontinuity;
 };
 

src/compiler/OutputHLSL.cpp

@@ -118,7 +118,7 @@ OutputHLSL::~OutputHLSL()
 
 void OutputHLSL::output()
 {
-    mContainsLoopDiscontinuity = containsLoopDiscontinuity(mContext.treeRoot);
+    mContainsLoopDiscontinuity = mContext.shaderType == SH_FRAGMENT_SHADER && containsLoopDiscontinuity(mContext.treeRoot);
 
     mContext.treeRoot->traverse(this);   // Output the body first to determine what has to go in the header
     header();
@@ -2075,7 +2075,7 @@ bool OutputHLSL::visitLoop(Visit visit, TIntermLoop *node)
 {
     bool wasDiscontinuous = mInsideDiscontinuousLoop;
 
-    if (!mInsideDiscontinuousLoop)
+    if (mContainsLoopDiscontinuity && !mInsideDiscontinuousLoop)
     {
         mInsideDiscontinuousLoop = containsLoopDiscontinuity(node);
     }