commit 32aab01d18a18be97b12833e9ecf7157d6320abd
author Jamie Madill <jmadill@chromium.org> Tue Jan 27 14:12:26 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Jan 28 14:50:02 2015 +0000
tree 1c8cfe877d866b3cfa94cacd1523cae35c0fa831
parent 167036a902316e57fdba3085588f04069fb136b3

Use a stack for OutputHLSL info log output.

Previously we would always reference mBody in several intermediate
output methods. This made using these traversals from within the
header, or for utility methods, very difficult. Instead, use a stack
where we write to the top InfoLog, and can push/pop from the stack.
This gives us more flexibility.

BUG=angle:878

Change-Id: I8a6c0382bad18b44d75158274c701db13d4d4e65
Reviewed-on: https://chromium-review.googlesource.com/243580
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/OutputHLSL.cpp

diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index cb2c9f7..6ff6700 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -172,8 +172,15 @@
 
     BuiltInFunctionEmulatorHLSL builtInFunctionEmulator;
     builtInFunctionEmulator.MarkBuiltInFunctionsForEmulation(mContext.treeRoot);
-    mContext.treeRoot->traverse(this);   // Output the body first to determine what has to go in the header
+
+    // Output the body first to determine what has to go in the header
+    mInfoSinkStack.push(&mBody);
+    mContext.treeRoot->traverse(this);
+    mInfoSinkStack.pop();
+
+    mInfoSinkStack.push(&mHeader);
     header(&builtInFunctionEmulator);
+    mInfoSinkStack.pop();
 
     TInfoSinkBase& sink = mContext.infoSink().obj;
     sink << mHeader.c_str();
@@ -188,10 +195,14 @@
     {
         TIntermTyped *flaggedNode = flaggedStructs[structIndex];
 
+        TInfoSinkBase structInfoSink;
+        mInfoSinkStack.push(&structInfoSink);
+
         // This will mark the necessary block elements as referenced
         flaggedNode->traverse(this);
-        TString structName(mBody.c_str());
-        mBody.erase();
+
+        TString structName(structInfoSink.c_str());
+        mInfoSinkStack.pop();
 
         mFlaggedStructOriginalNames[flaggedNode] = structName;
 
@@ -204,11 +215,6 @@
     }
 }
 
-TInfoSinkBase &OutputHLSL::getBodyStream()
-{
-    return mBody;
-}
-
 const std::map<std::string, unsigned int> &OutputHLSL::getInterfaceBlockRegisterMap() const
 {
     return mUniformHLSL->getInterfaceBlockRegisterMap();
@@ -270,7 +276,7 @@
 
 void OutputHLSL::header(const BuiltInFunctionEmulatorHLSL *builtInFunctionEmulator)
 {
-    TInfoSinkBase &out = mHeader;
+    TInfoSinkBase &out = getInfoSink();
 
     TString varyings;
     TString attributes;
@@ -1210,7 +1216,7 @@
 
 void OutputHLSL::visitSymbol(TIntermSymbol *node)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     // Handle accessing std140 structs by value
     if (mFlaggedStructMappedNames.count(node) > 0)
@@ -1309,12 +1315,12 @@
 
 void OutputHLSL::visitRaw(TIntermRaw *node)
 {
-    mBody << node->getRawText();
+    getInfoSink() << node->getRawText();
 }
 
 bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     // Handle accessing std140 structs by value
     if (mFlaggedStructMappedNames.count(node) > 0)
@@ -1721,7 +1727,7 @@
 
 bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     switch (node->getOp())
     {
@@ -2160,7 +2166,7 @@
 
 bool OutputHLSL::visitSelection(Visit visit, TIntermSelection *node)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     if (node->usesTernaryOperator())
     {
@@ -2255,7 +2261,7 @@
         }
     }
 
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     if (node->getType() == ELoopDoWhile)
     {
@@ -2321,7 +2327,7 @@
 
 bool OutputHLSL::visitBranch(Visit visit, TIntermBranch *node)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     switch (node->getFlowOp())
     {
@@ -2423,7 +2429,7 @@
 bool OutputHLSL::handleExcessiveLoop(TIntermLoop *node)
 {
     const int MAX_LOOP_ITERATIONS = 254;
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     // Parse loops of the form:
     // for(int index = initial; index [comparator] limit; index += increment)
@@ -2625,7 +2631,7 @@
 
 void OutputHLSL::outputTriplet(Visit visit, const TString &preString, const TString &inString, const TString &postString)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     if (visit == PreVisit)
     {
@@ -2645,15 +2651,17 @@
 {
     if ((mContext.compileOptions & SH_LINE_DIRECTIVES) && (line > 0))
     {
-        mBody << "\n";
-        mBody << "#line " << line;
+        TInfoSinkBase &out = getInfoSink();
+
+        out << "\n";
+        out << "#line " << line;
 
         if (mContext.sourcePath)
         {
-            mBody << " \"" << mContext.sourcePath << "\"";
+            out << " \"" << mContext.sourcePath << "\"";
         }
 
-        mBody << "\n";
+        out << "\n";
     }
 }
 
@@ -2701,7 +2709,7 @@
 
 void OutputHLSL::outputConstructor(Visit visit, const TType &type, const TString &name, const TIntermSequence *parameters)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     if (visit == PreVisit)
     {
@@ -2721,7 +2729,7 @@
 
 const ConstantUnion *OutputHLSL::writeConstantUnion(const TType &type, const ConstantUnion *constUnion)
 {
-    TInfoSinkBase &out = mBody;
+    TInfoSinkBase &out = getInfoSink();
 
     const TStructure* structure = type.getStruct();
     if (structure)