From d626bad6bdff1d405ce300fbe886e600879e4682 Mon Sep 17 00:00:00 2001 From: rogerman Date: Sat, 18 Sep 2021 23:01:20 -0700 Subject: [PATCH] Fix broken builds due to commit 45787281. --- desmume/src/frontend/cocoa/openemu/NDSGameCore.mm | 2 +- desmume/src/lua-engine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm b/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm index a1b844bdd..c93edecd1 100644 --- a/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm +++ b/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm @@ -264,7 +264,7 @@ volatile bool execute = true; - (const void *)getVideoBufferWithHint:(void *)hint { - return GPU->GetDisplayInfo().masterNativeBuffer; + return GPU->GetDisplayInfo().masterNativeBuffer16; } - (OEGameCoreRendering)gameCoreRendering diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp index 13e381129..c43c4f28a 100644 --- a/desmume/src/lua-engine.cpp +++ b/desmume/src/lua-engine.cpp @@ -2278,7 +2278,7 @@ public: char temp [256]; sprintf(temp, " " /*"mismatch at "*/ "byte %d(0x%X at %p): %d(0x%X) != %d(0x%X)\n", i, i, dst, *src,*src, *dst,*dst); - if(ptr == dispInfo.masterNativeBuffer || ptr == dispInfo.masterCustomBuffer || ptr == GPU->GetEngineMain()->Get3DFramebufferMain()) // ignore screen-only differences since frame skipping can cause them and it's probably ok + if(ptr == dispInfo.masterNativeBuffer16 || ptr == dispInfo.masterCustomBuffer || ptr == GPU->GetEngineMain()->Get3DFramebufferMain()) // ignore screen-only differences since frame skipping can cause them and it's probably ok break; differences.push_back(temp); // <-- probably the best place for a breakpoint