From 0d162bdb9f075c88f9ea57d92cfd7f362362cc80 Mon Sep 17 00:00:00 2001 From: rogerman Date: Fri, 17 Jun 2016 21:33:43 +0000 Subject: [PATCH] Cocoa Port: - Change gpuColorFormat property data type from UInt32 to NSUInteger. --- desmume/src/cocoa/cocoa_GPU.h | 2 +- desmume/src/cocoa/cocoa_GPU.mm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desmume/src/cocoa/cocoa_GPU.h b/desmume/src/cocoa/cocoa_GPU.h index d8b7cf16e..4e0b67e68 100644 --- a/desmume/src/cocoa/cocoa_GPU.h +++ b/desmume/src/cocoa/cocoa_GPU.h @@ -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; diff --git a/desmume/src/cocoa/cocoa_GPU.mm b/desmume/src/cocoa/cocoa_GPU.mm index 3c3382ce2..afb415c68 100644 --- a/desmume/src/cocoa/cocoa_GPU.mm +++ b/desmume/src/cocoa/cocoa_GPU.mm @@ -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();