commit f257598999faf907a50d8a9f9eff28dad0ff2628
author Jamie Madill <jmadill@chromium.org> Wed Jun 25 16:04:54 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Jun 26 14:36:11 2014 +0000
tree d7b1c61d1ead0fca4e22f70a1405c566efe9e039
parent bb94f341d22734ab581d718513de0ce30a03440f

Use the sh namespace for shader variables.

Since these types originate from the translator, use an appropriate
namespace. Also rename some of the gl helper functions to be more
specific to their functionality.

BUG=angle:466

Change-Id: Idc29987b2053b3c40748dd46b581f3dbd8a6fd61
Reviewed-on: https://chromium-review.googlesource.com/204680
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 4783e59..5974afb 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -212,27 +212,27 @@
     return mBody;
 }
 
-const std::vector<gl::Uniform> &OutputHLSL::getUniforms()
+const std::vector<sh::Uniform> &OutputHLSL::getUniforms()
 {
     return mUniformHLSL->getUniforms();
 }
 
-const std::vector<gl::InterfaceBlock> &OutputHLSL::getInterfaceBlocks() const
+const std::vector<sh::InterfaceBlock> &OutputHLSL::getInterfaceBlocks() const
 {
     return mUniformHLSL->getInterfaceBlocks();
 }
 
-const std::vector<gl::Attribute> &OutputHLSL::getOutputVariables() const
+const std::vector<sh::Attribute> &OutputHLSL::getOutputVariables() const
 {
     return mActiveOutputVariables;
 }
 
-const std::vector<gl::Attribute> &OutputHLSL::getAttributes() const
+const std::vector<sh::Attribute> &OutputHLSL::getAttributes() const
 {
     return mActiveAttributes;
 }
 
-const std::vector<gl::Varying> &OutputHLSL::getVaryings() const
+const std::vector<sh::Varying> &OutputHLSL::getVaryings() const
 {
     return mActiveVaryings;
 }
@@ -325,7 +325,7 @@
 
         attributes += "static " + TypeString(type) + " " + Decorate(name) + ArrayString(type) + " = " + initializer(type) + ";\n";
 
-        gl::Attribute attributeVar(GLVariableType(type), GLVariablePrecision(type), name.c_str(),
+        sh::Attribute attributeVar(GLVariableType(type), GLVariablePrecision(type), name.c_str(),
                                (unsigned int)type.getArraySize(), type.getLayoutQualifier().location);
         mActiveAttributes.push_back(attributeVar);
     }
@@ -365,7 +365,7 @@
                 out << "static " + TypeString(variableType) + " out_" + variableName + ArrayString(variableType) +
                        " = " + initializer(variableType) + ";\n";
 
-                gl::Attribute outputVar(GLVariableType(variableType), GLVariablePrecision(variableType), variableName.c_str(),
+                sh::Attribute outputVar(GLVariableType(variableType), GLVariablePrecision(variableType), variableName.c_str(),
                                     (unsigned int)variableType.getArraySize(), layoutQualifier.location);
                 mActiveOutputVariables.push_back(outputVar);
             }
@@ -2895,19 +2895,19 @@
     return constUnion;
 }
 
-void OutputHLSL::declareVaryingToList(const TType &type, TQualifier baseTypeQualifier, const TString &name, std::vector<gl::Varying>& fieldsOut)
+void OutputHLSL::declareVaryingToList(const TType &type, TQualifier baseTypeQualifier, const TString &name, std::vector<Varying> &fieldsOut)
 {
     const TStructure *structure = type.getStruct();
 
-    gl::InterpolationType interpolation = GetInterpolationType(baseTypeQualifier);
+    InterpolationType interpolation = GetInterpolationType(baseTypeQualifier);
     if (!structure)
     {
-        gl::Varying varying(GLVariableType(type), GLVariablePrecision(type), name.c_str(), (unsigned int)type.getArraySize(), interpolation);
+        sh::Varying varying(GLVariableType(type), GLVariablePrecision(type), name.c_str(), (unsigned int)type.getArraySize(), interpolation);
         fieldsOut.push_back(varying);
     }
     else
     {
-        gl::Varying structVarying(GL_STRUCT_ANGLEX, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), interpolation);
+        sh::Varying structVarying(GL_STRUCT_ANGLEX, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), interpolation);
         const TFieldList &fields = structure->fields();
 
         structVarying.structName = structure->name().c_str();