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

Cocoa Port: 

- Add property methods for setting the GPU color format.
This commit is contained in:
rogerman 2016-04-05 17:41:17 +00:00
parent 0ce1df58c5
commit f036f26310
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/cocoa/cocoa_GPU.h
View File

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

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

@ -79,6 +79,7 @@ public:
@dynamic gpuStateFlags; @dynamic gpuStateFlags;
@dynamic gpuDimensions; @dynamic gpuDimensions;
@dynamic gpuScale; @dynamic gpuScale;
@dynamic gpuColorFormat;
@dynamic gpuFrameRWLock; @dynamic gpuFrameRWLock;
@dynamic layerMainGPU; @dynamic layerMainGPU;
@ -222,6 +223,30 @@ public:
return (NSUInteger)_gpuScale; return (NSUInteger)_gpuScale;
} }
- (void) setGpuColorFormat:(UInt32)colorFormat
{
gpuEvent->FrameFinish();
gpuEvent->Render3DLock();
gpuEvent->FramebufferLockWrite();
GPU->SetColorFormat((NDSColorFormat)colorFormat);
gpuEvent->SetVideoBuffers();
gpuEvent->FramebufferUnlock();
gpuEvent->Render3DUnlock();
}
- (UInt32) gpuColorFormat
{
gpuEvent->Render3DLock();
gpuEvent->FramebufferLockRead();
const UInt32 colorFormat = (UInt32)GPU->GetDisplayInfo().colorFormat;
gpuEvent->FramebufferUnlock();
gpuEvent->Render3DUnlock();
return colorFormat;
}
- (pthread_rwlock_t *) gpuFrameRWLock - (pthread_rwlock_t *) gpuFrameRWLock
{ {
return gpuEvent->GetFrameRWLock(); return gpuEvent->GetFrameRWLock();

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

@ -1016,43 +1016,27 @@
- (void) resetVideoBuffers - (void) resetVideoBuffers
{ {
size_t pixelBytes = sizeof(uint16_t);
const NDSDisplayInfo &dispInfo = GPU->GetDisplayInfo(); const NDSDisplayInfo &dispInfo = GPU->GetDisplayInfo();
switch (dispInfo.colorFormat)
{
case NDSColorFormat_BGR555_Rev:
pixelBytes = sizeof(uint16_t);
break;
case NDSColorFormat_BGR666_Rev:
case NDSColorFormat_BGR888_Rev:
pixelBytes = sizeof(uint32_t);
break;
default:
break;
}
void *oldVideoBuffer = _videoBuffer; void *oldVideoBuffer = _videoBuffer;
uint8_t *newVideoBuffer = (uint8_t *)malloc_alignedCacheLine( ((GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT) + (dispInfo.customWidth * dispInfo.customHeight)) * 2 * pixelBytes ); uint8_t *newVideoBuffer = (uint8_t *)malloc_alignedCacheLine( ((GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT) + (dispInfo.customWidth * dispInfo.customHeight)) * 2 * dispInfo.pixelBytes );
[(id<CocoaDSDisplayVideoDelegate>)delegate doSetVideoBuffersUsingFormat:dispInfo.colorFormat [(id<CocoaDSDisplayVideoDelegate>)delegate doSetVideoBuffersUsingFormat:dispInfo.colorFormat
bufferHead:newVideoBuffer bufferHead:newVideoBuffer
nativeBuffer0:newVideoBuffer nativeBuffer0:newVideoBuffer
nativeBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * pixelBytes) nativeBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * dispInfo.pixelBytes)
customBuffer0:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes) customBuffer0:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes)
customWidth0:dispInfo.customWidth customWidth0:dispInfo.customWidth
customHeight0:dispInfo.customHeight customHeight0:dispInfo.customHeight
customBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * pixelBytes) customBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * dispInfo.pixelBytes)
customWidth1:dispInfo.customWidth customWidth1:dispInfo.customWidth
customHeight1:dispInfo.customHeight]; customHeight1:dispInfo.customHeight];
_videoBuffer = newVideoBuffer; _videoBuffer = newVideoBuffer;
_nativeBuffer[NDSDisplayID_Main] = newVideoBuffer; _nativeBuffer[NDSDisplayID_Main] = newVideoBuffer;
_nativeBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * pixelBytes); _nativeBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * dispInfo.pixelBytes);
_customBuffer[NDSDisplayID_Main] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes); _customBuffer[NDSDisplayID_Main] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes);
_customBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * pixelBytes); _customBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * dispInfo.pixelBytes);
free_aligned(oldVideoBuffer); free_aligned(oldVideoBuffer);
} }