diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 06:05:40 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 06:05:40 +0000 |
| commit | 8491cede1c2162a18ecd29b6f9bdc53ca5a72ce2 (patch) | |
| tree | 12a57a9d03584d856bfcac399d660f17c62d0933 /Graphics/GraphicsEngineVulkan | |
| parent | Fixed Linux build error (diff) | |
| download | DiligentCore-8491cede1c2162a18ecd29b6f9bdc53ca5a72ce2.tar.gz DiligentCore-8491cede1c2162a18ecd29b6f9bdc53ca5a72ce2.zip | |
Fixed vexing gcc/clang liker error
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp index 1ad65aa3..44b75187 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp +++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp @@ -421,7 +421,7 @@ private: return reinterpret_cast<const char*>(SamplerDataEnd); } - static constexpr Uint32 InvalidResourceIndex = ~0u; + static constexpr const Uint32 InvalidResourceIndex = ~0u; // Maps resource name to its index in m_ResourceBuffer using ResourceNameToIndex_t = std::unordered_map<HashMapStringKey, Uint32, HashMapStringKey::Hasher>; diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp index 76bd77ee..8a48c27c 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp @@ -158,7 +158,7 @@ StringPool ShaderResourceLayoutVk::AllocateMemory(const std::vector<const Shader auto VarType = FindShaderVariableType(m_ShaderType, ResAttribs, ResourceLayoutDesc, CombinedSamplerSuffix); if (IsAllowedType(VarType, AllowedTypeBits)) { - bool IsUniqueName = UniqueNames.emplace(HashMapStringKey{ResAttribs.Name}, InvalidResourceIndex).second; + bool IsUniqueName = UniqueNames.emplace(HashMapStringKey{ResAttribs.Name}, Uint32{InvalidResourceIndex}).second; if (IsUniqueName) { StringPoolSize += strlen(ResAttribs.Name) + 1; |
