Disable Zink on iOS 16 and later with release builds

Don't want users switching to Zink and asking why it's broken. Temporary measure until we can get our copy updated and working
This commit is contained in:
Eilionoir Tunnicliff committed 2023-04-21 14:22:38 -04:00
1 parent 6c10c4171c
commit b396fef7c2
3 files changed
+37 -15

No files matched your search

+36 -14
View File
@@ -21,7 +21,7 @@
typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
@interface LauncherPreferencesViewController(){}
@property(nonatomic) NSArray<NSString*>* prefSections;
@property(nonatomic) NSArray<NSString*>* prefSections, *rendererKeys, *rendererList;
@property(nonatomic) NSMutableArray<NSNumber*>* prefSectionsVisibility;
@property(nonatomic) NSArray<NSArray<NSDictionary*>*>* prefContents;
@property(nonatomic) BOOL prefDetailVisible;
@@ -60,6 +60,37 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
for (int i = 0; i < self.prefSections.count; i++) {
[self.prefSectionsVisibility addObject:@NO];
}
#if CONFIG_RELEASE
if(@available(iOS 16.0, *)) {
// Disabling Zink on iOS 16.0+ to figure out what's wrong with it
self.rendererKeys = @[
@"auto",
@ RENDERER_NAME_GL4ES,
@ RENDERER_NAME_MTL_ANGLE
];
self.rendererList = @[
localize(@"preference.title.renderer.auto", nil),
localize(@"preference.title.renderer.gl4es", nil),
localize(@"preference.title.renderer.angle", nil)
];
} else {
#endif
self.rendererKeys = @[
@"auto",
@ RENDERER_NAME_GL4ES,
@ RENDERER_NAME_MTL_ANGLE,
@ RENDERER_NAME_VK_ZINK
];
self.rendererList = @[
localize(@"preference.title.renderer.auto", nil),
localize(@"preference.title.renderer.gl4es", nil),
localize(@"preference.title.renderer.angle", nil),
localize(@"preference.title.renderer.zink", nil)
];
#if CONFIG_RELEASE
}
#endif
self.prefContents = @[
@[
@@ -92,7 +123,7 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
@"type": self.typeSwitch,
@"action": ^(BOOL enabled){
debugLogEnabled = enabled;
NSLog(@"Debug log enabled: %@", enabled ? @"YES" : @"NO");
NSLog(@"[Debugging] Debug log enabled: %@", enabled ? @"YES" : @"NO");
}
},
@{@"key": @"jitstreamer_server",
@@ -190,21 +221,12 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
// Video and renderer settings
@{@"icon": @"video"},
@{@"key": @"renderer",
@"hasDetail": @YES,
@"icon": @"cpu",
@"type": self.typePickField,
@"enableCondition": whenNotInGame,
@"pickKeys": @[
@"auto",
@ RENDERER_NAME_GL4ES,
@ RENDERER_NAME_MTL_ANGLE,
@ RENDERER_NAME_VK_ZINK
],
@"pickList": @[
localize(@"preference.title.renderer.auto", nil),
localize(@"preference.title.renderer.gl4es", nil),
localize(@"preference.title.renderer.angle", nil),
localize(@"preference.title.renderer.zink", nil)
]
@"pickKeys": self.rendererKeys,
@"pickList": self.rendererList
},
@{@"key": @"resolution",
@"hasDetail": @YES,
+1 -1
View File
@@ -165,7 +165,7 @@
"preference.title.renderer.gl4es" = "holy gl4es - exports OpenGL 2.1";
"preference.title.renderer.angle" = "ANGLE (1.17+) - exports OpenGL 3.2 (Core Profile, limited)";
"preference.title.renderer.zink" = "Zink (Mesa 21.0) - exports OpenGL 4.1";
"preference.detail.renderer" = "Change the OpenGL render engine to use";
"preference.detail.renderer" = "Change the OpenGL render engine to use. Zink is temporarily disabled on iOS 16 and later to diagnose issues.";
"preference.title.resolution" = "Resolution (%)";
"preference.detail.resolution" = "Allows you to decrease the game resolution.";
Binary file not shown.