commit 12b0b399aaa22d0f5df0784997753f74ecdb8e36
author Olli Etuaho <oetuaho@nvidia.com> Tue May 30 13:22:31 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Mon Jun 19 09:26:56 2017 +0000
tree 86ac632c3a94f135d6705e7e91e02f64ed9b3a96
parent bb1b19b65d154d3a75161f74ff26868aa058fdb8

Clean up ValidateOutputs

Remove the validateOutputs method from Compiler and replace it with a
static method alongside the traverser. This encapsulates the
ValidateOutputs implementation better.

TEST=angle_unittests
BUG=angleproject:2068

Change-Id: I1788cb9726db41ca35fd0e746f8d48ced7fee74f
Reviewed-on: https://chromium-review.googlesource.com/535477
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index 46da806..909bb96 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -366,7 +366,10 @@
             PruneEmptyDeclarations(root);
 
         if (success && shaderVersion >= 300 && shaderType == GL_FRAGMENT_SHADER)
-            success = validateOutputs(root);
+        {
+            success = ValidateOutputs(root, getExtensionBehavior(), compileResources.MaxDrawBuffers,
+                                      &mDiagnostics);
+        }
 
         if (success && shouldRunLoopAndIndexingValidation(compileOptions))
             success =
@@ -874,14 +877,6 @@
     return true;
 }
 
-bool TCompiler::validateOutputs(TIntermNode *root)
-{
-    ValidateOutputs validateOutputs(getExtensionBehavior(), compileResources.MaxDrawBuffers);
-    root->traverse(&validateOutputs);
-    validateOutputs.validate(&mDiagnostics);
-    return (mDiagnostics.numErrors() == 0);
-}
-
 bool TCompiler::limitExpressionComplexity(TIntermBlock *root)
 {
     TMaxDepthTraverser traverser(maxExpressionComplexity + 1);