diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-01-31 16:21:39 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-01-31 16:21:39 +0000 |
| commit | 39df94a7ea93456e06d97f0efbca1c5d210b0f0d (patch) | |
| tree | f211fdffffc34fa35bb7ecbaad85a78f704e78f5 /Graphics/GraphicsEngineOpenGL | |
| parent | Updated SPIRV-Tools module (fixes https://github.com/DiligentGraphics/Diligen... (diff) | |
| download | DiligentCore-39df94a7ea93456e06d97f0efbca1c5d210b0f0d.tar.gz DiligentCore-39df94a7ea93456e06d97f0efbca1c5d210b0f0d.zip | |
Updated HashMapStringKey to define Hasher in the struct rather than in std
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h index 0a962da6..5cf2efe0 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h @@ -253,7 +253,7 @@ namespace Diligent return Index < m_VariablesByIndex.size() ? m_VariablesByIndex[Index] : nullptr; } - const std::unordered_map<HashMapStringKey, CGLShaderVariable>& GetVariables(){return m_VariableHash;} + const std::unordered_map<HashMapStringKey, CGLShaderVariable, HashMapStringKey::Hasher>& GetVariables(){return m_VariableHash;} Uint32 GetVariableCount()const { @@ -272,8 +272,8 @@ namespace Diligent std::vector<StorageBlockInfo> m_StorageBlocks; /// Hash map to look up shader variables by name. - std::unordered_map<HashMapStringKey, CGLShaderVariable> m_VariableHash; - std::vector<CGLShaderVariable*> m_VariablesByIndex; + std::unordered_map<HashMapStringKey, CGLShaderVariable, HashMapStringKey::Hasher> m_VariableHash; + std::vector<CGLShaderVariable*> m_VariablesByIndex; // When adding new member DO NOT FORGET TO UPDATE GLProgramResources( GLProgramResources&& ProgramResources )!!! }; } |