mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git
				synced 2025-05-12 00:45:25 +00:00 
			
		
		
		
	Merge pull request #1794 from Subv/regression_fix
Memory: Fixed a regression caused by #1695 and #1689.
This commit is contained in:
		
						commit
						d299f7ed28
					
				@ -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;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user