From 8441e6e83343dab128163036f3b4bc253bd74d2f Mon Sep 17 00:00:00 2001 From: rogerman Date: Tue, 15 Sep 2015 06:25:33 +0000 Subject: [PATCH] Cocoa Port / Cocoa Port (OpenEmu Plug-in): - Fix compiling, incorporating the API changes from r5273. --- desmume/src/cocoa/cocoa_GPU.mm | 2 +- desmume/src/cocoa/cocoa_output.mm | 4 ++-- desmume/src/cocoa/openemu/NDSGameCore.mm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desmume/src/cocoa/cocoa_GPU.mm b/desmume/src/cocoa/cocoa_GPU.mm index c913585c5..e9b051bb7 100644 --- a/desmume/src/cocoa/cocoa_GPU.mm +++ b/desmume/src/cocoa/cocoa_GPU.mm @@ -104,7 +104,7 @@ GPU3DInterface *core3DList[] = { &OSXOpenGLRendererEnd, &OSXOpenGLRendererFramebufferDidResize); - GPU->SetWillAutoBlitNativeToCustomBuffer(false); + GPU->SetWillAutoResolveToCustomBuffer(false); return self; } diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm index c5995a172..18a6fee01 100644 --- a/desmume/src/cocoa/cocoa_output.mm +++ b/desmume/src/cocoa/cocoa_output.mm @@ -702,8 +702,8 @@ uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData]; pthread_rwlock_rdlock(self.rwlockProducer); - GPU->GetEngineMain()->BlitNativeToCustomFramebuffer(); - GPU->GetEngineSub()->BlitNativeToCustomFramebuffer(); + GPU->GetEngineMain()->ResolveToCustomFramebuffer(); + GPU->GetEngineSub()->ResolveToCustomFramebuffer(); RGB555ToRGBA8888Buffer(displayBuffer, bitmapData, (w * h)); pthread_rwlock_unlock(self.rwlockProducer); diff --git a/desmume/src/cocoa/openemu/NDSGameCore.mm b/desmume/src/cocoa/openemu/NDSGameCore.mm index 50d56fee8..d5de0436e 100644 --- a/desmume/src/cocoa/openemu/NDSGameCore.mm +++ b/desmume/src/cocoa/openemu/NDSGameCore.mm @@ -279,7 +279,7 @@ volatile bool execute = true; - (const void *)videoBuffer { - return GPU->GetNativeFramebuffer(); + return GPU->GetDisplayInfo().masterNativeBuffer; } - (GLenum)pixelFormat