diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-19 23:31:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 23:31:04 -0400 |
| commit | 7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560 (patch) | |
| tree | c806783957549f1127c7d8bfda28abefa5b3ab8d /src/video_core/shader | |
| parent | 9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac (diff) | |
| parent | 778f86989a446e73133d893c6588c728e6fb2206 (diff) | |
Merge pull request #4099 from MerryMage/macOS-build
Fix compilation on macOS
Diffstat (limited to 'src/video_core/shader')
| -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 u64 GetUniqueIdentifier(Tegra::Engines::ShaderType shader_type, bool is_a, const ProgramCode& code, const ProgramCode& code_b) { - u64 unique_identifier = boost::hash_value(code); + size_t unique_identifier = boost::hash_value(code); if (is_a) { // VertexA programs include two programs boost::hash_combine(unique_identifier, boost::hash_value(code_b)); } - return unique_identifier; + return static_cast<u64>(unique_identifier); } } // namespace VideoCommon::Shader |