Fix not rewriting else-if blocks.

We would miss expanding the else-if clauses in a chain of selection statements. BUG=346463 BUG=391697 Change-Id: Iee644b875cf68d0ed3dc0b73542efc49ecb23242 Reviewed-on: https://chromium-review.googlesource.com/206822Reviewed-by: Nicolas Capens <capn@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/207832

Fix not rewriting else-if blocks.
5ec99a79 · Jamie Madill · b3319dfe · 5ec99a79
Commit 5ec99a79 authored Feb 26, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

RewriteElseBlocks.cpp src/compiler/translator/RewriteElseBlocks.cpp +8 -0

No files found.
--- a/src/compiler/translator/RewriteElseBlocks.cpp
+++ b/src/compiler/translator/RewriteElseBlocks.cpp
@@ -48,6 +48,14 @@ bool ElseBlockRewriter::visitAggregate(Visit visit, TIntermAggregate *node)
                TIntermSelection *selection = statement->getAsSelectionNode();
                if (selection && selection->getFalseBlock() != NULL)
                {
+                    // Check for if / else if
+                    TIntermSelection *elseIfBranch = selection->getFalseBlock()->getAsSelectionNode();
+                    if (elseIfBranch)
+                    {
+                        selection->replaceChildNode(elseIfBranch, rewriteSelection(elseIfBranch));
+                        delete elseIfBranch;
+                    }
+
                    node->getSequence()[statementIndex] = rewriteSelection(selection);
                    delete selection;
                }