fix(OpenCL) initialization on macOS 13

Close #861
LWJGL · Mar 27, 2023 · 635f53a · 635f53a
1 parent 773cdde
commit 635f53a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/doc/notes/3.3.2.md b/doc/notes/3.3.2.md
@@ -98,6 +98,7 @@ This build includes the following changes:
 - Core: Many debug messages can no longer tear under concurrency. (#825)
 - Build: Fixed offline mode with multiple local architectures. (#740)
 - NanoSVG: Fixed auto-sizing of `NSVGPath::pts` buffer.
+- OpenCL: Fixed initialization on macOS 13. (#861)
 - Opus: Fixed `pcm` parameter type of `opus_decode_float` function. (#785)
 - Remotery: Fixed `rmtSettings::free` callback signature.
 - stb: Fixed `stb_image_resize` flag values. (#857)

diff --git a/modules/lwjgl/opencl/src/main/java/org/lwjgl/opencl/CL.java b/modules/lwjgl/opencl/src/main/java/org/lwjgl/opencl/CL.java
@@ -57,10 +57,7 @@ public static void create() {
                 CL = Library.loadNative(CL.class, "org.lwjgl.opencl", Configuration.OPENCL_LIBRARY_NAME, "OpenCL");
                 break;
             case MACOSX:
-                String override = Configuration.OPENCL_LIBRARY_NAME.get();
-                CL = override != null
-                    ? Library.loadNative(CL.class, "org.lwjgl.opencl", override)
-                    : MacOSXLibrary.getWithIdentifier("com.apple.opencl");
+                CL = Library.loadNative(CL.class, "org.lwjgl.opencl", Configuration.OPENCL_LIBRARY_NAME, "/System/Library/Frameworks/OpenCL.framework/Versions/Current/OpenCL");
                 break;
             default:
                 throw new IllegalStateException();

diff --git a/modules/lwjgl/opengl/src/main/java/org/lwjgl/opengl/GL.java b/modules/lwjgl/opengl/src/main/java/org/lwjgl/opengl/GL.java
@@ -101,10 +101,7 @@ public static void create() {
                 GL = Library.loadNative(GL.class, "org.lwjgl.opengl", Configuration.OPENGL_LIBRARY_NAME, "libGL.so.1", "libGL.so");
                 break;
             case MACOSX:
-                String override = Configuration.OPENGL_LIBRARY_NAME.get();
-                GL = override != null
-                    ? Library.loadNative(GL.class, "org.lwjgl.opengl", override)
-                    : MacOSXLibrary.getWithIdentifier("com.apple.opengl");
+                GL = Library.loadNative(GL.class, "org.lwjgl.opengl", Configuration.OPENGL_LIBRARY_NAME, "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL");
                 break;
             case WINDOWS:
                 GL = Library.loadNative(GL.class, "org.lwjgl.opengl", Configuration.OPENGL_LIBRARY_NAME, "opengl32");