diff options
| author | 2024-01-07 05:33:43 +0100 | |
|---|---|---|
| committer | 2024-01-18 21:12:30 -0500 | |
| commit | 23430e67724d803184b6a861e4bcb3cac0e38cb0 (patch) | |
| tree | 5d0b3dfc7175434f66d0dfb32f1d0bfa597013c4 /src/core | |
| parent | SMMU: Fix Right Shift UB. (diff) | |
| download | yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.tar.gz yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.tar.xz yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.zip | |
Core: Eliminate core/memory dependancies.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/device_memory_manager.h | 4 | ||||
| -rw-r--r-- | src/core/gpu_dirty_memory_manager.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/device_memory_manager.h b/src/core/device_memory_manager.h index cc9fd023f..6311e9ece 100644 --- a/src/core/device_memory_manager.h +++ b/src/core/device_memory_manager.h | |||
| @@ -15,6 +15,10 @@ | |||
| 15 | 15 | ||
| 16 | namespace Core { | 16 | namespace Core { |
| 17 | 17 | ||
| 18 | constexpr size_t DEVICE_PAGEBITS = 12ULL; | ||
| 19 | constexpr size_t DEVICE_PAGESIZE = 1ULL << DEVICE_PAGEBITS; | ||
| 20 | constexpr size_t DEVICE_PAGEMASK = DEVICE_PAGESIZE - 1ULL; | ||
| 21 | |||
| 18 | class DeviceMemory; | 22 | class DeviceMemory; |
| 19 | 23 | ||
| 20 | namespace Memory { | 24 | namespace Memory { |
diff --git a/src/core/gpu_dirty_memory_manager.h b/src/core/gpu_dirty_memory_manager.h index f1abf4f83..cc8fc176f 100644 --- a/src/core/gpu_dirty_memory_manager.h +++ b/src/core/gpu_dirty_memory_manager.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <utility> | 10 | #include <utility> |
| 11 | #include <vector> | 11 | #include <vector> |
| 12 | 12 | ||
| 13 | #include "core/memory.h" | 13 | #include "core/device_memory_manager.h" |
| 14 | 14 | ||
| 15 | namespace Core { | 15 | namespace Core { |
| 16 | 16 | ||
| @@ -80,7 +80,7 @@ private: | |||
| 80 | u32 mask; | 80 | u32 mask; |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | constexpr static size_t page_bits = Memory::YUZU_PAGEBITS - 1; | 83 | constexpr static size_t page_bits = DEVICE_PAGEBITS - 1; |
| 84 | constexpr static size_t page_size = 1ULL << page_bits; | 84 | constexpr static size_t page_size = 1ULL << page_bits; |
| 85 | constexpr static size_t page_mask = page_size - 1; | 85 | constexpr static size_t page_mask = page_size - 1; |
| 86 | 86 | ||