macOS: Multiple windows broken with OpenGL backend (closes HumbleUI#118)

i10416 · Aug 20, 2021 · ca107e3 · ca107e3
1 parent e7b4441
commit ca107e3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ Alpha. Expect API breakages.
 |            | Windows | macOS | X11 |
 |------------|---------|-------|-----|
 | Raster     | ✅      | [#81](https://github.com/jetbrains/jwm/issues/81)   | ✅  |
-| OpenGL     | ✅      | [#118](https://github.com/jetbrains/jwm/issues/118)  | ✅  |
+| OpenGL     | ✅      | ✅    | ✅  |
 | DirectX 11 | ❌      | ➖    | ➖  |
 | DirectX 12 | ✅      | ➖    | ➖  |
 | Metal      | ➖      | ✅    | ➖  |

diff --git a/examples/java/org/jetbrains/jwm/examples/SkijaLayerGL.java b/examples/java/org/jetbrains/jwm/examples/SkijaLayerGL.java
@@ -10,6 +10,8 @@ public class SkijaLayerGL extends LayerGL implements SkijaLayer {
 
     @Override
     public Canvas beforePaint() {
+        makeCurrent();
+
         if (_directContext == null)
             _directContext = DirectContext.makeGL();
 

diff --git a/linux/cc/LayerGL.cc b/linux/cc/LayerGL.cc
@@ -97,6 +97,10 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nResize
     instance->resize(width, height);
 }
 
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nMakeCurrent
+  (JNIEnv* env, jobject obj) {
+}
+
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nSwapBuffers
   (JNIEnv* env, jobject obj) {
     jwm::LayerGL* instance = reinterpret_cast<jwm::LayerGL*>(jwm::classes::Native::fromJava(env, obj));

diff --git a/macos/cc/LayerGL.mm b/macos/cc/LayerGL.mm
@@ -124,6 +124,12 @@ void close() {
   (JNIEnv* env, jobject obj, jint width, jint height) {
 }
 
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nMakeCurrent
+  (JNIEnv* env, jobject obj) {
+    jwm::LayerGL* instance = reinterpret_cast<jwm::LayerGL*>(jwm::classes::Native::fromJava(env, obj));
+    [instance->fGLContext makeCurrentContext];
+}
+
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nResize
   (JNIEnv* env, jobject obj, jint width, jint height) {
     jwm::LayerGL* instance = reinterpret_cast<jwm::LayerGL*>(jwm::classes::Native::fromJava(env, obj));

diff --git a/shared/java/org/jetbrains/jwm/LayerGL.java b/shared/java/org/jetbrains/jwm/LayerGL.java
@@ -45,6 +45,11 @@ public int getHeight() {
         return _height;
     }
 
+    public void makeCurrent() {
+        assert _onUIThread();
+        _nMakeCurrent();
+    }
+
     @Override
     public void swapBuffers() {
         assert _onUIThread();
@@ -66,6 +71,7 @@ public void close() {
     @ApiStatus.Internal public static native long _nMake();
     @ApiStatus.Internal public native void _nAttach(Window window);
     @ApiStatus.Internal public native void _nReconfigure();
+    @ApiStatus.Internal public native void _nMakeCurrent();
     @ApiStatus.Internal public native void _nResize(int width, int height);
     @ApiStatus.Internal public native void _nSwapBuffers();
     @ApiStatus.Internal public native void _nClose();

diff --git a/windows/cc/LayerWGL.cc b/windows/cc/LayerWGL.cc
@@ -243,6 +243,10 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nResize
     instance->resize(width, height);
 }
 
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nMakeCurrent
+        (JNIEnv* env, jobject obj) {
+}
+
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_jwm_LayerGL__1nSwapBuffers
         (JNIEnv* env, jobject obj) {
     jwm::LayerWGL* instance = reinterpret_cast<jwm::LayerWGL*>(jwm::classes::Native::fromJava(env, obj));