From 5b857f08ed4762bee66cd204e37352ed995fdb80 Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sat, 30 Dec 2017 18:00:14 -0800 Subject: [PATCH 1/5] Create AppDelegate the standard way instead of in PPSSPPUIApplication init --- ios/PPSSPPUIApplication.mm | 6 ------ ios/main.mm | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index c535081b99..d07e7a26e0 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -60,12 +60,6 @@ @implementation PPSSPPUIApplication -- (instancetype)init { - auto instance = [super init]; - instance.delegate = [[AppDelegate alloc] init]; - return instance; -} - - (void)decodeKeyEvent:(NSInteger *)eventMem { NSInteger eventType = eventMem[GSEVENT_TYPE]; NSInteger eventScanCode = eventMem[GSEVENTKEY_KEYCODE]; diff --git a/ios/main.mm b/ios/main.mm index 3070e772d6..c6eb2d3c7f 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -113,7 +113,6 @@ int main(int argc, char *argv[]) // Simulates a debugger. Makes it possible to use JIT (though only W^X) syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0); @autoreleasepool { - return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), nil); - //return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), NSStringFromClass([AppDelegate class])); } } From c563166f9aefdd9e908dde5b40342b660bd5ec7f Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sat, 30 Dec 2017 18:26:47 -0800 Subject: [PATCH 2/5] Modernize property syntax and don't use viewDidUnload (deprecated in iOS 6) --- ios/ViewController.mm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 528287094c..4fd1c60739 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -74,10 +74,10 @@ static GraphicsContext *graphicsContext; std::map iCadeToKeyMap; } -@property (nonatomic) EAGLContext* context; -@property (nonatomic) NSString* documentsPath; -@property (nonatomic) NSString* bundlePath; -@property (nonatomic) NSMutableArray* touches; +@property (nonatomic, strong) EAGLContext* context; +@property (nonatomic, strong) NSString* documentsPath; +@property (nonatomic, strong) NSString* bundlePath; +@property (nonatomic, strong) NSMutableArray* touches; @property (nonatomic) AudioEngine* audioEngine; //@property (nonatomic) iCadeReaderView* iCadeView; #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 @@ -214,16 +214,6 @@ static GraphicsContext *graphicsContext; #endif } -- (void)viewDidUnload -{ - [super viewDidUnload]; - - if ([EAGLContext currentContext] == self.context) { - [EAGLContext setCurrentContext:nil]; - } - self.context = nil; -} - - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; @@ -231,7 +221,10 @@ static GraphicsContext *graphicsContext; - (void)dealloc { - [self viewDidUnload]; + if ([EAGLContext currentContext] == self.context) { + [EAGLContext setCurrentContext:nil]; + } + self.context = nil; #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1 if ([GCController class]) { From 4a119beb59c49d91df912c5e2badedd80c2be1bf Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sat, 30 Dec 2017 21:57:29 -0800 Subject: [PATCH 3/5] iOS: fix a reference counting bug that may have caused ViewController to never be deallocated --- ios/ViewController.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 4fd1c60739..2c9bbf436d 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -66,7 +66,7 @@ extern ScreenManager *screenManager; extern bool iosCanUseJit; extern bool targetIsJailbroken; -ViewController* sharedViewController; +__unsafe_unretained static ViewController* sharedViewController; static GraphicsContext *graphicsContext; @interface ViewController () From 152dc2192f377f63056e79545822d074c83567bb Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sun, 31 Dec 2017 19:36:47 -0800 Subject: [PATCH 4/5] iOS: convert all obj-c source code to ARC --- CMakeLists.txt | 5 +++++ ios/iCade/iCadeReaderView.h | 4 ++-- ios/iCade/iCadeReaderView.m | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5946a516b..a73684bf8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -692,6 +692,11 @@ elseif(IOS) set_source_files_properties(ios/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) set_source_files_properties(ios/ViewController.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(ios/iOSCoreAudio.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(ios/PPSSPPUIApplication.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(ios/iCade/iCadeReaderView.m PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(ios/main.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set(TargetBin PPSSPP) elseif(USING_QT_UI) diff --git a/ios/iCade/iCadeReaderView.h b/ios/iCade/iCadeReaderView.h index 2f39a3dd52..8a6bb586f9 100755 --- a/ios/iCade/iCadeReaderView.h +++ b/ios/iCade/iCadeReaderView.h @@ -50,7 +50,7 @@ @interface iCadeReaderView : UIView { UIView *inputView; iCadeState _iCadeState; - id _delegate; + id __weak _delegate; struct { bool stateChanged:1; @@ -60,7 +60,7 @@ } @property (nonatomic, assign) iCadeState iCadeState; -@property (nonatomic, assign) id delegate; +@property (nonatomic, weak) id delegate; @property (nonatomic, assign) BOOL active; @end diff --git a/ios/iCade/iCadeReaderView.m b/ios/iCade/iCadeReaderView.m index 48a0a59df3..cd0e94fa59 100755 --- a/ios/iCade/iCadeReaderView.m +++ b/ios/iCade/iCadeReaderView.m @@ -49,7 +49,6 @@ static const char *OFF_STATES = "eczqtrfnmpgv"; - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil]; - [super dealloc]; } - (void)didEnterBackground { From 67c6ecdecefe7042751e9e208ced73625e24b089 Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sun, 31 Dec 2017 19:53:59 -0800 Subject: [PATCH 5/5] nil out sharedViewController in case bindDefaultFBO is called again --- ios/ViewController.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 2c9bbf436d..c49a550710 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -221,6 +221,8 @@ static GraphicsContext *graphicsContext; - (void)dealloc { + sharedViewController = nil; + if ([EAGLContext currentContext] == self.context) { [EAGLContext setCurrentContext:nil]; }