Clean redundant semicolons from HLSL branch statements

Branch statements can only exist inside block nodes. The block node that contains a branch will take care of writing a semicolon after each statement. BUG=angleproject:1013 TEST=angle_end2end_tests Change-Id: Ie5d9077c5d2e090c704282dba39b4d46845cbf1e Reviewed-on: https://chromium-review.googlesource.com/708894Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Clean redundant semicolons from HLSL branch statements
8886f0fc · Olli Etuaho · Commit Bot · 180f43c6 · 8886f0fc
Commit 8886f0fc authored Oct 10, 2017 by Olli Etuaho Committed by Commit Bot Oct 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 30 deletions

OutputHLSL.cpp src/compiler/translator/OutputHLSL.cpp +20 -30

No files found.
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -2262,16 +2262,16 @@ bool OutputHLSL::visitLoop(Visit visit, TIntermLoop *node)
 bool OutputHLSL::visitBranch(Visit visit, TIntermBranch *node)
 {
-    TInfoSinkBase &out = getInfoSink();
+    if (visit == PreVisit)
-    switch (node->getFlowOp())
    {
-        case EOpKill:
+        TInfoSinkBase &out = getInfoSink();
-            outputTriplet(out, visit, "discard;\n", "", "");
-            break;
+        switch (node->getFlowOp())
-        case EOpBreak:
+        {
-            if (visit == PreVisit)
+            case EOpKill:
-            {
+                out << "discard";
+                break;
+            case EOpBreak:
                if (mNestedLoopDepth > 1)
                {
                    mUsesNestedBreak = true;
@@ -2285,35 +2285,25 @@ bool OutputHLSL::visitBranch(Visit visit, TIntermBranch *node)
                }
                else
                {
-                    out << "break;\n";
+                    out << "break";
                }
-            }
+                break;
-            break;
+            case EOpContinue:
-        case EOpContinue:
+                out << "continue";
-            outputTriplet(out, visit, "continue;\n", "", "");
+                break;
-            break;
+            case EOpReturn:
-        case EOpReturn:
-            if (visit == PreVisit)
-            {
                if (node->getExpression())
                {
                    out << "return ";
                }
                else
                {
-                    out << "return;\n";
+                    out << "return";
                }
-            }
+                break;
-            else if (visit == PostVisit)
+            default:
-            {
+                UNREACHABLE();
-                if (node->getExpression())
+        }
-                {
-                    out << ";\n";
-                }
-            }
-            break;
-        default:
-            UNREACHABLE();
    }
    return true;