commit 94599669c4e464eaaf104828aa121497891dc71b
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:10 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 68984bd8013301621ea647cd84802c99e2c54a66
parent 86a97a1a16349438dc162573544b810178ea7d37

Ensure struct varyings maintain the proper interpolation qualifier for the child fields.

TRAC #23749

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 3c5b95e..4f3e83b 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -635,7 +635,7 @@
         varyings += "static " + interpolationString(type.getQualifier()) + " " + typeString(type) + " " +
                     decorate(name) + arrayString(type) + " = " + initializer(type) + ";\n";
 
-        declareVaryingToList(type, name, mActiveVaryings);
+        declareVaryingToList(type, type.getQualifier(), name, mActiveVaryings);
     }
 
     for (ReferencedSymbols::const_iterator attribute = mReferencedAttributes.begin(); attribute != mReferencedAttributes.end(); attribute++)
@@ -3646,11 +3646,11 @@
     }
 }
 
-void OutputHLSL::declareVaryingToList(const TType &type, const TString &name, std::vector<Varying>& fieldsOut)
+void OutputHLSL::declareVaryingToList(const TType &type, TQualifier baseTypeQualifier, const TString &name, std::vector<Varying>& fieldsOut)
 {
     const TStructure *structure = type.getStruct();
 
-    InterpolationType interpolation = getInterpolationType(type.getQualifier());
+    InterpolationType interpolation = getInterpolationType(baseTypeQualifier);
     if (!structure)
     {
         Varying varying(glVariableType(type), glVariablePrecision(type), name.c_str(), (unsigned int)type.getArraySize(), interpolation);
@@ -3664,7 +3664,7 @@
         for (size_t fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
         {
             const TField &field = *fields[fieldIndex];
-            declareVaryingToList(*field.type(), field.name(), structVarying.fields);
+            declareVaryingToList(*field.type(), baseTypeQualifier, field.name(), structVarying.fields);
         }
 
         fieldsOut.push_back(structVarying);