ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port / Cocoa Port (OpenEmu Plug-in): 

- Fix compiling, incorporating the API changes from r5273.
This commit is contained in:
rogerman 2015-09-15 06:25:33 +00:00
parent fe97b5bbef
commit 8441e6e833
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/cocoa/cocoa_GPU.mm
View File

@ -104,7 +104,7 @@ GPU3DInterface *core3DList[] = {
&OSXOpenGLRendererEnd, &OSXOpenGLRendererEnd,
&OSXOpenGLRendererFramebufferDidResize); &OSXOpenGLRendererFramebufferDidResize);
GPU->SetWillAutoBlitNativeToCustomBuffer(false); GPU->SetWillAutoResolveToCustomBuffer(false);
return self; return self;
} }

4
desmume/src/cocoa/cocoa_output.mm
View File

@ -702,8 +702,8 @@
uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData]; uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData];
pthread_rwlock_rdlock(self.rwlockProducer); pthread_rwlock_rdlock(self.rwlockProducer);
GPU->GetEngineMain()->BlitNativeToCustomFramebuffer(); GPU->GetEngineMain()->ResolveToCustomFramebuffer();
GPU->GetEngineSub()->BlitNativeToCustomFramebuffer(); GPU->GetEngineSub()->ResolveToCustomFramebuffer();
RGB555ToRGBA8888Buffer(displayBuffer, bitmapData, (w * h)); RGB555ToRGBA8888Buffer(displayBuffer, bitmapData, (w * h));
pthread_rwlock_unlock(self.rwlockProducer); pthread_rwlock_unlock(self.rwlockProducer);

2
desmume/src/cocoa/openemu/NDSGameCore.mm
View File

@ -279,7 +279,7 @@ volatile bool execute = true;
- (const void *)videoBuffer - (const void *)videoBuffer
{ {
return GPU->GetNativeFramebuffer(); return GPU->GetDisplayInfo().masterNativeBuffer;
} }
- (GLenum)pixelFormat - (GLenum)pixelFormat