commit 139b90912c38ecf3f0c6d4e76d3595bd7463cefa
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:06 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:50 2013 -0400
tree c33a724759a6f68cb8d71f71a48934d3e2f3f9c8
parent ce79dda155d3c22fb1527ac4150a8671d81f9f5f

Simplify the gl::Varying struct to be more like sh::Varying.

The subsequent patches will remove gl::Varying entirely.

TRAC #23746

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 972d10a..f5d3830 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -3643,18 +3643,42 @@
     }
 }
 
+InterpolationType getInterpolationType(TQualifier qualifier)
+{
+    switch (qualifier)
+    {
+      case EvqFlatIn:
+      case EvqFlatOut:
+        return INTERPOLATION_FLAT;
+
+      case EvqSmoothIn:
+      case EvqSmoothOut:
+      case EvqVertexOut:
+      case EvqFragmentIn:
+        return INTERPOLATION_SMOOTH;
+
+      case EvqCentroidIn:
+      case EvqCentroidOut:
+        return INTERPOLATION_CENTROID;
+
+      default: UNREACHABLE();
+        return INTERPOLATION_SMOOTH;
+    }
+}
+
 void OutputHLSL::declareVaryingToList(const TType &type, const TString &name, std::vector<Varying>& fieldsOut)
 {
     const TStructure *structure = type.getStruct();
 
+    InterpolationType interpolation = getInterpolationType(type.getQualifier());
     if (!structure)
     {
-        Varying varying(glVariableType(type), glVariablePrecision(type), name.c_str(), (unsigned int)type.getArraySize());
+        Varying varying(glVariableType(type), glVariablePrecision(type), name.c_str(), (unsigned int)type.getArraySize(), interpolation);
         fieldsOut.push_back(varying);
     }
     else
     {
-        Varying structVarying(GL_NONE, GL_NONE, name.c_str(), (unsigned int)type.getArraySize());
+        Varying structVarying(GL_NONE, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), interpolation);
         const TFieldList &fields = structure->fields();
 
         for (size_t fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)

src/compiler/ShaderVariable.cpp

diff --git a/src/compiler/ShaderVariable.cpp b/src/compiler/ShaderVariable.cpp
index efc3582..14dcd23 100644
--- a/src/compiler/ShaderVariable.cpp
+++ b/src/compiler/ShaderVariable.cpp
@@ -41,8 +41,9 @@
 {
 }
 
-Varying::Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn)
-    : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn)
+Varying::Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, InterpolationType interpolationIn)
+    : ShaderVariable(typeIn, precisionIn, nameIn, arraySizeIn),
+      interpolation(interpolationIn)
 {
 }
 

src/compiler/ShaderVariable.h

diff --git a/src/compiler/ShaderVariable.h b/src/compiler/ShaderVariable.h
index 1f88967..b68b663 100644
--- a/src/compiler/ShaderVariable.h
+++ b/src/compiler/ShaderVariable.h
@@ -17,6 +17,13 @@
 namespace sh
 {
 
+enum InterpolationType
+{
+    INTERPOLATION_SMOOTH,
+    INTERPOLATION_CENTROID,
+    INTERPOLATION_FLAT
+};
+
 struct ShaderVariable
 {
     GLenum type;
@@ -57,9 +64,10 @@
 
 struct Varying : public ShaderVariable
 {
+    InterpolationType interpolation;
     std::vector<Varying> fields;
 
-    Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn);
+    Varying(GLenum typeIn, GLenum precisionIn, const char *nameIn, unsigned int arraySizeIn, InterpolationType interpolationIn);
 
     bool isStruct() const { return !fields.empty(); }
 };