mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 23:59:54 -06:00
Merge pull request #1484 from magcius/memmap-cleanup
MemArena: Fix the launching of non-Wii games
This commit is contained in:
@ -222,9 +222,10 @@ bail:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags)
|
static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags)
|
||||||
{
|
{
|
||||||
u32 shm_position = 0;
|
u32 shm_position = 0;
|
||||||
|
u32 last_position;
|
||||||
|
|
||||||
for (int i = 0; i < num_views; i++)
|
for (int i = 0; i < num_views; i++)
|
||||||
{
|
{
|
||||||
@ -233,17 +234,19 @@ static void MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flag
|
|||||||
|
|
||||||
SKIP(flags, views[i].flags);
|
SKIP(flags, views[i].flags);
|
||||||
|
|
||||||
|
if (views[i].flags & MV_MIRROR_PREVIOUS)
|
||||||
|
shm_position = last_position;
|
||||||
views[i].shm_position = shm_position;
|
views[i].shm_position = shm_position;
|
||||||
|
last_position = shm_position;
|
||||||
if (!(views[i].flags & MV_MIRROR_PREVIOUS))
|
|
||||||
shm_position += views[i].size;
|
shm_position += views[i].size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return shm_position;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena)
|
u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena)
|
||||||
{
|
{
|
||||||
MemoryMap_InitializeViews(views, num_views, flags);
|
u32 total_mem = MemoryMap_InitializeViews(views, num_views, flags);
|
||||||
u32 total_mem = views[num_views - 1].shm_position;
|
|
||||||
|
|
||||||
arena->GrabSHMSegment(total_mem);
|
arena->GrabSHMSegment(total_mem);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user