JBR-7733 Metal: Properly reset the current context when destroying th…

…e surface
JetBrains · Oct 12, 2024 · 6454bc7 · 6454bc7
1 parent ceda379
commit 6454bc7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java
@@ -32,6 +32,7 @@
 
 import java.lang.annotation.Native;
 
+import static sun.java2d.pipe.BufferedOpCodes.DISPOSE_SURFACE;
 import static sun.java2d.pipe.BufferedOpCodes.SET_SCRATCH_SURFACE;
 
 /**
@@ -78,6 +79,20 @@ public static void setScratchSurface(long pConfigInfo) {
         buf.putLong(pConfigInfo);
     }
 
+    public static void disposeSurface(long pData) {
+        // assert MTLRenderQueue.getInstance().lock.isHeldByCurrentThread();
+
+        // invalidate the current context
+        currentContext = null;
+
+        // set the scratch context
+        MTLRenderQueue rq = MTLRenderQueue.getInstance();
+        RenderBuffer buf = rq.getBuffer();
+        rq.ensureCapacityAndAlignment(12, 4);
+        buf.putInt(DISPOSE_SURFACE);
+        buf.putLong(pData);
+    }
+
     public static class MTLContextCaps extends ContextCapabilities {
 
         /** Indicates that the context is doublebuffered. */

diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
@@ -627,11 +627,7 @@ public static void dispose(long pData) {
         MTLRenderQueue rq = MTLRenderQueue.getInstance();
         rq.lock();
         try {
-            RenderBuffer buf = rq.getBuffer();
-            rq.ensureCapacityAndAlignment(12, 4);
-            buf.putInt(DISPOSE_SURFACE);
-            buf.putLong(pData);
-
+            MTLContext.disposeSurface(pData);
             // this call is expected to complete synchronously, so flush now
             rq.flushNow();
         } finally {

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m
@@ -695,7 +695,9 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                             [mtlc.glyphCacheAA free];
                             [mtlc.glyphCacheLCD free];
                             [mtlc commitCommandBuffer:YES display:NO];
+                            mtlc = NULL;
                         }
+                        dstOps = NULL;
                         MTLSD_Delete(env, mtlsdo);
                     }
                     break;
@@ -710,7 +712,9 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                             [mtlc.glyphCacheAA free];
                             [mtlc.glyphCacheLCD free];
                             [mtlc commitCommandBuffer:YES display:NO];
+                            mtlc = NULL;
                         }
+                        dstOps = NULL;
                         MTLSD_Delete(env, mtlsdo);
                         if (mtlsdo->privOps != NULL) {
                             free(mtlsdo->privOps);