Skip to content

Commit 79b3944

Browse files
committed
8266520: Revert to OpenGL as the default 2D rendering pipeline for macOS
Reviewed-by: azvegint, trebari, kcr, prr
1 parent 3c010a7 commit 79b3944

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,13 @@ private static void initJavaFlags() {
9090
PropertyState metalState = getBooleanProp("sun.java2d.metal", PropertyState.UNSPECIFIED);
9191

9292
// Handle invalid combinations to use the default rendering pipeline
93-
// Current default rendering pipeline is Metal
94-
// (The default can be changed to OpenGL in future just by toggling two states in this if condition block)
95-
// ---------------------------------------------------------------------
96-
// TODO : Revert default rendering pipeline to OpenGL
97-
// ---------------------------------------------------------------------
93+
// Current default rendering pipeline is OpenGL
94+
// (The default can be changed to Metal in future just by toggling two states in this if condition block)
9895
if ((oglState == PropertyState.UNSPECIFIED && metalState == PropertyState.UNSPECIFIED) ||
9996
(oglState == PropertyState.DISABLED && metalState == PropertyState.DISABLED) ||
10097
(oglState == PropertyState.ENABLED && metalState == PropertyState.ENABLED)) {
101-
metalState = PropertyState.ENABLED; // Enable default pipeline
102-
oglState = PropertyState.DISABLED; // Disable non-default pipeline
98+
oglState = PropertyState.ENABLED; // Enable default pipeline
99+
metalState = PropertyState.DISABLED; // Disable non-default pipeline
103100
}
104101

105102
if (metalState == PropertyState.UNSPECIFIED) {

0 commit comments

Comments
 (0)