diff --git a/Natives/LauncherMenuViewController.m b/Natives/LauncherMenuViewController.m index 672d915e..3aa761f4 100644 --- a/Natives/LauncherMenuViewController.m +++ b/Natives/LauncherMenuViewController.m @@ -142,7 +142,7 @@ } else { [self enableJITWithAltKit]; } - } else { + } else if (!NSProcessInfo.processInfo.macCatalystApp && !getenv("SIMULATOR_DEVICE_NAME")) { [self displayProgress:localize(@"login.jit.fail", nil)]; [self displayProgress:nil]; UIAlertController* alert = [UIAlertController alertControllerWithTitle:localize(@"login.jit.fail.title", nil) diff --git a/Natives/ctxbridges/gl_bridge.m b/Natives/ctxbridges/gl_bridge.m index 0531dad6..2670639c 100644 --- a/Natives/ctxbridges/gl_bridge.m +++ b/Natives/ctxbridges/gl_bridge.m @@ -61,7 +61,7 @@ gl_render_window_t* gl_init_context(gl_render_window_t *share) { EGL_ALPHA_SIZE, 8, EGL_DEPTH_SIZE, 24, EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT, - EGL_RENDERABLE_TYPE, angleDesktopGL ? EGL_OPENGL_BIT : EGL_OPENGL_ES3_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, EGL_NONE }; @@ -82,13 +82,8 @@ gl_render_window_t* gl_init_context(gl_render_window_t *share) { } EGLBoolean bindResult; - if (angleDesktopGL) { - NSDebugLog(@"EGLBridge: Binding to desktop OpenGL"); - bindResult = handle.eglBindAPI(EGL_OPENGL_API); - } else { - NSDebugLog(@"EGLBridge: Binding to OpenGL ES"); - bindResult = handle.eglBindAPI(EGL_OPENGL_ES_API); - } + NSDebugLog(@"EGLBridge: Binding to desktop OpenGL (regardless of renderer)"); + bindResult = handle.eglBindAPI(EGL_OPENGL_API); if (!bindResult) NSDebugLog(@"EGLBridge: bind failed: %p\n", handle.eglGetError()); bundle->surface = handle.eglCreateWindowSurface(g_EglDisplay, bundle->config, (__bridge EGLNativeWindowType)SurfaceViewController.surface.layer, NULL); diff --git a/Natives/resources/Frameworks/libEGL.framework/Info.plist b/Natives/resources/Frameworks/libEGL.framework/Info.plist index c376556b..fcf42ad6 100644 Binary files a/Natives/resources/Frameworks/libEGL.framework/Info.plist and b/Natives/resources/Frameworks/libEGL.framework/Info.plist differ diff --git a/Natives/resources/Frameworks/libEGL.framework/libEGL b/Natives/resources/Frameworks/libEGL.framework/libEGL index 788f0352..5efa9cdf 100755 Binary files a/Natives/resources/Frameworks/libEGL.framework/libEGL and b/Natives/resources/Frameworks/libEGL.framework/libEGL differ diff --git a/Natives/resources/Frameworks/libGLESv2.framework/Info.plist b/Natives/resources/Frameworks/libGLESv2.framework/Info.plist index 869556f1..e94b77ec 100644 Binary files a/Natives/resources/Frameworks/libGLESv2.framework/Info.plist and b/Natives/resources/Frameworks/libGLESv2.framework/Info.plist differ diff --git a/Natives/resources/Frameworks/libGLESv2.framework/libGLESv2 b/Natives/resources/Frameworks/libGLESv2.framework/libGLESv2 index b661486f..cabdf27e 100755 Binary files a/Natives/resources/Frameworks/libGLESv2.framework/libGLESv2 and b/Natives/resources/Frameworks/libGLESv2.framework/libGLESv2 differ