8266520: Revert to OpenGL as the default 2D rendering pipeline for macOS

aghaisas · aghaisas · commit 79b39445f6fc · 2021-05-17T16:32:51.000Z
Reviewed-by: azvegint, trebari, kcr, prr
diff --git a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
@@ -90,16 +90,13 @@ private static void initJavaFlags() {
                     PropertyState metalState = getBooleanProp("sun.java2d.metal", PropertyState.UNSPECIFIED);
 
                     // Handle invalid combinations to use the default rendering pipeline
-                    // Current default rendering pipeline is Metal
-                    // (The default can be changed to OpenGL in future just by toggling two states in this if condition block)
-                    // ---------------------------------------------------------------------
-                    // TODO : Revert default rendering pipeline to OpenGL
-                    // ---------------------------------------------------------------------
+                    // Current default rendering pipeline is OpenGL
+                    // (The default can be changed to Metal in future just by toggling two states in this if condition block)
                     if ((oglState == PropertyState.UNSPECIFIED && metalState == PropertyState.UNSPECIFIED) ||
                         (oglState == PropertyState.DISABLED && metalState == PropertyState.DISABLED) ||
                         (oglState == PropertyState.ENABLED && metalState == PropertyState.ENABLED)) {
-                        metalState = PropertyState.ENABLED; // Enable default pipeline
-                        oglState = PropertyState.DISABLED; // Disable non-default pipeline
+                        oglState = PropertyState.ENABLED; // Enable default pipeline
+                        metalState = PropertyState.DISABLED; // Disable non-default pipeline
                     }
 
                     if (metalState == PropertyState.UNSPECIFIED) {
