Rename VariableInfo files to CollectVariables

src/compiler.gypi

@@ -36,6 +36,8 @@
             'compiler/translator/ClampPointSize.cpp',
             'compiler/translator/ClampPointSize.h',
             'compiler/translator/CodeGen.cpp',
+            'compiler/translator/CollectVariables.cpp',
+            'compiler/translator/CollectVariables.h',
             'compiler/translator/Common.h',
             'compiler/translator/Compiler.cpp',
             'compiler/translator/Compiler.h',
@@ -149,8 +151,6 @@
             'compiler/translator/ValidateOutputs.h',
             'compiler/translator/ValidateSwitch.cpp',
             'compiler/translator/ValidateSwitch.h',
-            'compiler/translator/VariableInfo.cpp',
-            'compiler/translator/VariableInfo.h',
             'compiler/translator/VariablePacker.cpp',
             'compiler/translator/VariablePacker.h',
             'compiler/translator/blocklayout.cpp',

src/compiler/translator/CallDAG.h

@@ -14,7 +14,6 @@
 #include <map>
 
 #include "compiler/translator/IntermNode.h"
-#include "compiler/translator/VariableInfo.h"
 
 namespace sh
 {

src/compiler/translator/VariableInfo.cpp → src/compiler/translator/CollectVariables.cpp

@@ -3,8 +3,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// CollectVariables.cpp: Collect lists of shader interface variables based on the AST.
 
-#include "compiler/translator/VariableInfo.h"
+#include "compiler/translator/CollectVariables.h"
 
 #include "angle_gl.h"
 #include "common/utilities.h"
@@ -540,7 +541,7 @@ InterfaceBlock CollectVariablesTraverser::recordInterfaceBlock(const TIntermSymb
     ASSERT(blockType);
 
     InterfaceBlock interfaceBlock;
-    interfaceBlock.name = blockType->name().c_str();
+    interfaceBlock.name       = blockType->name().c_str();
     interfaceBlock.mappedName = HashName(blockType->name().c_str(), mHashFunction).c_str();
     interfaceBlock.instanceName =
         (blockType->hasInstanceName() ? blockType->instanceName().c_str() : "");
@@ -568,7 +569,7 @@ Uniform CollectVariablesTraverser::recordUniform(const TIntermSymbol &variable)
 {
     Uniform uniform;
     setCommonVariableProperties(variable.getType(), variable.getSymbol(), &uniform);
-    uniform.binding = variable.getType().getLayoutQualifier().binding;
+    uniform.binding  = variable.getType().getLayoutQualifier().binding;
     uniform.location = variable.getType().getLayoutQualifier().location;
     uniform.offset   = variable.getType().getLayoutQualifier().offset;
     return uniform;

src/compiler/translator/VariableInfo.h → src/compiler/translator/CollectVariables.h

@@ -3,9 +3,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// CollectVariables.h: Collect lists of shader interface variables based on the AST.
 
-#ifndef COMPILER_TRANSLATOR_VARIABLEINFO_H_
-#define COMPILER_TRANSLATOR_VARIABLEINFO_H_
+#ifndef COMPILER_TRANSLATOR_COLLECTVARIABLES_H_
+#define COMPILER_TRANSLATOR_COLLECTVARIABLES_H_
 
 #include <GLSLANG/ShaderLang.h>
 
@@ -31,4 +32,4 @@ void CollectVariables(TIntermBlock *root,
                       const TExtensionBehavior &extensionBehavior);
 }
 
-#endif  // COMPILER_TRANSLATOR_VARIABLEINFO_H_
+#endif  // COMPILER_TRANSLATOR_COLLECTVARIABLES_H_

src/compiler/translator/Compiler.cpp

@@ -14,6 +14,7 @@
 #include "compiler/translator/Cache.h"
 #include "compiler/translator/CallDAG.h"
 #include "compiler/translator/ClampPointSize.h"
+#include "compiler/translator/CollectVariables.h"
 #include "compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h"
 #include "compiler/translator/DeferGlobalInitializers.h"
 #include "compiler/translator/EmulateGLFragColorBroadcast.h"

src/compiler/translator/Compiler.h

@@ -14,6 +14,8 @@
 // This should not be included by driver code.
 //
 
+#include <GLSLANG/ShaderVars.h>
+
 #include "compiler/translator/BuiltInFunctionEmulator.h"
 #include "compiler/translator/CallDAG.h"
 #include "compiler/translator/Diagnostics.h"
@@ -22,7 +24,6 @@
 #include "compiler/translator/InfoSink.h"
 #include "compiler/translator/Pragma.h"
 #include "compiler/translator/SymbolTable.h"
-#include "compiler/translator/VariableInfo.h"
 #include "third_party/compiler/ArrayBoundsClamper.h"
 
 namespace sh