Skip to content

Commit

Permalink
Fix: update ANGLE and default binding to desktop
Browse files Browse the repository at this point in the history
Updated ANGLE to
google/angle@6024e9c
9a549a95. It sucks that newer commit completely removed Desktop GL
frontend (as well as no LTW since GLES 3.x aren't gonna be implemented
anytime soon)
Misc: exclude simulator and Mac Catalyst from get-task-allow
enforcement.
  • Loading branch information
khanhduytran0 committed Dec 11, 2024
1 parent 16642e7 commit fb75288
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Natives/LauncherMenuViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ - (void)viewDidLoad {
} 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)
Expand Down
11 changes: 3 additions & 8 deletions Natives/ctxbridges/gl_bridge.m
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static bool gl_init() {
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
};

Expand All @@ -82,13 +82,8 @@ static bool gl_init() {
}

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);
Expand Down
Binary file modified Natives/resources/Frameworks/libEGL.framework/Info.plist
Binary file not shown.
Binary file modified Natives/resources/Frameworks/libEGL.framework/libEGL
Binary file not shown.
Binary file modified Natives/resources/Frameworks/libGLESv2.framework/Info.plist
Binary file not shown.
Binary file modified Natives/resources/Frameworks/libGLESv2.framework/libGLESv2
Binary file not shown.

0 comments on commit fb75288

Please sign in to comment.