diff options
| author | 2016-05-14 17:02:21 -0400 | |
|---|---|---|
| committer | 2016-05-14 17:02:21 -0400 | |
| commit | d299f7ed2808cb5be16cc7def68cbbba2388af65 (patch) | |
| tree | e70bdacfb80ef0fc70e1ad53f4dd63f6d82e7c8e /src | |
| parent | Merge pull request #1689 from Subv/shmem (diff) | |
| parent | Memory: Fixed a regression caused by #1695 and #1689. (diff) | |
| download | yuzu-d299f7ed2808cb5be16cc7def68cbbba2388af65.tar.gz yuzu-d299f7ed2808cb5be16cc7def68cbbba2388af65.tar.xz yuzu-d299f7ed2808cb5be16cc7def68cbbba2388af65.zip | |
Merge pull request #1794 from Subv/regression_fix
Memory: Fixed a regression caused by #1695 and #1689.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/memory.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index 4be20db22..17ae87aef 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp | |||
| @@ -55,6 +55,9 @@ void MemoryInit(u32 mem_type) { | |||
| 55 | memory_regions[i].size = memory_region_sizes[mem_type][i]; | 55 | memory_regions[i].size = memory_region_sizes[mem_type][i]; |
| 56 | memory_regions[i].used = 0; | 56 | memory_regions[i].used = 0; |
| 57 | memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>(); | 57 | memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>(); |
| 58 | // Reserve enough space for this region of FCRAM. | ||
| 59 | // We do not want this block of memory to be relocated when allocating from it. | ||
| 60 | memory_regions[i].linear_heap_memory->reserve(memory_regions[i].size); | ||
| 58 | 61 | ||
| 59 | base += memory_regions[i].size; | 62 | base += memory_regions[i].size; |
| 60 | } | 63 | } |