Clean up recording declarations in OutputHLSL

Relying on the AST conforming to known limitations makes the code for recording referenced varyings easier to understand. BUG=angleproject:2104 TEST=angle_end2end_tests Change-Id: Icdcd7602f6ed54fa439f989bf256e261627d11f5 Reviewed-on: https://chromium-review.googlesource.com/568018Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Clean up recording declarations in OutputHLSL
282847e9 · Olli Etuaho · Commit Bot · dde78e8c · 282847e9
Commit 282847e9 authored Jul 12, 2017 by Olli Etuaho Committed by Commit Bot Jul 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 17 deletions

OutputHLSL.cpp src/compiler/translator/OutputHLSL.cpp +8 -17

No files found.
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -1644,9 +1644,9 @@ bool OutputHLSL::visitDeclaration(Visit visit, TIntermDeclaration *node)
        TIntermSequence *sequence = node->getSequence();
        TIntermTyped *variable    = (*sequence)[0]->getAsTyped();
        ASSERT(sequence->size() == 1);
+        ASSERT(variable);
-        if (variable &&
+        if ((variable->getQualifier() == EvqTemporary || variable->getQualifier() == EvqGlobal ||
-            (variable->getQualifier() == EvqTemporary || variable->getQualifier() == EvqGlobal ||
             variable->getQualifier() == EvqConst))
        {
            ensureStructDefined(variable->getType());
@@ -1682,23 +1682,14 @@ bool OutputHLSL::visitDeclaration(Visit visit, TIntermDeclaration *node)
            else
                UNREACHABLE();
        }
-        else if (variable && IsVaryingOut(variable->getQualifier()))
+        else if (IsVaryingOut(variable->getQualifier()))
        {
-            for (TIntermSequence::iterator sit = sequence->begin(); sit != sequence->end(); sit++)
+            TIntermSymbol *symbol = variable->getAsSymbolNode();
-            {
+            ASSERT(symbol);  // Varying declarations can't have initializers.
-                TIntermSymbol *symbol = (*sit)->getAsSymbolNode();
-                if (symbol)
+            // Vertex outputs which are declared but not written to should still be declared to
-                {
+            // allow successful linking.
-                    // Vertex (output) varyings which are declared but not written to should
+            mReferencedVaryings[symbol->getSymbol()] = symbol;
-                    // still be declared to allow successful linking
-                    mReferencedVaryings[symbol->getSymbol()] = symbol;
-                }
-                else
-                {
-                    (*sit)->traverse(this);
-                }
-            }
        }
    }
    return false;