diff options
| author |  bunnei | 2020-06-19 23:31:04 -0400 |
|---|---|---|
| committer |  GitHub | 2020-06-19 23:31:04 -0400 |
| commit | 7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560 (patch) | |
| tree | c806783957549f1127c7d8bfda28abefa5b3ab8d /src/video_core/shader | |
| parent | Merge pull request #4113 from ogniK5377/boxcat-disable (diff) | |
| parent | bootmanager: Remove references to OpenGL for macOS (diff) | |
| download | yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.gz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.xz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.zip | |
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 | |||
| 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 |