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

Cocoa Port: 

- Change gpuColorFormat property data type from UInt32 to NSUInteger.
This commit is contained in:
rogerman 2016-06-17 21:33:43 +00:00
parent f8e0585d26
commit 0d162bdb9f
2 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.h
View File

@ -37,7 +37,7 @@ class GPUEventHandlerOSX;
@property (assign) UInt32 gpuStateFlags;
@property (assign) NSSize gpuDimensions;
@property (assign) NSUInteger gpuScale;
@property (assign) UInt32 gpuColorFormat;
@property (assign) NSUInteger gpuColorFormat;
@property (readonly) pthread_rwlock_t *gpuFrameRWLock;
@property (assign) BOOL layerMainGPU;

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

@ -224,7 +224,7 @@ public:
return (NSUInteger)_gpuScale;
}
- (void) setGpuColorFormat:(UInt32)colorFormat
- (void) setGpuColorFormat:(NSUInteger)colorFormat
{
gpuEvent->FrameFinish();
gpuEvent->Render3DLock();
@ -237,11 +237,11 @@ public:
gpuEvent->Render3DUnlock();
}
- (UInt32) gpuColorFormat
- (NSUInteger) gpuColorFormat
{
gpuEvent->Render3DLock();
gpuEvent->FramebufferLockRead();
const UInt32 colorFormat = (UInt32)GPU->GetDisplayInfo().colorFormat;
const NSUInteger colorFormat = (NSUInteger)GPU->GetDisplayInfo().colorFormat;
gpuEvent->FramebufferUnlock();
gpuEvent->Render3DUnlock();