--- old/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java 2019-05-16 19:15:38.000000000 +0300 +++ new/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java 2019-05-16 19:15:37.000000000 +0300 @@ -77,8 +77,11 @@ import sun.awt.image.SunVolatileImage; import sun.awt.image.ToolkitImage; import sun.java2d.SunGraphics2D; +import sun.java2d.macos.MacOSFlags; +import sun.java2d.metal.MTLRenderQueue; import sun.java2d.opengl.OGLRenderQueue; import sun.java2d.pipe.Region; +import sun.java2d.pipe.RenderQueue; import sun.util.logging.PlatformLogger; public abstract class LWComponentPeer @@ -1434,7 +1437,8 @@ } protected static final void flushOnscreenGraphics(){ - final OGLRenderQueue rq = OGLRenderQueue.getInstance(); + RenderQueue rq = MacOSFlags.isMetalEnabled() ? + MTLRenderQueue.getInstance() : OGLRenderQueue.getInstance(); rq.lock(); try { rq.flushNow();