Store compact and expanded shader variables.

src/compiler/translator/Compiler.cpp

@@ -360,7 +360,9 @@ void TCompiler::clearResults()
     attributes.clear();
     outputVariables.clear();
     uniforms.clear();
+    expandedUniforms.clear();
     varyings.clear();
+    expandedVaryings.clear();
     interfaceBlocks.clear();
 
     builtInFunctionEmulator.Cleanup();
@@ -487,12 +489,17 @@ void TCompiler::collectVariables(TIntermNode* root)
 {
     CollectVariables collect(&attributes, &uniforms, &varyings, hashFunction);
     root->traverse(&collect);
+
+    // For backwards compatiblity with ShGetVariableInfo, expand struct
+    // uniforms and varyings into separate variables for each field.
+    ExpandVariables(uniforms, &expandedUniforms);
+    ExpandVariables(varyings, &expandedVaryings);
 }
 
 bool TCompiler::enforcePackingRestrictions()
 {
     VariablePacker packer;
-    return packer.CheckVariablesWithinPackingLimits(maxUniformVectors, uniforms);
+    return packer.CheckVariablesWithinPackingLimits(maxUniformVectors, expandedUniforms);
 }
 
 void TCompiler::initializeGLPosition(TIntermNode* root)

src/compiler/translator/Compiler.h

@@ -71,7 +71,9 @@ class TCompiler : public TShHandleBase
     const std::vector<sh::Attribute> &getAttributes() const { return attributes; }
     const std::vector<sh::Attribute> &getOutputVariables() const { return outputVariables; }
     const std::vector<sh::Uniform> &getUniforms() const { return uniforms; }
+    const std::vector<sh::Uniform> &getExpandedUniforms() const { return expandedUniforms; }
     const std::vector<sh::Varying> &getVaryings() const { return varyings; }
+    const std::vector<sh::Varying> &getExpandedVaryings() const { return expandedVaryings; }
     const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return interfaceBlocks; }
 
     ShHashFunction64 getHashFunction() const { return hashFunction; }
@@ -136,7 +138,9 @@ class TCompiler : public TShHandleBase
     std::vector<sh::Attribute> attributes;
     std::vector<sh::Attribute> outputVariables;
     std::vector<sh::Uniform> uniforms;
+    std::vector<sh::Uniform> expandedUniforms;
     std::vector<sh::Varying> varyings;
+    std::vector<sh::Varying> expandedVaryings;
     std::vector<sh::InterfaceBlock> interfaceBlocks;
 
   private:

src/compiler/translator/ShaderLang.cpp

@@ -64,9 +64,9 @@ static const sh::ShaderVariable *GetVariable(const TCompiler *compiler, ShShader
       case SH_ACTIVE_ATTRIBUTES:
         return ReturnVariable(compiler->getAttributes(), index);
       case SH_ACTIVE_UNIFORMS:
-        return ReturnVariable(compiler->getUniforms(), index);
+        return ReturnVariable(compiler->getExpandedUniforms(), index);
       case SH_VARYINGS:
-        return ReturnVariable(compiler->getVaryings(), index);
+        return ReturnVariable(compiler->getExpandedVaryings(), index);
       default:
         UNREACHABLE();
         return NULL;
@@ -250,7 +250,7 @@ void ShGetInfo(const ShHandle handle, ShShaderInfo pname, size_t* params)
         *params = compiler->getInfoSink().obj.size() + 1;
         break;
     case SH_ACTIVE_UNIFORMS:
-        *params = compiler->getUniforms().size();
+        *params = compiler->getExpandedUniforms().size();
         break;
     case SH_ACTIVE_UNIFORM_MAX_LENGTH:
         *params = 1 + GetGlobalMaxTokenSize(compiler->getShaderSpec());
@@ -262,7 +262,7 @@ void ShGetInfo(const ShHandle handle, ShShaderInfo pname, size_t* params)
         *params = 1 + GetGlobalMaxTokenSize(compiler->getShaderSpec());
         break;
     case SH_VARYINGS:
-        *params = compiler->getVaryings().size();
+        *params = compiler->getExpandedVaryings().size();
         break;
     case SH_VARYING_MAX_LENGTH:
         *params = 1 + GetGlobalMaxTokenSize(compiler->getShaderSpec());

src/compiler/translator/VariableInfo.h

@@ -11,8 +11,9 @@
 #include "common/shadervars.h"
 
 // Traverses intermediate tree to collect all attributes, uniforms, varyings.
-class CollectVariables : public TIntermTraverser {
-public:
+class CollectVariables : public TIntermTraverser
+{
+  public:
     CollectVariables(std::vector<sh::Attribute> *attribs,
                      std::vector<sh::Uniform> *uniforms,
                      std::vector<sh::Varying> *varyings,
@@ -21,7 +22,7 @@ public:
     virtual void visitSymbol(TIntermSymbol *symbol);
     virtual bool visitAggregate(Visit, TIntermAggregate *node);
 
-private:
+  private:
     std::vector<sh::Attribute> *mAttribs;
     std::vector<sh::Uniform> *mUniforms;
     std::vector<sh::Varying> *mVaryings;
@@ -39,4 +40,9 @@ private:
     void visitInfoList(const TIntermSequence &sequence, std::vector<VarT> *infoList) const;
 };
 
+// Expand struct variables to flattened lists of split variables
+// Implemented for sh::Varying and sh::Uniform.
+template <typename VarT>
+void ExpandVariables(const std::vector<VarT> &compact, std::vector<VarT> *expanded);
+
 #endif  // COMPILER_VARIABLE_INFO_H_