diff options
author | Andrew Knight <andrew.knight@digia.com> | 2014-09-25 13:22:55 +0300 |
---|---|---|
committer | Andrew Knight <andrew.knight@digia.com> | 2014-09-29 16:09:29 +0200 |
commit | 311157c3c6849e8efccd88f7594bb34c570a6780 (patch) | |
tree | a50c252b638488326529c0e69aa05e42abce7462 /src/3rdparty/angle/src/compiler/translator/UniformHLSL.h | |
parent | 04d3a89e20d49a3b5015b071bfdedc81973b090c (diff) |
ANGLE: Upgrade to 2.1~abce76206141
Upgrade to address issues discovered since the last upgrade.
Patch notes:
0000-General-fixes-for-ANGLE-2.1.patch
added removal of the unused third-party tracing functions
0003-Fix-compilation-with-MinGW-gcc-64-bit.patch
removed as it is no longer needed
0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
removed as it is no longer needed
0016-ANGLE-Fix-compilation-with-MinGW-D3D11.patch
now supports MinGW 64-bit
[ChangeLog][Third-party libraries] ANGLE updated to 2.1~f8602ad91e4f
Task-number: QTBUG-40649
Task-number: QTBUG-40658
Task-number: QTBUG-41031
Task-number: QTBUG-41081
Task-number: QTBUG-41308
Task-number: QTBUG-41563
Change-Id: I9f776c8d5cb94ddb12d608a8d5630bfc54437bea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/UniformHLSL.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/UniformHLSL.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/UniformHLSL.h b/src/3rdparty/angle/src/compiler/translator/UniformHLSL.h index 835b1ef2c8..91fa51588b 100644 --- a/src/3rdparty/angle/src/compiler/translator/UniformHLSL.h +++ b/src/3rdparty/angle/src/compiler/translator/UniformHLSL.h @@ -10,7 +10,6 @@ #ifndef TRANSLATOR_UNIFORMHLSL_H_ #define TRANSLATOR_UNIFORMHLSL_H_ -#include "common/shadervars.h" #include "compiler/translator/Types.h" namespace sh @@ -20,7 +19,7 @@ class StructureHLSL; class UniformHLSL { public: - UniformHLSL(StructureHLSL *structureHLSL, ShShaderOutput outputType); + UniformHLSL(StructureHLSL *structureHLSL, TranslatorHLSL *translator); void reserveUniformRegisters(unsigned int registerCount); void reserveInterfaceBlockRegisters(unsigned int registerCount); @@ -30,8 +29,6 @@ class UniformHLSL // Used for direct index references static TString interfaceBlockInstanceString(const TInterfaceBlock& interfaceBlock, unsigned int arrayIndex); - const std::vector<Uniform> &getUniforms() const { return mActiveUniforms; } - const std::vector<InterfaceBlock> &getInterfaceBlocks() const { return mActiveInterfaceBlocks; } const std::map<std::string, unsigned int> &getInterfaceBlockRegisterMap() const { return mInterfaceBlockRegisterMap; @@ -45,6 +42,7 @@ class UniformHLSL TString interfaceBlockString(const TInterfaceBlock &interfaceBlock, unsigned int registerIndex, unsigned int arrayIndex); TString interfaceBlockMembersString(const TInterfaceBlock &interfaceBlock, TLayoutBlockStorage blockStorage); TString interfaceBlockStructString(const TInterfaceBlock &interfaceBlock); + const Uniform *findUniformByName(const TString &name) const; // Returns the uniform's register index unsigned int declareUniformAndAssignRegister(const TType &type, const TString &name); @@ -55,8 +53,7 @@ class UniformHLSL StructureHLSL *mStructureHLSL; ShShaderOutput mOutputType; - std::vector<Uniform> mActiveUniforms; - std::vector<InterfaceBlock> mActiveInterfaceBlocks; + const std::vector<Uniform> &mUniforms; std::map<std::string, unsigned int> mInterfaceBlockRegisterMap; std::map<std::string, unsigned int> mUniformRegisterMap; }; |