diff options
| author |  MerryMage | 2020-06-17 12:22:50 +0100 |
|---|---|---|
| committer | MerryMage | 2020-06-18 15:47:43 +0100 |
| commit | 442e48ef4c28fb22115bd30e9e988b91ae02ee84 (patch) | |
| tree | 0e235f1af9e9ca94495be6defaad5282c7bbbed8 /src | |
| parent | Rename PAGE_SHIFT to PAGE_BITS (diff) | |
| download | yuzu-442e48ef4c28fb22115bd30e9e988b91ae02ee84.tar.gz yuzu-442e48ef4c28fb22115bd30e9e988b91ae02ee84.tar.xz yuzu-442e48ef4c28fb22115bd30e9e988b91ae02ee84.zip | |
memory_util: boost hashes are size_t
* boost::hash_value returns a size_t
* boost::hash_combine takes a size_t& argument
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/shader/memory_util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/shader/memory_util.cpp b/src/video_core/shader/memory_util.cpp index 074f21691..5071c83ca 100644 --- a/src/video_core/shader/memory_util.cpp +++ b/src/video_core/shader/memory_util.cpp | |||
| @@ -66,12 +66,12 @@ ProgramCode GetShaderCode(Tegra::MemoryManager& memory_manager, GPUVAddr gpu_add | |||
| 66 | 66 | ||
| 67 | u64 GetUniqueIdentifier(Tegra::Engines::ShaderType shader_type, bool is_a, const ProgramCode& code, | 67 | u64 GetUniqueIdentifier(Tegra::Engines::ShaderType shader_type, bool is_a, const ProgramCode& code, |
| 68 | const ProgramCode& code_b) { | 68 | const ProgramCode& code_b) { |
| 69 | u64 unique_identifier = boost::hash_value(code); | 69 | size_t unique_identifier = boost::hash_value(code); |
| 70 | if (is_a) { | 70 | if (is_a) { |
| 71 | // VertexA programs include two programs | 71 | // VertexA programs include two programs |
| 72 | boost::hash_combine(unique_identifier, boost::hash_value(code_b)); | 72 | boost::hash_combine(unique_identifier, boost::hash_value(code_b)); |
| 73 | } | 73 | } |
| 74 | return unique_identifier; | 74 | return static_cast<u64>(unique_identifier); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | } // namespace VideoCommon::Shader | 77 | } // namespace VideoCommon::Shader |