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

Cocoa Port: Fix occasional screen flickering on Metal display views whenever a pixel scaler is used. (Regression from commit 7202fb8.)

This commit is contained in:
rogerman 2017-11-17 00:51:10 -08:00
parent 7202fb8d47
commit d0c0a5641a
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ class MacMetalDisplayView;
struct MetalProcessedFrameInfo struct MetalProcessedFrameInfo
{ {
uint8_t bufferIndex; uint8_t bufferIndex;
id<MTLTexture> tex[2];
bool isMainDisplayProcessed; bool isMainDisplayProcessed;
bool isTouchDisplayProcessed; bool isTouchDisplayProcessed;
}; };

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

@ -808,6 +808,8 @@
needsHUDVerticesUpdate = YES; needsHUDVerticesUpdate = YES;
processedFrameInfo.bufferIndex = 0; processedFrameInfo.bufferIndex = 0;
processedFrameInfo.tex[NDSDisplayID_Main] = nil;
processedFrameInfo.tex[NDSDisplayID_Touch] = nil;
processedFrameInfo.isMainDisplayProcessed = false; processedFrameInfo.isMainDisplayProcessed = false;
processedFrameInfo.isTouchDisplayProcessed = false; processedFrameInfo.isTouchDisplayProcessed = false;
@ -839,6 +841,11 @@
[self setBufCPUFilterDstTouch:nil]; [self setBufCPUFilterDstTouch:nil];
[self setTexDisplayPixelScaleMain:nil]; [self setTexDisplayPixelScaleMain:nil];
[self setTexDisplayPixelScaleTouch:nil]; [self setTexDisplayPixelScaleTouch:nil];
[self setTexDisplayProcessedMain:nil];
[self setTexDisplayProcessedTouch:nil];
[processedFrameInfo.tex[NDSDisplayID_Main] release];
[processedFrameInfo.tex[NDSDisplayID_Touch] release];
[self setPixelScalePipeline:nil]; [self setPixelScalePipeline:nil];
[self setOutputRGBAPipeline:nil]; [self setOutputRGBAPipeline:nil];
@ -1121,6 +1128,8 @@
[self setTexDisplayPixelScaleTouch:[[sharedData device] newTextureWithDescriptor:texDisplayPixelScaleDesc]]; [self setTexDisplayPixelScaleTouch:[[sharedData device] newTextureWithDescriptor:texDisplayPixelScaleDesc]];
[self setTexDisplayProcessedMain:[sharedData texFetchMain]]; [self setTexDisplayProcessedMain:[sharedData texFetchMain]];
[self setTexDisplayProcessedTouch:[sharedData texFetchTouch]]; [self setTexDisplayProcessedTouch:[sharedData texFetchTouch]];
processedFrameInfo.tex[NDSDisplayID_Main] = [[self texDisplayProcessedMain] retain];
processedFrameInfo.tex[NDSDisplayID_Touch] = [[self texDisplayProcessedTouch] retain];
VideoFilter *vfMain = cdp->GetPixelScalerObject(NDSDisplayID_Main); VideoFilter *vfMain = cdp->GetPixelScalerObject(NDSDisplayID_Main);
_bufCPUFilterSrcMain = [[[sharedData device] newBufferWithBytesNoCopy:vfMain->GetSrcBufferPtr() _bufCPUFilterSrcMain = [[[sharedData device] newBufferWithBytesNoCopy:vfMain->GetSrcBufferPtr()
@ -1327,6 +1336,7 @@
if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch]) if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch])
{ {
[self setTexDisplayProcessedTouch:[self texDisplayProcessedMain]];
isDisplayProcessedTouch = true; isDisplayProcessedTouch = true;
} }
} }
@ -1382,6 +1392,7 @@
if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch]) if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch])
{ {
[self setTexDisplayProcessedTouch:[self texDisplayProcessedMain]];
isDisplayProcessedTouch = true; isDisplayProcessedTouch = true;
} }
} }
@ -1491,6 +1502,7 @@
if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch]) if (selectedDisplaySource[NDSDisplayID_Main] == selectedDisplaySource[NDSDisplayID_Touch])
{ {
[self setTexDisplayProcessedTouch:[self texDisplayProcessedMain]];
isDisplayProcessedTouch = true; isDisplayProcessedTouch = true;
} }
} }
@ -1521,11 +1533,6 @@
[cb commit]; [cb commit];
} }
if (selectedDisplaySource[NDSDisplayID_Touch] == selectedDisplaySource[NDSDisplayID_Main])
{
[self setTexDisplayProcessedTouch:[self texDisplayProcessedMain]];
}
// Update the texture coordinates // Update the texture coordinates
cdp->SetScreenTextureCoordinates((float)[[self texDisplayProcessedMain] width], (float)[[self texDisplayProcessedMain] height], cdp->SetScreenTextureCoordinates((float)[[self texDisplayProcessedMain] width], (float)[[self texDisplayProcessedMain] height],
(float)[[self texDisplayProcessedTouch] width], (float)[[self texDisplayProcessedTouch] height], (float)[[self texDisplayProcessedTouch] width], (float)[[self texDisplayProcessedTouch] height],
@ -1537,7 +1544,16 @@
newFrameInfo.bufferIndex = bufferIndex; newFrameInfo.bufferIndex = bufferIndex;
newFrameInfo.isMainDisplayProcessed = isDisplayProcessedMain; newFrameInfo.isMainDisplayProcessed = isDisplayProcessedMain;
newFrameInfo.isTouchDisplayProcessed = isDisplayProcessedTouch; newFrameInfo.isTouchDisplayProcessed = isDisplayProcessedTouch;
newFrameInfo.tex[NDSDisplayID_Main] = [[self texDisplayProcessedMain] retain];
newFrameInfo.tex[NDSDisplayID_Touch] = [[self texDisplayProcessedTouch] retain];
id<MTLTexture> oldDisplayProcessedMain = processedFrameInfo.tex[NDSDisplayID_Main];
id<MTLTexture> oldDisplayProcessedTouch = processedFrameInfo.tex[NDSDisplayID_Touch];
[self setProcessedFrameInfo:newFrameInfo]; [self setProcessedFrameInfo:newFrameInfo];
[oldDisplayProcessedMain release];
[oldDisplayProcessedTouch release];
} }
- (void) updateRenderBuffers - (void) updateRenderBuffers
@ -1836,8 +1852,8 @@
[self renderForCommandBuffer:cb [self renderForCommandBuffer:cb
outputPipelineState:[self outputRGBAPipeline] outputPipelineState:[self outputRGBAPipeline]
hudPipelineState:[sharedData hudRGBAPipeline] hudPipelineState:[sharedData hudRGBAPipeline]
texDisplayMain:(processedInfo.isMainDisplayProcessed) ? [self texDisplayProcessedMain] : ((cdp->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Main) == NDSDisplayID_Main) ? [sharedData texFetchMain] : [sharedData texFetchTouch] ) texDisplayMain:(processedInfo.isMainDisplayProcessed) ? processedInfo.tex[NDSDisplayID_Main] : ((cdp->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Main) == NDSDisplayID_Main) ? [sharedData texFetchMain] : [sharedData texFetchTouch] )
texDisplayTouch:(processedInfo.isTouchDisplayProcessed) ? [self texDisplayProcessedTouch] : ((cdp->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Touch) == NDSDisplayID_Touch) ? [sharedData texFetchTouch] : [sharedData texFetchMain] )]; texDisplayTouch:(processedInfo.isTouchDisplayProcessed) ? processedInfo.tex[NDSDisplayID_Touch] : ((cdp->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Touch) == NDSDisplayID_Touch) ? [sharedData texFetchTouch] : [sharedData texFetchMain] )];
[cb addCompletedHandler:^(id<MTLCommandBuffer> block) { [cb addCompletedHandler:^(id<MTLCommandBuffer> block) {
pthread_mutex_unlock(&_mutexBufferUpdate); pthread_mutex_unlock(&_mutexBufferUpdate);
@ -1935,8 +1951,8 @@
[presenterObject renderForCommandBuffer:cb [presenterObject renderForCommandBuffer:cb
outputPipelineState:[presenterObject outputDrawablePipeline] outputPipelineState:[presenterObject outputDrawablePipeline]
hudPipelineState:[[presenterObject sharedData] hudPipeline] hudPipelineState:[[presenterObject sharedData] hudPipeline]
texDisplayMain:(processedInfo.isMainDisplayProcessed) ? [presenterObject texDisplayProcessedMain] : (([presenterObject cdp]->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Main) == NDSDisplayID_Main) ? [[presenterObject sharedData] texFetchMain] : [[presenterObject sharedData] texFetchTouch] ) texDisplayMain:(processedInfo.isMainDisplayProcessed) ? processedInfo.tex[NDSDisplayID_Main] : (([presenterObject cdp]->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Main) == NDSDisplayID_Main) ? [[presenterObject sharedData] texFetchMain] : [[presenterObject sharedData] texFetchTouch] )
texDisplayTouch:(processedInfo.isTouchDisplayProcessed) ? [presenterObject texDisplayProcessedTouch] : (([presenterObject cdp]->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Touch) == NDSDisplayID_Touch) ? [[presenterObject sharedData] texFetchTouch] : [[presenterObject sharedData] texFetchMain] )]; texDisplayTouch:(processedInfo.isTouchDisplayProcessed) ? processedInfo.tex[NDSDisplayID_Touch] : (([presenterObject cdp]->GetSelectedDisplaySourceForDisplay(NDSDisplayID_Touch) == NDSDisplayID_Touch) ? [[presenterObject sharedData] texFetchTouch] : [[presenterObject sharedData] texFetchMain] )];
[cb presentDrawable:layerDrawable]; [cb presentDrawable:layerDrawable];
[cb addCompletedHandler:^(id<MTLCommandBuffer> block) { [cb addCompletedHandler:^(id<MTLCommandBuffer> block) {