diff options
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/VariableInfo.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/VariableInfo.h | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/VariableInfo.h b/src/3rdparty/angle/src/compiler/translator/VariableInfo.h index 37216cd142..3771819c8b 100644 --- a/src/3rdparty/angle/src/compiler/translator/VariableInfo.h +++ b/src/3rdparty/angle/src/compiler/translator/VariableInfo.h @@ -7,40 +7,37 @@ #ifndef COMPILER_VARIABLE_INFO_H_ #define COMPILER_VARIABLE_INFO_H_ -#include "GLSLANG/ShaderLang.h" #include "compiler/translator/intermediate.h" - -// Provides information about a variable. -// It is currently being used to store info about active attribs and uniforms. -struct TVariableInfo { - TVariableInfo(ShDataType type, int size); - TVariableInfo(); - - TPersistString name; - TPersistString mappedName; - ShDataType type; - int size; - bool isArray; - TPrecision precision; - bool staticUse; -}; -typedef std::vector<TVariableInfo> TVariableInfoList; +#include "common/shadervars.h" // Traverses intermediate tree to collect all attributes, uniforms, varyings. -class CollectVariables : public TIntermTraverser { -public: - CollectVariables(TVariableInfoList& attribs, - TVariableInfoList& uniforms, - TVariableInfoList& varyings, +class CollectVariables : public TIntermTraverser +{ + public: + CollectVariables(std::vector<sh::Attribute> *attribs, + std::vector<sh::Attribute> *outputVariables, + std::vector<sh::Uniform> *uniforms, + std::vector<sh::Varying> *varyings, + std::vector<sh::InterfaceBlock> *interfaceBlocks, ShHashFunction64 hashFunction); - virtual void visitSymbol(TIntermSymbol*); - virtual bool visitAggregate(Visit, TIntermAggregate*); + virtual void visitSymbol(TIntermSymbol *symbol); + virtual bool visitAggregate(Visit, TIntermAggregate *node); + + private: + template <typename VarT> + void visitVariable(const TIntermSymbol *variable, std::vector<VarT> *infoList) const; -private: - TVariableInfoList& mAttribs; - TVariableInfoList& mUniforms; - TVariableInfoList& mVaryings; + template <typename VarT> + void visitInfoList(const TIntermSequence &sequence, std::vector<VarT> *infoList) const; + + std::vector<sh::Attribute> *mAttribs; + std::vector<sh::Attribute> *mOutputVariables; + std::vector<sh::Uniform> *mUniforms; + std::vector<sh::Varying> *mVaryings; + std::vector<sh::InterfaceBlock> *mInterfaceBlocks; + + std::map<std::string, sh::InterfaceBlockField *> mInterfaceBlockFields; bool mPointCoordAdded; bool mFrontFacingAdded; @@ -49,4 +46,9 @@ private: ShHashFunction64 mHashFunction; }; +// 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_ |