Do not initialize metal render delegate unless when using MetalFx

TimmyOVO · May 2, 2024 · 31af06d · 31af06d
1 parent e7b9e34
commit 31af06d
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m
@@ -214,19 +214,21 @@ - (void)viewDidLoad
                                                object: nil];
 #endif
 
-    _streamView.device = MTLCreateSystemDefaultDevice();
-    _streamView.backgroundColor = UIColor.blackColor;
-    if(!_streamView.device) {
-        NSLog(@"Metal is not supported on this device");
-        self.view = [[UIView alloc] initWithFrame:self.view.frame];
-        return;
-    }
-
-    if (@available(iOS 16.0, *)) {
-        _renderer = [[StreamViewRenderer alloc] initWithMetalKitView:_streamView];
-        [_renderer mtkView:_streamView drawableSizeWillChange:_streamView.drawableSize];
+    if ([_settings.metalFxMultiplier unsignedIntValue] > 1) {
+        _streamView.device = MTLCreateSystemDefaultDevice();
+        _streamView.backgroundColor = UIColor.blackColor;
+        if(!_streamView.device) {
+            NSLog(@"Metal is not supported on this device");
+            self.view = [[UIView alloc] initWithFrame:self.view.frame];
+            return;
+        }
+
+        if (@available(iOS 16.0, *)) {
+            _renderer = [[StreamViewRenderer alloc] initWithMetalKitView:_streamView];
+            [_renderer mtkView:_streamView drawableSizeWillChange:_streamView.drawableSize];
 
-        _streamView.delegate = _renderer;
+            _streamView.delegate = _renderer;
+        }
     }
 
     // Only enable scroll and zoom in absolute touch mode
@@ -348,10 +350,15 @@ - (void)updateOverlayText:(NSString*)text {
     }
 }
 
+- (void)viewDidDisappear:(BOOL)animated {
+    Log(LOG_I, @"Starting inactivity termination timer");
+}
 - (void) returnToMainFrame {
     // Reset display mode back to default
     [self updatePreferredDisplayMode:NO];
+    [self->_streamView invalidateIntrinsicContentSize];
     [self->_streamView releaseDrawables];
+    self->_streamView = nil;
     [_statsUpdateTimer invalidate];
     _statsUpdateTimer = nil;