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

Cocoa Port: Fix a couple of rare edge-case bugs with Metal display views.

This commit is contained in:
rogerman 2017-11-27 22:53:18 -08:00
parent 258ebfd6ea
commit f0564cc4ac
2 changed files with 371 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
desmume/src/frontend/cocoa/userinterface/MacMetalDisplayView.h
View File

@ -79,19 +79,16 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
id<MTLBuffer> _bufMasterBrightMode[2]; id<MTLBuffer> _bufMasterBrightMode[2];
id<MTLBuffer> _bufMasterBrightIntensity[2]; id<MTLBuffer> _bufMasterBrightIntensity[2];
id<MTLTexture> _texDisplayFetch16NativeMain; size_t _fetchPixelBytes;
id<MTLTexture> _texDisplayFetch16NativeTouch; size_t _nativeLineSize;
id<MTLTexture> _texDisplayFetch32NativeMain; size_t _nativeBufferSize;
id<MTLTexture> _texDisplayFetch32NativeTouch; size_t _customLineSize;
id<MTLTexture> _texDisplayPostprocessNativeMain; size_t _customBufferSize;
id<MTLTexture> _texDisplayPostprocessNativeTouch;
id<MTLTexture> _texDisplayFetch16CustomMain; id<MTLTexture> _texDisplayFetchNative[2][2];
id<MTLTexture> _texDisplayFetch16CustomTouch; id<MTLTexture> _texDisplayFetchCustom[2][2];
id<MTLTexture> _texDisplayFetch32CustomMain; id<MTLTexture> _texDisplayPostprocessNative[2][2];
id<MTLTexture> _texDisplayFetch32CustomTouch; id<MTLTexture> _texDisplayPostprocessCustom[2][2];
id<MTLTexture> _texDisplayPostprocessCustomMain;
id<MTLTexture> _texDisplayPostprocessCustomTouch;
id<MTLTexture> texFetchMain; id<MTLTexture> texFetchMain;
id<MTLTexture> texFetchTouch; id<MTLTexture> texFetchTouch;
@ -172,8 +169,6 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
id<MTLTexture> _texDisplaySrcDeposterize[2][2]; id<MTLTexture> _texDisplaySrcDeposterize[2][2];
id<MTLTexture> texDisplayPixelScaleMain; id<MTLTexture> texDisplayPixelScaleMain;
id<MTLTexture> texDisplayPixelScaleTouch; id<MTLTexture> texDisplayPixelScaleTouch;
id<MTLTexture> texDisplayProcessedMain;
id<MTLTexture> texDisplayProcessedTouch;
id<MTLTexture> texHUDCharMap; id<MTLTexture> texHUDCharMap;
MTLSize _pixelScalerThreadsPerGroup; MTLSize _pixelScalerThreadsPerGroup;
@ -184,6 +179,7 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
BOOL needsScreenVerticesUpdate; BOOL needsScreenVerticesUpdate;
BOOL needsHUDVerticesUpdate; BOOL needsHUDVerticesUpdate;
pthread_mutex_t _mutexTexProcessUpdate;
pthread_mutex_t _mutexBufferUpdate; pthread_mutex_t _mutexBufferUpdate;
bool _needEncodeViewport; bool _needEncodeViewport;
MTLViewport _newViewport; MTLViewport _newViewport;
@ -192,12 +188,13 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
size_t _hudStringLength; size_t _hudStringLength;
size_t _hudTouchLineLength; size_t _hudTouchLineLength;
MetalProcessedFrameInfo processedFrameInfo; MetalProcessedFrameInfo _processedFrameInfo;
} }
@property (readonly, nonatomic) ClientDisplay3DPresenter *cdp; @property (readonly, nonatomic) ClientDisplay3DPresenter *cdp;
@property (assign, nonatomic) MetalDisplayViewSharedData *sharedData; @property (assign, nonatomic) MetalDisplayViewSharedData *sharedData;
@property (readonly, nonatomic) MTLRenderPassColorAttachmentDescriptor *colorAttachment0Desc; @property (readonly, nonatomic) MTLRenderPassColorAttachmentDescriptor *colorAttachment0Desc;
@property (readonly, nonatomic) pthread_mutex_t *mutexTexProcessUpdate;
@property (readonly, nonatomic) pthread_mutex_t *mutexBufferUpdate; @property (readonly, nonatomic) pthread_mutex_t *mutexBufferUpdate;
@property (retain) id<MTLComputePipelineState> pixelScalePipeline; @property (retain) id<MTLComputePipelineState> pixelScalePipeline;
@property (retain) id<MTLRenderPipelineState> outputRGBAPipeline; @property (retain) id<MTLRenderPipelineState> outputRGBAPipeline;
@ -207,8 +204,6 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
@property (retain) id<MTLBuffer> bufCPUFilterDstTouch; @property (retain) id<MTLBuffer> bufCPUFilterDstTouch;
@property (retain) id<MTLTexture> texDisplayPixelScaleMain; @property (retain) id<MTLTexture> texDisplayPixelScaleMain;
@property (retain) id<MTLTexture> texDisplayPixelScaleTouch; @property (retain) id<MTLTexture> texDisplayPixelScaleTouch;
@property (retain) id<MTLTexture> texDisplayProcessedMain;
@property (retain) id<MTLTexture> texDisplayProcessedTouch;
@property (retain) id<MTLTexture> texHUDCharMap; @property (retain) id<MTLTexture> texHUDCharMap;
@property (assign) BOOL needsViewportUpdate; @property (assign) BOOL needsViewportUpdate;
@property (assign) BOOL needsRotationScaleUpdate; @property (assign) BOOL needsRotationScaleUpdate;
@ -216,9 +211,9 @@ typedef DisplayViewShaderProperties DisplayViewShaderProperties;
@property (assign) BOOL needsHUDVerticesUpdate; @property (assign) BOOL needsHUDVerticesUpdate;
@property (assign, nonatomic) VideoFilterTypeID pixelScaler; @property (assign, nonatomic) VideoFilterTypeID pixelScaler;
@property (assign, nonatomic) OutputFilterTypeID outputFilter; @property (assign, nonatomic) OutputFilterTypeID outputFilter;
@property (assign) MetalProcessedFrameInfo processedFrameInfo;
- (id) initWithDisplayPresenter:(MacMetalDisplayPresenter *)thePresenter; - (id) initWithDisplayPresenter:(MacMetalDisplayPresenter *)thePresenter;
- (const MetalProcessedFrameInfo &) processedFrameInfo;
- (id<MTLCommandBuffer>) newCommandBuffer; - (id<MTLCommandBuffer>) newCommandBuffer;
- (void) setup; - (void) setup;
- (void) resizeCPUPixelScalerUsingFilterID:(const VideoFilterTypeID)filterID; - (void) resizeCPUPixelScalerUsingFilterID:(const VideoFilterTypeID)filterID;

727
desmume/src/frontend/cocoa/userinterface/MacMetalDisplayView.mm
View File

File diff suppressed because it is too large Load Diff