diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-11-19 09:49:13 +0100 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-11-19 10:03:07 +0100 |
commit | f5d38649c7ad6fedf9db95044e3ad91ce393b8df (patch) | |
tree | 57cd232d34d8f889315331a84f0812e705d2ea88 /src/common/mem_arena.cpp | |
parent | Merge pull request #212 from archshift/idea (diff) | |
download | yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.gz yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.bz2 yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.lz yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.xz yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.zst yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.zip |
Diffstat (limited to 'src/common/mem_arena.cpp')
-rw-r--r-- | src/common/mem_arena.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index 40d9c03a2..31ca27b42 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp @@ -272,11 +272,11 @@ u8* MemArena::Find4GBBase() // yeah, this could also be done in like two bitwise ops... -#define SKIP(a_flags, b_flags) -// if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) -// continue; -// if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) -// continue; +#define SKIP(a_flags, b_flags) +// if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) +// continue; +// if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) +// continue; static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) { // OK, we know where to find free space. Now grab it! |