diff options
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/VariablePacker.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/VariablePacker.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/VariablePacker.h b/src/3rdparty/angle/src/compiler/translator/VariablePacker.h index fd6090827c..1de5332d8a 100644 --- a/src/3rdparty/angle/src/compiler/translator/VariablePacker.h +++ b/src/3rdparty/angle/src/compiler/translator/VariablePacker.h @@ -8,23 +8,23 @@ #define _VARIABLEPACKER_INCLUDED_ #include <vector> -#include "compiler/translator/ShHandle.h" +#include "compiler/translator/VariableInfo.h" class VariablePacker { public: // Returns true if the passed in variables pack in maxVectors following // the packing rules from the GLSL 1.017 spec, Appendix A, section 7. - bool CheckVariablesWithinPackingLimits( - int maxVectors, - const TVariableInfoList& in_variables); + template <typename VarT> + bool CheckVariablesWithinPackingLimits(unsigned int maxVectors, + const std::vector<VarT> &in_variables); // Gets how many components in a row a data type takes. - static int GetNumComponentsPerRow(ShDataType type); + static int GetNumComponentsPerRow(sh::GLenum type); // Gets how many rows a data type takes. - static int GetNumRows(ShDataType type); + static int GetNumRows(sh::GLenum type); - private: + private: static const int kNumColumns = 4; static const unsigned kColumnMask = (1 << kNumColumns) - 1; |