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

Merge pull request #240 from vkedwardli/fix-macos-crash 

Fix macos crash
This commit is contained in:
flyinghead 2021-05-17 14:03:47 +02:00 committed by GitHub
parent f616fe25bb eb5a3bfd01
commit 7eabf0d43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shell/apple/emulator-osx/emulator-osx/osx-main.mm
View File

@ -190,19 +190,17 @@ void emu_gles_init(int width, int height)
CFDictionaryRef dmOptions = CFDictionaryCreate(kCFAllocatorDefault, (const void**) dmKeys, (const void**) dmValues, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks ); CFDictionaryRef dmOptions = CFDictionaryCreate(kCFAllocatorDefault, (const void**) dmKeys, (const void**) dmValues, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks );
CFArrayRef allDisplayModes = CGDisplayCopyAllDisplayModes(displayID, dmOptions); CFArrayRef allDisplayModes = CGDisplayCopyAllDisplayModes(displayID, dmOptions);
CFIndex n = CFArrayGetCount(allDisplayModes); CFIndex n = CFArrayGetCount(allDisplayModes);
for(CFIndex i = 0; i < n; ++i) for (CFIndex i = 0; i < n; ++i)
{ {
CGDisplayModeRef m = (CGDisplayModeRef)CFArrayGetValueAtIndex(allDisplayModes, i); CGDisplayModeRef m = (CGDisplayModeRef)CFArrayGetValueAtIndex(allDisplayModes, i);
CGFloat width = CGDisplayModeGetPixelWidth(m); CGFloat width = CGDisplayModeGetPixelWidth(m);
CGFloat height = CGDisplayModeGetPixelHeight(m); CGFloat height = CGDisplayModeGetPixelHeight(m);
CGFloat modeWidth = CGDisplayModeGetWidth(m); CGFloat modeWidth = CGDisplayModeGetWidth(m);
BOOL isNative = (CGDisplayModeGetIOFlags(m) & kDisplayModeNativeFlag) ? true : false;
CFRelease(m);
//Only check 1x mode //Only check 1x mode
if(width == modeWidth) if (width == modeWidth)
{ {
if(isNative) if (CGDisplayModeGetIOFlags(m) & kDisplayModeNativeFlag)
{ {
displayNativeSize.width = width; displayNativeSize.width = width;
displayNativeSize.height = height; displayNativeSize.height = height;
@ -210,7 +208,7 @@ void emu_gles_init(int width, int height)
} }
//Get the largest size even if kDisplayModeNativeFlag is not present e.g. iMac 27-Inch with 5K Retina //Get the largest size even if kDisplayModeNativeFlag is not present e.g. iMac 27-Inch with 5K Retina
if(width > displayNativeSize.width) if (width > displayNativeSize.width)
{ {
displayNativeSize.width = width; displayNativeSize.width = width;
displayNativeSize.height = height; displayNativeSize.height = height;