artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1794 from Subv/regression_fix

Browse source 
Memory: Fixed a regression caused by #1695 and #1689.
This commit is contained in:
bunnei 2016-05-14 17:02:21 -04:00
parent 18b517e236 64da2bf0cd
commit d299f7ed28
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/memory.cpp
View file

@ -55,6 +55,9 @@ void MemoryInit(u32 mem_type) {
memory_regions[i].size = memory_region_sizes[mem_type][i]; memory_regions[i].size = memory_region_sizes[mem_type][i];
memory_regions[i].used = 0; memory_regions[i].used = 0;
memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>(); memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>();
// Reserve enough space for this region of FCRAM.
// We do not want this block of memory to be relocated when allocating from it.
memory_regions[i].linear_heap_memory->reserve(memory_regions[i].size);
base += memory_regions[i].size; base += memory_regions[i].size;
} }