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

Cocoa Port: 

- In the Support Request Form and Bug Report Form, update the reported configuration to reflect the current 3D rendering features.
- Do some minor code cleanup.
This commit is contained in:
rogerman 2015-09-24 21:45:53 +00:00
parent 9f04d9076a
commit 6536230867
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desmume/src/cocoa/cocoa_core.mm
View File

@ -1151,29 +1151,7 @@ static void* RunCoreThread(void *arg)
switch (param->state)
{
case CORESTATE_EXECUTE:
{
for(CocoaDSOutput *cdsOutput in cdsOutputList)
{
if (![cdsOutput isKindOfClass:[CocoaDSDisplay class]])
{
[cdsOutput doCoreEmuFrame];
}
}
break;
}
case CORESTATE_FRAMEADVANCE:
{
for(CocoaDSOutput *cdsOutput in cdsOutputList)
{
if (![cdsOutput isKindOfClass:[CocoaDSDisplay class]])
{
[cdsOutput doCoreEmuFrame];
}
}
break;
}
case CORESTATE_FRAMEJUMP:
{
for(CocoaDSOutput *cdsOutput in cdsOutputList)

8
desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm
View File

@ -116,6 +116,7 @@
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nCPU Emulation Engine: "] stringByAppendingString:([cdsCore cpuEmulationEngine] == CPU_EMULATION_ENGINE_DYNAMIC_RECOMPILER ? [NSString stringWithFormat:@"%@ (BlockSize=%li)", [cdsCore cpuEmulationEngineString], (long)[cdsCore maxJITBlockSize]] : [cdsCore cpuEmulationEngineString])];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nExternal BIOS: "] stringByAppendingString:([cdsCore emuFlagUseExternalBios] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nExternal Firmware: "] stringByAppendingString:([cdsCore emuFlagUseExternalFirmware] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nGPU - Scaling Factor: "] stringByAppendingString:[NSString stringWithFormat:@"%ldx", (unsigned long)[[cdsCore cdsGPU] gpuScale]]];
NSString *render3DEngineDetails = [[cdsCore cdsGPU] render3DRenderingEngineString];
switch ([[cdsCore cdsGPU] render3DRenderingEngine])
@ -124,14 +125,11 @@
break;
case CORE3DLIST_SWRASTERIZE:
render3DEngineDetails = [NSString stringWithFormat:@"%@ (HighResColor=%@, EdgeMark=%@, Fog=%@, LineHack=%@, FragmentSamplingHack=%@, DepthCompare=%ld, ThreadCount=%@)",
render3DEngineDetails = [NSString stringWithFormat:@"%@ (HighResColor=%@, LineHack=%@, FragmentSamplingHack=%@, ThreadCount=%@)",
[[cdsCore cdsGPU] render3DRenderingEngineString],
([[cdsCore cdsGPU] render3DHighPrecisionColorInterpolation] ? @"YES" : @"NO"),
([[cdsCore cdsGPU] render3DEdgeMarking] ? @"YES" : @"NO"),
([[cdsCore cdsGPU] render3DFog] ? @"YES" : @"NO"),
([[cdsCore cdsGPU] render3DLineHack] ? @"YES" : @"NO"),
([[cdsCore cdsGPU] render3DFragmentSamplingHack] ? @"YES" : @"NO"),
(unsigned long)[[cdsCore cdsGPU] render3DDepthComparisonThreshold],
([[cdsCore cdsGPU] render3DThreads] == 0 ? @"Automatic" : [NSString stringWithFormat:@"%ld", (unsigned long)[[cdsCore cdsGPU] render3DThreads]])];
break;
@ -147,6 +145,8 @@
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Engine: "] stringByAppendingString:render3DEngineDetails];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Textures: "] stringByAppendingString:([[cdsCore cdsGPU] render3DTextures] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Edge Marking: "] stringByAppendingString:([[cdsCore cdsGPU] render3DEdgeMarking] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Fog: "] stringByAppendingString:([[cdsCore cdsGPU] render3DFog] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Output Engine: "] stringByAppendingString:[[emuControl cdsSpeaker] audioOutputEngineString]];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Advanced SPU Logic: "] stringByAppendingString:([[emuControl cdsSpeaker] spuAdvancedLogic] ? @"YES" : @"NO")];
finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Sound Interpolation Method: "] stringByAppendingString:[[emuControl cdsSpeaker] spuInterpolationModeString]];