fixup! update exclude list on results of 25.87.14 test runs

Ensure the jmethod_ids array has sufficient initial capacity. This array is not resized since JDK 23.

.github/workflows/main.yml

@@ -30,6 +30,7 @@ on:
     branches-ignore:
       - master
       - pr/*
+      - jdk*
       - main
   workflow_dispatch:
     inputs:

jb/project/tools/mac/scripts/entitlements_jcef.xml

@@ -3,7 +3,7 @@
 <plist version="1.0">
     <dict>
         <key>com.apple.security.cs.allow-jit</key>
-        <true/>
+        <false/>
         <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
         <false/>
         <key>com.apple.security.cs.allow-dyld-environment-variables</key>

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -67,7 +67,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${BUILD_JDK}/bin/jlink.exe \
+  ${BUILD_JDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -123,7 +123,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -60,7 +60,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -116,7 +116,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -56,7 +56,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 

make/autoconf/lib-vulkan.m4

@@ -89,7 +89,7 @@ AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
     if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
       UTIL_LOOKUP_PROGS(GLSLC, glslc)
       SHADER_COMPILER="$GLSLC"
-      VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num"
+      VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
     fi
 
     # Check glslangValidator
@@ -97,8 +97,7 @@ AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
         test "x$SHADER_COMPILER" = x; then
       UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
       SHADER_COMPILER="$GLSLANG"
-      # Newer glslangValidator could use -P\"\#extension GL_GOOGLE_include_directive: require\"
-      VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x"
+      VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
     fi
 
     if test "x$SHADER_COMPILER" = x; then

make/modules/java.desktop/Java.gmk

@@ -120,8 +120,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
 endif
 
 ifneq ($(VULKAN_ENABLED), true)
-  EXCLUDE_FILES += $(filter-out $(TOPDIR)/src/java.desktop/share/classes/sun/java2d/vulkan/VKEnv.java, \
-                                $(wildcard $(TOPDIR)/src/java.desktop/*/classes/sun/java2d/vulkan/*.java))
+  EXCLUDES += sun/java2d/vulkan
 endif
 
 # These files do not appear in the build result of the old build. This

make/modules/java.desktop/gensrc/GensrcWayland.gmk

@@ -35,7 +35,6 @@ WAYLAND_BASIC_PROTOCOL_FILES := \
         $(WAYLAND_PROTOCOLS_ROOT)/staging/xdg-activation/xdg-activation-v1.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/unstable/primary-selection/primary-selection-unstable-v1.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/unstable/xdg-output/xdg-output-unstable-v1.xml \
-        $(WAYLAND_PROTOCOLS_ROOT)/unstable/relative-pointer/relative-pointer-unstable-v1.xml \
         $(GTK_SHELL1_PROTOCOL_PATH) \
         #
 

make/modules/java.desktop/lib/AwtLibraries.gmk

@@ -199,7 +199,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
         -framework OpenGL, \
     LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
         gdi32.lib gdiplus.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
-        user32.lib uuid.lib winmm.lib winspool.lib dwmapi.lib $(A11Y_NVDA_ANNOUNCING_LIBS) oleacc.lib, \
+        user32.lib uuid.lib winmm.lib winspool.lib dwmapi.lib $(A11Y_NVDA_ANNOUNCING_LIBS), \
     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
     EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
     STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_STATIC_EXCLUDE_OBJS), \
@@ -220,7 +220,7 @@ endif
 # Compile Vulkan shaders
 define compile-spirv
   $(call MakeTargetDir)
-  $(VULKAN_SHADER_COMPILER) -D$(call uppercase,$(patsubst .%,STAGE_%,$(suffix $<))) -o '$(call DecodeSpace, $@)' '$(call DecodeSpace, $<)'
+  $(VULKAN_SHADER_COMPILER) '$(call DecodeSpace, $@)' '$(call DecodeSpace, $<)'
 endef
 spirv-name = $(strip $1).h
 

src/hotspot/share/gc/g1/g1VMOperations.cpp

@@ -55,10 +55,8 @@ void VM_G1CollectFull::doit() {
                             true      /* do_maximal_compaction */,
                             size_t(0) /* allocation_word_size */);
   } else {
-    bool clear_all_soft_refs = _gc_cause == GCCause::_metadata_GC_clear_soft_refs ||
-                               _gc_cause == GCCause::_wb_full_gc;
-    g1h->do_full_collection(clear_all_soft_refs /* clear_all_soft_refs */,
-                            false /* do_maximal_compaction */,
+    g1h->do_full_collection(false     /* clear_all_soft_refs */,
+                            false     /* do_maximal_compaction */,
                             size_t(0) /* allocation_word_size */);
   }
 }

src/hotspot/share/services/attachListener.cpp

@@ -172,8 +172,8 @@ volatile AttachListenerState AttachListener::_state = AL_NOT_INITIALIZED;
 
 AttachAPIVersion AttachListener::_supported_version = ATTACH_API_V1;
 
-// Default is false (if jdk.attach.vm.streaming property is not set).
-bool AttachListener::_default_streaming_output = false;
+// Default is true (if jdk.attach.vm.streaming property is not set).
+bool AttachListener::_default_streaming_output = true;
 
 static bool get_bool_sys_prop(const char* name, bool default_value, TRAPS) {
   ResourceMark rm(THREAD);

src/java.base/share/classes/com/jetbrains/internal/IoOverNio.java

@@ -65,7 +65,7 @@ public class IoOverNio {
     }
 
     public static boolean isAllowedInThisThread() {
-        return IS_ENABLED_IN_GENERAL && ALLOW_IN_THIS_THREAD.get() == null;
+        return ALLOW_IN_THIS_THREAD.get() == null;
     }
 
     /**

src/java.base/share/classes/java/util/zip/ZipFile.java

@@ -67,8 +67,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-
-import com.jetbrains.internal.IoOverNio;
 import jdk.internal.access.JavaUtilZipFileAccess;
 import jdk.internal.access.JavaUtilJarAccess;
 import jdk.internal.access.SharedSecrets;
@@ -1601,12 +1599,8 @@ public class ZipFile implements ZipConstants, Closeable {
         static Source get(File file, boolean toDelete, ZipCoder zipCoder) throws IOException {
             final Key key;
             try {
-                java.nio.file.FileSystem fs =
-                        USE_NIO_FOR_ZIP_FILE_ACCESS && IoOverNio.isAllowedInThisThread()
-                                ? FileSystems.getDefault()
-                                : builtInFS;
                 key = new Key(file,
-                        Files.readAttributes(fs.getPath(file.getPath()),
+                        Files.readAttributes(builtInFS.getPath(file.getPath()),
                                 BasicFileAttributes.class), zipCoder.charset());
             } catch (InvalidPathException ipe) {
                 throw new IOException(ipe);
@@ -1643,7 +1637,7 @@ public class ZipFile implements ZipConstants, Closeable {
 
         private Source(Key key, boolean toDelete, ZipCoder zipCoder) throws IOException {
             this.key = key;
-            if (USE_NIO_FOR_ZIP_FILE_ACCESS && VM.isBooted() && IoOverNio.isAllowedInThisThread()) {
+            if (USE_NIO_FOR_ZIP_FILE_ACCESS && VM.isBooted()) {
                 Set<OpenOption> options;
                 if (toDelete) {
                     options = Set.of(StandardOpenOption.READ, StandardOpenOption.DELETE_ON_CLOSE);

src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java

@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public final class ExtendedOptions {
 
     // maps InternalOption to ExternalOption
-    private static final Map<InternalOption<?>, Wrapper<?>[]> internalToExternal
+    private static final Map<InternalOption<?>, Wrapper<?>> internalToExternal
         = new ConcurrentHashMap<>();
 
     /**
@@ -69,18 +69,7 @@ public final class ExtendedOptions {
 
         private void registerInternal(Object option, T param) {
             Wrapper<T> wrapper = new Wrapper<T>(option, param);
-            internalToExternal.compute(this, (ignored, oldWrappers) -> {
-                if (oldWrappers == null || oldWrappers.length == 0)
-                    return new Wrapper<?>[] { wrapper };
-                for (Wrapper<?> oldWrapper : oldWrappers) {
-                    if (oldWrapper.option == option)
-                        return oldWrappers;
-                }
-                Wrapper<?>[] newWrappers = new Wrapper<?>[oldWrappers.length + 1];
-                System.arraycopy(oldWrappers, 0, newWrappers, 0, oldWrappers.length);
-                newWrappers[oldWrappers.length] = wrapper;
-                return newWrappers;
-            });
+            internalToExternal.put(this, wrapper);
         }
 
         /**
@@ -117,14 +106,11 @@ public final class ExtendedOptions {
          * option.
          */
         public boolean matches(Object option) {
-            Wrapper <?> [] wrappers = internalToExternal.get(this);
-            if (wrappers != null) {
-                for (Wrapper<?> wrapper : wrappers) {
-                    if (wrapper.option == option)
-                        return true;
-                }
-            }
-            return false;
+            Wrapper <?> wrapper = internalToExternal.get(this);
+            if (wrapper == null)
+                return false;
+            else
+                return option == wrapper.option;
         }
 
         /**
@@ -132,14 +118,11 @@ public final class ExtendedOptions {
          */
         @SuppressWarnings("unchecked")
         public T parameter() {
-            Wrapper<?> [] wrappers = internalToExternal.get(this);
-            if (wrappers != null) {
-                for (Wrapper<?> wrapper : wrappers) {
-                    if (wrapper.option instanceof WatchEvent.Modifier)
-                        return (T) wrapper.parameter();
-                }
-            }
-            return null;
+            Wrapper<?> wrapper = internalToExternal.get(this);
+            if (wrapper == null)
+                return null;
+            else
+                return (T) wrapper.parameter();
         }
     }
 

src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java

@@ -93,10 +93,12 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
         return false;
     }
 
+    @Override
     public synchronized int charToVariationGlyphRaw(int unicode, int variationSelector) {
         return charToVariationGlyph(unicode, variationSelector);
     }
 
+    @Override
     public synchronized int charToVariationGlyph(int unicode, int variationSelector) {
         if (variationSelector == 0) {
             return charToGlyph(unicode);
@@ -112,7 +114,6 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
         return glyphArray[0];
     }
 
-    @Override
     public synchronized int charToGlyph(char unicode) {
         return charToGlyph(unicode, false);
     }

src/java.desktop/macosx/classes/sun/font/CFont.java

@@ -31,6 +31,7 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
 import sun.java2d.Disposer;
 import sun.java2d.DisposerRecord;
 

src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java

@@ -33,6 +33,7 @@ import sun.lwawt.macosx.CFLayer;
 import sun.util.logging.PlatformLogger;
 
 import java.awt.Component;
+import java.awt.GraphicsConfiguration;
 import java.awt.Insets;
 import java.awt.Window;
 
@@ -50,13 +51,12 @@ public class MTLLayer extends CFLayer {
     private static native void nativeSetOpaque(long layerPtr, boolean opaque);
 
     private int scale = 1;
-    private final boolean perfCountersEnabled;
 
     public MTLLayer(LWWindowPeer peer) {
         super(0, true);
 
         Window target = (peer != null) ? peer.getTarget() : null;
-        this.perfCountersEnabled = (target != null) && AWTAccessor.getWindowAccessor().countersEnabled(target);
+        boolean perfCountersEnabled = (target != null) && AWTAccessor.getWindowAccessor().countersEnabled(target);
 
         setPtr(nativeCreateLayer(perfCountersEnabled));
         this.peer = peer;
@@ -150,29 +150,11 @@ public class MTLLayer extends CFLayer {
         }
     }
 
-    private final static String[] STAT_NAMES = new String[]{
-            "java2d.native.mtlLayer.drawInMTLContext",  // type = 0
-            "java2d.native.mtlLayer.nextDrawable"       // type = 1
-    };
-
-    private void addStat(int type, double value) {
-        // Called from the native code when this layer has been presented on screen
-        if (perfCountersEnabled && (peer != null)) {
-            final Component target = peer.getTarget();
-            if (target instanceof Window window) {
-                AWTAccessor.getWindowAccessor().addStat(window,
-                        ((type >= 0) && (type < STAT_NAMES.length)) ? STAT_NAMES[type] : "undefined", value);
-            }
-        }
-    }
-
     private void countNewFrame() {
         // Called from the native code when this layer has been presented on screen
-        if (perfCountersEnabled && (peer != null)) {
-            final Component target = peer.getTarget();
-            if (target instanceof Window window) {
-                AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.frames");
-            }
+        Component target = peer.getTarget();
+        if (target instanceof Window window) {
+            AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.frames");
         }
     }
 
@@ -180,11 +162,9 @@ public class MTLLayer extends CFLayer {
         // Called from the native code when an attempt was made to present this layer
         // on screen, but that attempt was not successful. This can happen, for example,
         // when those attempts are too frequent.
-        if (perfCountersEnabled && (peer != null)) {
-            final Component target = peer.getTarget();
-            if (target instanceof Window window) {
-                AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.framesDropped");
-            }
+        Component target = peer.getTarget();
+        if (target instanceof Window window) {
+            AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.framesDropped");
         }
     }
 }

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h

@@ -71,8 +71,6 @@
 - (void) stopRedraw:(MTLContext*)mtlc displayID:(jint)displayID force:(BOOL)force;
 - (void) flushBuffer;
 - (void) commitCommandBuffer:(MTLContext*)mtlc wait:(BOOL)waitUntilCompleted display:(BOOL)updateDisplay;
-
-- (void) addStatCallback:(int)type value:(double)value;
 - (void) countFramePresentedCallback;
 - (void) countFrameDroppedCallback;
 @end

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m

@@ -226,33 +226,29 @@ BOOL MTLLayer_isExtraRedrawEnabled() {
             }
 
             // Acquire CAMetalDrawable without blocking:
-            const CFTimeInterval beforeDrawableTime = CACurrentMediaTime();
+            const CFTimeInterval beforeDrawableTime = (TRACE_DISPLAY) ? CACurrentMediaTime() : 0.0;
             const id<CAMetalDrawable> mtlDrawable = [self nextDrawable];
             if (mtlDrawable == nil) {
                 J2dTraceLn(J2D_TRACE_VERBOSE, "MTLLayer.blitTexture: nextDrawable is null");
                 return;
             }
-            const CFTimeInterval nextDrawableTime = CACurrentMediaTime();
-            const CFTimeInterval nextDrawableLatency = (nextDrawableTime - beforeDrawableTime);
+            const CFTimeInterval nextDrawableTime = (TRACE_DISPLAY) ? CACurrentMediaTime() : 0.0;
 
             // rolling mean weight (lerp):
             static const NSTimeInterval a = 0.25;
 
-            if (nextDrawableLatency > 0.0) {
-                if (self.perfCountersEnabled) {
-                    [self addStatCallback:1 value:1000.0 * nextDrawableLatency]; // See MTLLayer.STAT_NAMES[1]
-                }
 #if TRACE_DISPLAY_ON
+            const CFTimeInterval nextDrawableLatency = (nextDrawableTime - beforeDrawableTime);
+            if (nextDrawableLatency > 0.0) {
                 self.avgNextDrawableTime = nextDrawableLatency * a + self.avgNextDrawableTime * (1.0 - a);
-
-                J2dRlsTraceLn(J2D_TRACE_VERBOSE,
-                              "[%.6lf] MTLLayer_blitTexture: drawable(%d) presented"
-                              " - nextDrawableLatency = %.3lf ms - average = %.3lf ms",
-                              CACurrentMediaTime(), mtlDrawable.drawableID,
-                              1000.0 * nextDrawableLatency, 1000.0 * self.avgNextDrawableTime
-                );
-#endif
             }
+            J2dRlsTraceLn(J2D_TRACE_VERBOSE,
+                          "[%.6lf] MTLLayer_blitTexture: drawable(%d) presented"
+                          " - nextDrawableLatency = %.3lf ms - average = %.3lf ms",
+                          CACurrentMediaTime(), mtlDrawable.drawableID,
+                          1000.0 * nextDrawableLatency, 1000.0 * self.avgNextDrawableTime
+            );
+#endif
             // Keep Fence from now:
             releaseFence = NO;
 
@@ -393,17 +389,8 @@ BOOL MTLLayer_isExtraRedrawEnabled() {
         return;
     }
 
-    const CFTimeInterval beforeMethod = CACurrentMediaTime();
-
     (*env)->CallVoidMethod(env, javaLayerLocalRef, jm_drawInMTLContext);
     CHECK_EXCEPTION();
-
-    const CFTimeInterval drawInMTLContextLatency = (CACurrentMediaTime() - beforeMethod);
-    if (drawInMTLContextLatency > 0.0) {
-        if (self.perfCountersEnabled) {
-            [self addStatCallback:0 value:1000.0 * drawInMTLContextLatency]; // See MTLLayer.STAT_NAMES[0]
-        }
-    }
     (*env)->DeleteLocalRef(env, javaLayerLocalRef);
 }
 
@@ -529,20 +516,6 @@ BOOL MTLLayer_isExtraRedrawEnabled() {
     }
 }
 
-- (void) addStatCallback:(int)type value:(double)value {
-    // attach the current thread to the JVM if necessary, and get an env
-    JNIEnv* env = [ThreadUtilities getJNIEnvUncached];
-    GET_MTL_LAYER_CLASS();
-    DECLARE_METHOD(jm_addStatFrame, jc_JavaLayer, "addStat", "(ID)V");
-
-    jobject javaLayerLocalRef = (*env)->NewLocalRef(env, self.javaLayer);
-    if (javaLayerLocalRef != NULL) {
-        (*env)->CallVoidMethod(env, javaLayerLocalRef, jm_addStatFrame, (jint)type, (jdouble)value);
-        CHECK_EXCEPTION();
-        (*env)->DeleteLocalRef(env, javaLayerLocalRef);
-    }
-}
-
 - (void) countFrameDroppedCallback {
     // attach the current thread to the JVM if necessary, and get an env
     JNIEnv* env = [ThreadUtilities getJNIEnvUncached];

src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,10 @@
 package com.sun.java.swing;
 
 import java.applet.Applet;
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.Rectangle;
 import java.awt.Stroke;
 import java.awt.Window;
 import java.awt.geom.AffineTransform;
@@ -40,16 +37,11 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
 import javax.swing.JComponent;
-import javax.swing.JMenu;
 import javax.swing.RepaintManager;
 
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
-import sun.swing.MenuItemLayoutHelper;
-import sun.swing.SwingUtilities2;
 
 import static sun.java2d.pipe.Region.clipRound;
 
@@ -72,10 +64,6 @@ public class SwingUtilities3 {
     private static final Object DELEGATE_REPAINT_MANAGER_KEY =
         new StringBuilder("DelegateRepaintManagerKey");
 
-    private static Color disabledForeground;
-    private static Color acceleratorSelectionForeground;
-    private static Color acceleratorForeground;
-
     /**
       * Registers delegate RepaintManager for {@code JComponent}.
       */
@@ -155,128 +143,6 @@ public class SwingUtilities3 {
         return delegate;
     }
 
-    public static void applyInsets(Rectangle rect, Insets insets) {
-        if (insets != null) {
-            rect.x += insets.left;
-            rect.y += insets.top;
-            rect.width -= (insets.right + rect.x);
-            rect.height -= (insets.bottom + rect.y);
-        }
-    }
-
-    public static void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,
-                               MenuItemLayoutHelper.LayoutResult lr,
-                               Color holdc, Color foreground) {
-        if (lh.getCheckIcon() != null) {
-            ButtonModel model = lh.getMenuItem().getModel();
-            if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
-                    && model.isSelected())) {
-                g.setColor(foreground);
-            } else {
-                g.setColor(holdc);
-            }
-            if (lh.useCheckAndArrow()) {
-                lh.getCheckIcon().paintIcon(lh.getMenuItem(), g,
-                        lr.getCheckRect().x, lr.getCheckRect().y);
-            }
-            g.setColor(holdc);
-        }
-    }
-
-    public static void paintIcon(Graphics g, MenuItemLayoutHelper lh,
-                          MenuItemLayoutHelper.LayoutResult lr, Color holdc) {
-        if (lh.getIcon() != null) {
-            Icon icon;
-            ButtonModel model = lh.getMenuItem().getModel();
-            if (!model.isEnabled()) {
-                icon = lh.getMenuItem().getDisabledIcon();
-            } else if (model.isPressed() && model.isArmed()) {
-                icon = lh.getMenuItem().getPressedIcon();
-                if (icon == null) {
-                    // Use default icon
-                    icon = lh.getMenuItem().getIcon();
-                }
-            } else {
-                icon = lh.getMenuItem().getIcon();
-            }
-
-            if (icon != null) {
-                icon.paintIcon(lh.getMenuItem(), g, lr.getIconRect().x,
-                        lr.getIconRect().y);
-                g.setColor(holdc);
-            }
-        }
-    }
-
-
-    public static void paintAccText(Graphics g, MenuItemLayoutHelper lh,
-                             MenuItemLayoutHelper.LayoutResult lr) {
-        if (!lh.getAccText().isEmpty()) {
-            ButtonModel model = lh.getMenuItem().getModel();
-            g.setFont(lh.getAccFontMetrics().getFont());
-            if (!model.isEnabled()) {
-
-                // paint the accText disabled
-                if (disabledForeground != null) {
-                    g.setColor(disabledForeground);
-                    SwingUtilities2.drawString(lh.getMenuItem(), g,
-                            lh.getAccText(), lr.getAccRect().x,
-                            lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
-                } else {
-                    g.setColor(lh.getMenuItem().getBackground().brighter());
-                    SwingUtilities2.drawString(lh.getMenuItem(), g,
-                            lh.getAccText(), lr.getAccRect().x,
-                            lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
-                    g.setColor(lh.getMenuItem().getBackground().darker());
-                    SwingUtilities2.drawString(lh.getMenuItem(), g,
-                            lh.getAccText(), lr.getAccRect().x - 1,
-                            lr.getAccRect().y + lh.getFontMetrics().getAscent() - 1);
-                }
-            } else {
-
-                // paint the accText normally
-                if (model.isArmed()
-                        || (lh.getMenuItem() instanceof JMenu
-                        && model.isSelected())) {
-                    g.setColor(acceleratorSelectionForeground);
-                } else {
-                    g.setColor(acceleratorForeground);
-                }
-                SwingUtilities2.drawString(lh.getMenuItem(), g, lh.getAccText(),
-                        lr.getAccRect().x, lr.getAccRect().y +
-                                lh.getAccFontMetrics().getAscent());
-            }
-        }
-    }
-
-    public static void setDisabledForeground(Color disabledFg) {
-        disabledForeground = disabledFg;
-    }
-
-    public static void setAcceleratorSelectionForeground(Color acceleratorSelectionFg) {
-        acceleratorSelectionForeground = acceleratorSelectionFg;
-    }
-
-    public static void setAcceleratorForeground(Color acceleratorFg) {
-        acceleratorForeground = acceleratorFg;
-    }
-
-    public static void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
-                               MenuItemLayoutHelper.LayoutResult lr,
-                               Color foreground) {
-        if (lh.getArrowIcon() != null) {
-            ButtonModel model = lh.getMenuItem().getModel();
-            if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
-                    && model.isSelected())) {
-                g.setColor(foreground);
-            }
-            if (lh.useCheckAndArrow()) {
-                lh.getArrowIcon().paintIcon(lh.getMenuItem(), g,
-                        lr.getArrowRect().x, lr.getArrowRect().y);
-            }
-        }
-    }
-
     /**
      * A task which paints an <i>unscaled</i> border after {@code Graphics}
      * transforms are removed. It's used with the

src/java.desktop/share/classes/java/awt/Component.java

@@ -53,14 +53,10 @@ import java.awt.event.TextEvent;
 import java.awt.im.InputContext;
 import java.awt.im.InputMethodRequests;
 import java.awt.image.BufferStrategy;
-import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
-import java.awt.image.Raster;
-import java.awt.image.SampleModel;
 import java.awt.image.VolatileImage;
-import java.awt.image.WritableRaster;
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.ContainerPeer;
 import java.awt.peer.LightweightPeer;
@@ -93,7 +89,6 @@ import javax.accessibility.AccessibleStateSet;
 import javax.swing.JComponent;
 import javax.swing.JRootPane;
 
-import com.jetbrains.exported.JBRApi;
 import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
 import sun.awt.ComponentFactory;
@@ -104,7 +99,6 @@ import sun.awt.EmbeddedFrame;
 import sun.awt.RequestFocusController;
 import sun.awt.SubRegionShowable;
 import sun.awt.SunToolkit;
-import sun.awt.SurfacePixelGrabber;
 import sun.awt.dnd.SunDropTargetEvent;
 import sun.awt.im.CompositionArea;
 import sun.awt.image.VSyncedBSManager;
@@ -10565,79 +10559,4 @@ public abstract class Component implements ImageObserver, MenuContainer,
         }
         return p.updateCustomTitleBarHitTest(allowNativeActions);
     }
-
-    @JBRApi.Provides("Screenshoter#getWindowBackbufferArea")
-    private static BufferedImage getWindowBackbufferArea(Window window, int x, int y, int width, int height) {
-        Objects.requireNonNull(window);
-
-        if (x < 0 || y < 0) {
-            throw new IllegalArgumentException("Negative coordinates are not allowed");
-        }
-
-        if (width <= 0 || height <= 0) {
-            throw new IllegalArgumentException("The size must be positive");
-        }
-
-        Image fullBackbuffer = window.getBackBuffer();
-        if (fullBackbuffer == null) {
-            return null;
-        }
-
-        var bufferWidth = fullBackbuffer.getWidth(null);
-        var bufferHeight = fullBackbuffer.getHeight(null);
-        if (x >= width) {
-            throw new IllegalArgumentException(String.format("x coordinate (%d) is out of bounds (%d)", x, bufferWidth));
-        }
-
-        if (y >= height) {
-            throw new IllegalArgumentException(String.format("y coordinate (%d) is out of bounds (%d)", y, bufferHeight));
-        }
-
-        if ((long) x + width > bufferWidth) {
-            width = bufferWidth - x;
-        }
-
-        if ((long) y + height > bufferHeight) {
-            height  = bufferHeight - y;
-        }
-
-        if (fullBackbuffer instanceof BufferedImage bufferedImage) {
-            return bufferedImage.getSubimage(x, y, width, height);
-        } else {
-            ColorModel colorModel = window.getGraphicsConfiguration().getColorModel();
-            SampleModel sampleModel = colorModel.createCompatibleSampleModel(width, height);
-            WritableRaster raster = Raster.createWritableRaster(sampleModel, null);
-            BufferedImage image = new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
-            image.getGraphics().drawImage(fullBackbuffer,
-                    0, 0, width, height,
-                    x, y, x + width, y + height,
-                    null);
-            return image;
-        }
-    }
-
-    @JBRApi.Provides("Screenshoter#getWindowSurfaceArea")
-    private static BufferedImage getWindowSurfaceArea(Window window, int x, int y, int width, int height) {
-        Objects.requireNonNull(window);
-
-        if (x < 0 || y < 0) {
-            throw new IllegalArgumentException("Negative coordinates are not allowed");
-        }
-
-        if (width <= 0 || height <= 0) {
-            throw new IllegalArgumentException("The size must be positive");
-        }
-
-        ComponentPeer peer = window.peer;
-        if (peer == null || !window.isVisible()) {
-            return null;
-        }
-
-        if (peer instanceof SurfacePixelGrabber spg) {
-            // TODO: translate coordinates, maybe?
-            return spg.getClientAreaSnapshot(x, y, width, height);
-        }
-
-        return null;
-    }
 }

src/java.desktop/share/classes/java/awt/Window.java

@@ -34,6 +34,7 @@ import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
 import java.awt.geom.Path2D;
+import java.awt.geom.Point2D;
 import java.awt.im.InputContext;
 import java.awt.image.BufferStrategy;
 import java.awt.peer.ComponentPeer;
@@ -43,7 +44,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OptionalDataException;
-import java.io.PrintStream;
 import java.io.Serial;
 import java.io.Serializable;
 import java.lang.annotation.Native;
@@ -53,15 +53,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EventListener;
-import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -72,14 +69,11 @@ import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
 import com.jetbrains.exported.JBRApi;
-import jdk.internal.misc.InnocuousThread;
 import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
 import sun.awt.DebugSettings;
 import sun.awt.SunToolkit;
 import sun.awt.util.IdentityArrayList;
-import sun.awt.util.ThreadGroupUtils;
-import sun.java2d.marlin.stats.StatDouble;
 import sun.java2d.pipe.Region;
 import sun.util.logging.PlatformLogger;
 
@@ -1159,51 +1153,45 @@ public class Window extends Container implements Accessible {
     }
 
     void doDispose() {
-        final class DisposeAction implements Runnable {
-            public void run() {
-                final Window window = Window.this;
-
-                // dump stats if needed:
-                AWTAccessor.getWindowAccessor().dumpStats(window, true, null);
-
-                disposing = true;
-                try {
-                    // Check if this window is the fullscreen window for the
-                    // device. Exit the fullscreen mode prior to disposing
-                    // of the window if that's the case.
-                    GraphicsDevice gd = getGraphicsConfiguration().getDevice();
-                    if (gd.getFullScreenWindow() == window) {
-                        gd.setFullScreenWindow(null);
-                    }
-
-                    Object[] ownedWindowArray;
-                    synchronized(ownedWindowList) {
-                        ownedWindowArray = new Object[ownedWindowList.size()];
-                        ownedWindowList.copyInto(ownedWindowArray);
-                    }
-                    for (int i = 0; i < ownedWindowArray.length; i++) {
-                        Window child = (Window) (((WeakReference)
-                                       (ownedWindowArray[i])).get());
-                        if (child != null) {
-                            child.disposeImpl();
-                        }
-                    }
-                    hide();
-                    beforeFirstShow = true;
-                    removeNotify();
-                    synchronized (inputContextLock) {
-                        if (inputContext != null) {
-                            inputContext.dispose();
-                            inputContext = null;
-                        }
-                    }
-                    clearCurrentFocusCycleRootOnHide();
-                } finally {
-                    disposing = false;
+    class DisposeAction implements Runnable {
+        public void run() {
+            disposing = true;
+            try {
+                // Check if this window is the fullscreen window for the
+                // device. Exit the fullscreen mode prior to disposing
+                // of the window if that's the case.
+                GraphicsDevice gd = getGraphicsConfiguration().getDevice();
+                if (gd.getFullScreenWindow() == Window.this) {
+                    gd.setFullScreenWindow(null);
                 }
+
+                Object[] ownedWindowArray;
+                synchronized(ownedWindowList) {
+                    ownedWindowArray = new Object[ownedWindowList.size()];
+                    ownedWindowList.copyInto(ownedWindowArray);
+                }
+                for (int i = 0; i < ownedWindowArray.length; i++) {
+                    Window child = (Window) (((WeakReference)
+                                   (ownedWindowArray[i])).get());
+                    if (child != null) {
+                        child.disposeImpl();
+                    }
+                }
+                hide();
+                beforeFirstShow = true;
+                removeNotify();
+                synchronized (inputContextLock) {
+                    if (inputContext != null) {
+                        inputContext.dispose();
+                        inputContext = null;
+                    }
+                }
+                clearCurrentFocusCycleRootOnHide();
+            } finally {
+                disposing = false;
             }
         }
-
+    }
         boolean fireWindowClosedEvent = isDisplayable();
         DisposeAction action = new DisposeAction();
         if (EventQueue.isDispatchThread()) {
@@ -3962,7 +3950,6 @@ public class Window extends Container implements Accessible {
         private float getHeight() { return height; }
         private void setHeight(float height) {
             if (height <= 0.0f) throw new IllegalArgumentException("TitleBar height must be positive");
-            if (this.height == height) return;
             this.height = height;
             notifyUpdate();
         }
@@ -3971,17 +3958,13 @@ public class Window extends Container implements Accessible {
         }
         private void putProperties(Map<String, ?> m) {
             if (properties == null) properties = new HashMap<>();
-            boolean needsUpdate = false;
-            for (Map.Entry<String, ?> e : m.entrySet()) {
-                Object old = properties.put(e.getKey(), e.getValue());
-                if (!needsUpdate && !Objects.equals(old, e.getValue())) needsUpdate = true;
-            }
-            if (needsUpdate) notifyUpdate();
+            properties.putAll(m);
+            notifyUpdate();
         }
         private void putProperty(String key, Object value) {
             if (properties == null) properties = new HashMap<>();
-            Object old = properties.put(key, value);
-            if (!Objects.equals(old, value)) notifyUpdate();
+            properties.put(key, value);
+            notifyUpdate();
         }
         private float getLeftInset() { return insets[0]; }
         private float getRightInset() { return insets[1]; }
@@ -4176,36 +4159,8 @@ public class Window extends Container implements Accessible {
         return value;
     }
 
-    private final static String STATS_ALL_SUFFIX = ".all";
-    private final static String SYSTEM_PROPERTY_COUNTERS;
-
-    private final static boolean USE_COUNTERS;
-    private final static boolean TRACE_ALL_COUNTERS;
-    private final static boolean TRACE_STD_ERR;
-
-    private final static int TRACE_CAPACITY;
-
-    private final static boolean TRACE_COUNTERS = true;
-    private final static boolean DUMP_STATS = true;
-
-    // thread dump interval (ms)
-    static final long DUMP_INTERVAL = 10 * 1000L;
-
-    private static PrintStream getTraceStdStream() {
-        // get live std stream:
-        return TRACE_STD_ERR ? System.err : System.out;
-    }
-
     static {
-        SYSTEM_PROPERTY_COUNTERS = System.getProperty("awt.window.counters");
-        USE_COUNTERS = (SYSTEM_PROPERTY_COUNTERS != null);
-
-        TRACE_ALL_COUNTERS = USE_COUNTERS && (Objects.equals(SYSTEM_PROPERTY_COUNTERS, "")
-                                            || Objects.equals(SYSTEM_PROPERTY_COUNTERS, "stderr")
-                                            || Objects.equals(SYSTEM_PROPERTY_COUNTERS, "stdout"));
-
-        TRACE_STD_ERR = USE_COUNTERS && SYSTEM_PROPERTY_COUNTERS.contains("stderr");
-        TRACE_CAPACITY = USE_COUNTERS ? 8 : 0;
+        String counters = System.getProperty("awt.window.counters");
 
         AWTAccessor.setWindowAccessor(new AWTAccessor.WindowAccessor() {
             public void updateWindow(Window window) {
@@ -4242,206 +4197,100 @@ public class Window extends Container implements Accessible {
 
             public boolean countersEnabled(Window w) {
                 // May want to selectively enable or disable counters per window
-                return USE_COUNTERS;
+                return counters != null;
             }
 
-            private final static long NANO_IN_SEC = java.util.concurrent.TimeUnit.SECONDS.toNanos(1);
+            public void bumpCounter(Window w, String counterName) {
+                Objects.requireNonNull(w);
+                Objects.requireNonNull(counterName);
 
-            public void incrementCounter(final Window w, final String counterName) {
-                if (USE_COUNTERS) {
-                    Objects.requireNonNull(w);
-                    Objects.requireNonNull(counterName);
-
-                    final long curTimeNanos = System.nanoTime();
-                    // use try-catch to avoid throwing runtime exception to native JNI callers!
-                    try {
-                        PerfCounter newCounter, prevCounter;
-                        synchronized (w.perfCounters) {
-                            newCounter = w.perfCounters.compute(counterName, (_, v) ->
-                                    v == null
-                                            ? new PerfCounter(curTimeNanos, 1L)
-                                            : new PerfCounter(curTimeNanos, v.value + 1));
+                PerfCounter newCounter;
+                long curTimeNanos = System.nanoTime();
+                synchronized (w.perfCounters) {
+                    newCounter = w.perfCounters.compute(counterName, (k, v) ->
+                            v == null
+                            ? new PerfCounter(curTimeNanos, 1L)
+                            : new PerfCounter(curTimeNanos, v.value + 1));
+                }
+                PerfCounter prevCounter;
+                synchronized (w.perfCountersPrev) {
+                    prevCounter = w.perfCountersPrev.putIfAbsent(counterName, newCounter);
+                }
+                if (prevCounter != null) {
+                    long nanosInSecond = java.util.concurrent.TimeUnit.SECONDS.toNanos(1);
+                    long timeDeltaNanos = curTimeNanos - prevCounter.updateTimeNanos;
+                    if (timeDeltaNanos > nanosInSecond) {
+                        long valPerSecond = (long) ((double) (newCounter.value - prevCounter.value)
+                                * nanosInSecond / timeDeltaNanos);
+                        boolean traceAllCounters = Objects.equals(counters, "")
+                                || Objects.equals(counters, "stdout")
+                                || Objects.equals(counters, "stderr");
+                        boolean traceEnabled = traceAllCounters || (counters != null && counters.contains(counterName));
+                        if (traceEnabled) {
+                            if (counters.contains("stderr")) {
+                                System.err.println(counterName + " per second: " + valPerSecond);
+                            } else {
+                                System.out.println(counterName + " per second: " + valPerSecond);
+                            }
+                        }
+                        if (perfLog.isLoggable(PlatformLogger.Level.FINE)) {
+                            perfLog.fine(counterName + " per second: " + valPerSecond);
                         }
                         synchronized (w.perfCountersPrev) {
-                            prevCounter = w.perfCountersPrev.putIfAbsent(counterName, newCounter);
-                        }
-                        if (prevCounter != null) {
-                            final long timeDeltaNanos = curTimeNanos - prevCounter.updateTimeNanos;
-                            if (timeDeltaNanos > NANO_IN_SEC) {
-                                final double valPerSecond = (double) (newCounter.value - prevCounter.value)
-                                        * NANO_IN_SEC / timeDeltaNanos;
-
-                                synchronized (w.perfCountersPrev) {
-                                    w.perfCountersPrev.put(counterName, newCounter);
-                                }
-                                addStat(w, counterName, valPerSecond);
-                                if (TRACE_COUNTERS) {
-                                    dumpCounter(counterName, valPerSecond);
-                                }
-                            }
-                        }
-                    } catch (RuntimeException re) {
-                        perfLog.severe("incrementCounter: failed", re);
-                    }
-                }
-            }
-
-            public void addStat(final Window w, final String statName, final double value) {
-                if (USE_COUNTERS && Double.isFinite(value)) {
-                    Objects.requireNonNull(w);
-                    Objects.requireNonNull(statName);
-
-                    // use try-catch to avoid throwing runtime exception to native JNI callers!
-                    try {
-                        synchronized (w.perfStats) {
-                            StatDouble stat = w.perfStats.computeIfAbsent(statName, StatDouble::new);
-                            stat.add(value);
-                            stat = w.perfStats.computeIfAbsent(statName + STATS_ALL_SUFFIX, StatDouble::new);
-                            stat.add(value);
-                        }
-                    } catch (RuntimeException re) {
-                        perfLog.severe("addStat: failed", re);
-                    }
-                }
-            }
-
-            public long getCounter(final Window w, final String counterName) {
-                if (USE_COUNTERS) {
-                    Objects.requireNonNull(w);
-                    Objects.requireNonNull(counterName);
-
-                    synchronized (w.perfCounters) {
-                        PerfCounter counter = w.perfCounters.get(counterName);
-                        return counter != null ? counter.value : -1L;
-                    }
-                }
-                return -1L;
-            }
-
-            public double getCounterPerSecond(final Window w, final String counterName) {
-                if (USE_COUNTERS) {
-                    Objects.requireNonNull(w);
-                    Objects.requireNonNull(counterName);
-
-                    PerfCounter newCounter, prevCounter;
-                    synchronized (w.perfCounters) {
-                        newCounter = w.perfCounters.get(counterName);
-                    }
-                    synchronized (w.perfCountersPrev) {
-                        prevCounter = w.perfCountersPrev.get(counterName);
-                    }
-
-                    if (newCounter != null && prevCounter != null) {
-                        final long timeDeltaNanos = newCounter.updateTimeNanos - prevCounter.updateTimeNanos;
-                        // Note that this time delta will usually be above one second.
-                        if (timeDeltaNanos > 0L) {
-                            return (double) (newCounter.value - prevCounter.value) * NANO_IN_SEC / timeDeltaNanos;
-                        }
-                    }
-                }
-                return Double.NaN;
-            }
-
-            public void dumpStats(final Window w, final boolean reset, StringBuilder sb) {
-                if (USE_COUNTERS) {
-                    synchronized (w.perfStats) {
-                        boolean header = false;
-
-                        for (final StatDouble stat : w.perfStats.values()) {
-                            if (stat.shouldLog()) {
-                                final boolean traceEnabled = TRACE_ALL_COUNTERS || SYSTEM_PROPERTY_COUNTERS.contains(stat.name);
-                                if (!header) {
-                                    header = true;
-                                    doLog(String.format("* Window['%s'@%s]:",
-                                            (w instanceof Frame ? ((Frame) w).getTitle() : ""),
-                                            Integer.toHexString(System.identityHashCode(w))),
-                                            traceEnabled);
-                                }
-                                // format:
-                                if (sb == null) {
-                                    sb = new StringBuilder(128);
-                                }
-                                sb.setLength(0);
-                                sb.append("  - ");
-                                stat.toString(sb);
-                                doLog(sb.toString(), traceEnabled);
-
-                                if (reset && !stat.name.endsWith(STATS_ALL_SUFFIX)) {
-                                    stat.reset();
-                                } else {
-                                    stat.updateLastLogCount();
-                                }
-                            }
+                            w.perfCountersPrev.put(counterName, newCounter);
                         }
                     }
                 }
             }
 
-            @Override
-            public void addWindowListener(Window w, WindowListener listener) {
-                w.addWindowListener(listener);
-            }
+            public long getCounter(Window w, String counterName) {
+                Objects.requireNonNull(w);
+                Objects.requireNonNull(counterName);
 
-            private static void dumpCounter(final String counterName, final double valPerSecond) {
-                if (USE_COUNTERS) {
-                    doLog(String.format("%s per second: %.2f", counterName, valPerSecond),
-                            TRACE_ALL_COUNTERS || SYSTEM_PROPERTY_COUNTERS.contains(counterName));
+                synchronized (w.perfCounters) {
+                    PerfCounter counter = w.perfCounters.get(counterName);
+                    return counter != null ? counter.value : -1L;
                 }
             }
 
-            private static void doLog(final String msg, final boolean traceEnabled) {
-                if (traceEnabled) {
-                    getTraceStdStream().println(msg);
+            public long getCounterPerSecond(Window w, String counterName) {
+                Objects.requireNonNull(w);
+                Objects.requireNonNull(counterName);
+
+                PerfCounter newCounter;
+                PerfCounter prevCounter;
+
+                synchronized (w.perfCounters) {
+                    newCounter = w.perfCounters.get(counterName);
                 }
-                if (perfLog.isLoggable(PlatformLogger.Level.FINE)) {
-                    perfLog.fine(msg);
+
+                synchronized (w.perfCountersPrev) {
+                    prevCounter = w.perfCountersPrev.get(counterName);
                 }
+
+                if (newCounter != null && prevCounter != null) {
+                    long timeDeltaNanos = newCounter.updateTimeNanos - prevCounter.updateTimeNanos;
+                    // Note that this time delta will usually be above one second.
+                    if (timeDeltaNanos > 0) {
+                        long nanosInSecond = java.util.concurrent.TimeUnit.SECONDS.toNanos(1);
+                        long valPerSecond = (long) ((double) (newCounter.value - prevCounter.value)
+                                * nanosInSecond / timeDeltaNanos);
+                        return valPerSecond;
+                    }
+                }
+                return -1;
             }
         }); // WindowAccessor
-
-        if (USE_COUNTERS) {
-            final Runnable dumper = new Runnable() {
-                private final static StringBuilder sb = new StringBuilder(128);
-
-                @Override
-                public void run() {
-                    getTraceStdStream().printf("--- WindowStats dump at: %s ---\n", new java.util.Date());
-
-                    final AWTAccessor.WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
-
-                    for (Window window : Window.getWindows()) {
-                        // dump stats if needed:
-                        windowAccessor.dumpStats(window, true, sb);
-                    }
-                    getTraceStdStream().println("-----");
-                }
-            };
-            final Thread hook = InnocuousThread.newSystemThread("WindowStatsHook", dumper);
-            hook.setDaemon(true);
-            hook.setContextClassLoader(null);
-            Runtime.getRuntime().addShutdownHook(hook);
-
-            if (DUMP_STATS) {
-                final Timer statTimer = new Timer("WindowStats", true);
-                statTimer.scheduleAtFixedRate(new TimerTask() {
-                    @Override
-                    public void run() {
-                        dumper.run();
-                    }
-                }, DUMP_INTERVAL, DUMP_INTERVAL);
-            }
-        }
     } // static
 
     // a window doesn't need to be updated in the Z-order.
     @Override
     void updateZOrder() {}
 
-    private record PerfCounter(long updateTimeNanos, long value) {}
+    private record PerfCounter(Long updateTimeNanos, Long value) {}
 
-    private transient final HashMap<String, PerfCounter> perfCounters = (USE_COUNTERS) ? new HashMap<>(TRACE_CAPACITY) : null;
-    private transient final HashMap<String, PerfCounter> perfCountersPrev = (USE_COUNTERS) ? new HashMap<>(TRACE_CAPACITY) : null;
-    private transient final LinkedHashMap<String, StatDouble> perfStats = (USE_COUNTERS) ? new LinkedHashMap<>(TRACE_CAPACITY) : null;
+    private transient final Map<String, PerfCounter> perfCounters = new HashMap<>(4);
+    private transient final Map<String, PerfCounter> perfCountersPrev = new HashMap<>(4);
 
 } // class Window
 

src/java.desktop/share/classes/javax/swing/PopupFactory.java

@@ -293,6 +293,10 @@ public class PopupFactory {
             return getMediumWeightPopup(owner, contents, ownerX, ownerY);
         case HEAVY_WEIGHT_POPUP:
             Popup popup = getHeavyWeightPopup(owner, contents, ownerX, ownerY);
+            if ((OSInfo.getOSType() == OSInfo.OSType.MACOSX) && (owner != null) &&
+                (EmbeddedFrame.getAppletIfAncestorOf(owner) != null)) {
+                ((HeavyWeightPopup)popup).setCacheEnabled(false);
+            }
             if (isPopupPositionedRelatively()) {
                 // Or else there are positioning artifacts when moving between monitors
                 // with a different scale and -Dsun.java2d.uiScale=N was specified.

src/java.desktop/share/classes/javax/swing/RepaintManager.java

@@ -27,7 +27,10 @@ package javax.swing;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.VolatileImage;
+import java.awt.peer.WindowPeer;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.applet.*;
@@ -40,12 +43,14 @@ import sun.java2d.SunGraphicsEnvironment;
 
 import com.sun.java.swing.SwingUtilities3;
 import java.awt.geom.AffineTransform;
+import java.util.stream.Collectors;
 
 import sun.java2d.SunGraphics2D;
 import sun.java2d.pipe.Region;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 import sun.swing.SwingUtilities2.RepaintListener;
+import java.util.stream.Collectors;
 
 /**
  * This class manages repaint requests, allowing the number
@@ -750,7 +755,7 @@ public class RepaintManager
                     .filter(Objects::nonNull)
                     .distinct()
                     .forEach(w -> AWTAccessor.getWindowAccessor()
-                            .incrementCounter(w, "swing.RepaintManager.updateWindows"));
+                            .bumpCounter(w, "swing.RepaintManager.updateWindows"));
 
         if (Toolkit.getDefaultToolkit() instanceof SunToolkit sunToolkit &&
             sunToolkit.needUpdateWindow()) {
@@ -769,14 +774,14 @@ public class RepaintManager
 
             for (Window window : windows) {
                 AWTAccessor.getWindowAccessor().updateWindow(window);
-                AWTAccessor.getWindowAccessor().incrementCounter(window, "swing.RepaintManager.updateWindows");
+                AWTAccessor.getWindowAccessor().bumpCounter(window, "swing.RepaintManager.updateWindows");
             }
         } else {
             dirtyComponents.keySet().stream()
                     .map(c -> c instanceof Window w ? w : SwingUtilities.getWindowAncestor(c))
                     .filter(Objects::nonNull)
                     .forEach(w -> AWTAccessor.getWindowAccessor()
-                            .incrementCounter(w, "swing.RepaintManager.updateWindows"));
+                            .bumpCounter(w, "swing.RepaintManager.updateWindows"));
         }
     }
 

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,52 +25,17 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
+import java.awt.*;
+import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.InputMap;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.KeyStroke;
-import javax.swing.LookAndFeel;
-import javax.swing.MenuElement;
-import javax.swing.MenuSelectionManager;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.event.MenuDragMouseEvent;
-import javax.swing.event.MenuDragMouseListener;
-import javax.swing.event.MenuKeyListener;
-
-import javax.swing.event.MouseInputListener;
-import javax.swing.plaf.ComponentInputMapUIResource;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.MenuItemUI;
-import javax.swing.plaf.UIResource;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.plaf.*;
 import javax.swing.text.View;
 
-import com.sun.java.swing.SwingUtilities3;
-import sun.swing.MenuItemCheckIconFactory;
-import sun.swing.MenuItemLayoutHelper;
-import sun.swing.SwingUtilities2;
-import sun.swing.UIAction;
-
+import sun.swing.*;
 
 /**
  * BasicMenuItem implementation
@@ -705,22 +670,84 @@ public class BasicMenuItemUI extends MenuItemUI
 
     private void paintIcon(Graphics g, MenuItemLayoutHelper lh,
                            MenuItemLayoutHelper.LayoutResult lr, Color holdc) {
-        SwingUtilities3.paintIcon(g, lh, lr, holdc);
+        if (lh.getIcon() != null) {
+            Icon icon;
+            ButtonModel model = lh.getMenuItem().getModel();
+            if (!model.isEnabled()) {
+                icon = lh.getMenuItem().getDisabledIcon();
+            } else if (model.isPressed() && model.isArmed()) {
+                icon = lh.getMenuItem().getPressedIcon();
+                if (icon == null) {
+                    // Use default icon
+                    icon = lh.getMenuItem().getIcon();
+                }
+            } else {
+                icon = lh.getMenuItem().getIcon();
+            }
+
+            if (icon != null) {
+                icon.paintIcon(lh.getMenuItem(), g, lr.getIconRect().x,
+                        lr.getIconRect().y);
+                g.setColor(holdc);
+            }
+        }
     }
 
     private void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,
                                 MenuItemLayoutHelper.LayoutResult lr,
                                 Color holdc, Color foreground) {
-        SwingUtilities3.paintCheckIcon(g, lh, lr, holdc, foreground);
+        if (lh.getCheckIcon() != null) {
+            ButtonModel model = lh.getMenuItem().getModel();
+            if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
+                    && model.isSelected())) {
+                g.setColor(foreground);
+            } else {
+                g.setColor(holdc);
+            }
+            if (lh.useCheckAndArrow()) {
+                lh.getCheckIcon().paintIcon(lh.getMenuItem(), g,
+                        lr.getCheckRect().x, lr.getCheckRect().y);
+            }
+            g.setColor(holdc);
+        }
     }
 
     private void paintAccText(Graphics g, MenuItemLayoutHelper lh,
                               MenuItemLayoutHelper.LayoutResult lr) {
-        SwingUtilities3.setDisabledForeground(disabledForeground);
-        SwingUtilities3.setAcceleratorSelectionForeground(
-                        acceleratorSelectionForeground);
-        SwingUtilities3.setAcceleratorForeground(acceleratorForeground);
-        SwingUtilities3.paintAccText(g, lh, lr);
+        if (!lh.getAccText().isEmpty()) {
+            ButtonModel model = lh.getMenuItem().getModel();
+            g.setFont(lh.getAccFontMetrics().getFont());
+            if (!model.isEnabled()) {
+                // *** paint the accText disabled
+                if (disabledForeground != null) {
+                    g.setColor(disabledForeground);
+                    SwingUtilities2.drawString(lh.getMenuItem(), g,
+                        lh.getAccText(), lr.getAccRect().x,
+                        lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
+                } else {
+                    g.setColor(lh.getMenuItem().getBackground().brighter());
+                    SwingUtilities2.drawString(lh.getMenuItem(), g,
+                        lh.getAccText(), lr.getAccRect().x,
+                        lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
+                    g.setColor(lh.getMenuItem().getBackground().darker());
+                    SwingUtilities2.drawString(lh.getMenuItem(), g,
+                        lh.getAccText(), lr.getAccRect().x - 1,
+                        lr.getAccRect().y + lh.getFontMetrics().getAscent() - 1);
+                }
+            } else {
+                // *** paint the accText normally
+                if (model.isArmed()
+                        || (lh.getMenuItem() instanceof JMenu
+                        && model.isSelected())) {
+                    g.setColor(acceleratorSelectionForeground);
+                } else {
+                    g.setColor(acceleratorForeground);
+                }
+                SwingUtilities2.drawString(lh.getMenuItem(), g, lh.getAccText(),
+                        lr.getAccRect().x, lr.getAccRect().y +
+                        lh.getAccFontMetrics().getAscent());
+            }
+        }
     }
 
     private void paintText(Graphics g, MenuItemLayoutHelper lh,
@@ -739,11 +766,26 @@ public class BasicMenuItemUI extends MenuItemUI
     private void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
                                 MenuItemLayoutHelper.LayoutResult lr,
                                 Color foreground) {
-        SwingUtilities3.paintArrowIcon(g, lh, lr, foreground);
+        if (lh.getArrowIcon() != null) {
+            ButtonModel model = lh.getMenuItem().getModel();
+            if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
+                                && model.isSelected())) {
+                g.setColor(foreground);
+            }
+            if (lh.useCheckAndArrow()) {
+                lh.getArrowIcon().paintIcon(lh.getMenuItem(), g,
+                        lr.getArrowRect().x, lr.getArrowRect().y);
+            }
+        }
     }
 
     private void applyInsets(Rectangle rect, Insets insets) {
-        SwingUtilities3.applyInsets(rect, insets);
+        if(insets != null) {
+            rect.x += insets.left;
+            rect.y += insets.top;
+            rect.width -= (insets.right + rect.x);
+            rect.height -= (insets.bottom + rect.y);
+        }
     }
 
     /**

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java

@@ -748,27 +748,6 @@ public class BasicTreeUI extends TreeUI
         return bounds;
     }
 
-    /**
-     * A potentially faster version of {@link #getPathBounds(JTree, TreePath)}
-     * which calculates only {@code y} and {@code height}
-     * of the bounding {@code Rectangle}
-     */
-    private Rectangle getVerticalPathBounds(TreePath path) {
-        if (tree == null || treeState == null) {
-            return null;
-        }
-        int rowHeight = treeState.getRowHeight();
-        if (rowHeight <= 0) {
-            return getPathBounds(tree, path);
-        }
-        int row = treeState.getRowForPath(path);
-        if (row < 0) {
-            return null;
-        }
-        return new Rectangle(0, tree.getInsets().top + row * rowHeight,
-                0, rowHeight);
-    }
-
     /**
       * Returns the path for passed in row.  If row is not visible
       * null is returned.
@@ -4402,21 +4381,17 @@ public class BasicTreeUI extends TreeUI
                     updateSize();
                 }
                 else if (treeState.isExpanded(parentPath)) {
-                    TreePath minPath = null;
-                    Rectangle minBounds = null;
-                    if (tree.isShowing()) {
-                        // Changed nodes are visible
-                        // Find the minimum index, we only need paint from there
-                        // down.
-                        int minIndex = indices[0];
-                        for (int i = indices.length - 1; i > 0; i--) {
-                            minIndex = Math.min(indices[i], minIndex);
-                        }
-                        Object minChild = treeModel.getChild(
-                                parentPath.getLastPathComponent(), minIndex);
-                        minPath = parentPath.pathByAddingChild(minChild);
-                        minBounds = getVerticalPathBounds(minPath);
+                    // Changed nodes are visible
+                    // Find the minimum index, we only need paint from there
+                    // down.
+                    int minIndex = indices[0];
+                    for (int i = indices.length - 1; i > 0; i--) {
+                        minIndex = Math.min(indices[i], minIndex);
                     }
+                    Object minChild = treeModel.getChild(
+                            parentPath.getLastPathComponent(), minIndex);
+                    TreePath minPath = parentPath.pathByAddingChild(minChild);
+                    Rectangle minBounds = getPathBounds(tree, minPath);
 
                     // Forward to the treestate
                     treeState.treeNodesChanged(e);
@@ -4424,19 +4399,20 @@ public class BasicTreeUI extends TreeUI
                     // Mark preferred size as bogus.
                     updateSize0();
 
-                    if (minBounds != null) {
-                        // And repaint
-                        Rectangle newMinBounds = getVerticalPathBounds(minPath);
-                        if (newMinBounds != null) {
-                            if (indices.length == 1 &&
-                                    newMinBounds.height == minBounds.height) {
-                                tree.repaint(0, minBounds.y, tree.getWidth(),
-                                        minBounds.height);
-                            } else {
-                                tree.repaint(0, minBounds.y, tree.getWidth(),
-                                        tree.getHeight() - minBounds.y);
-                            }
-                        }
+                    // And repaint
+                    Rectangle newMinBounds = getPathBounds(tree, minPath);
+                    if (minBounds == null || newMinBounds == null) {
+                        return;
+                    }
+
+                    if (indices.length == 1 &&
+                            newMinBounds.height == minBounds.height) {
+                        tree.repaint(0, minBounds.y, tree.getWidth(),
+                                     minBounds.height);
+                    }
+                    else {
+                        tree.repaint(0, minBounds.y, tree.getWidth(),
+                                     tree.getHeight() - minBounds.y);
                     }
                 }
                 else {

src/java.desktop/share/classes/sun/awt/AWTAccessor.java

@@ -37,7 +37,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.InvocationEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.awt.event.WindowListener;
+import java.awt.geom.Point2D;
 import java.awt.image.BufferStrategy;
 import java.awt.peer.ComponentPeer;
 
@@ -329,17 +329,10 @@ public final class AWTAccessor {
          */
         Window[] getOwnedWindows(Window w);
 
-        /* JBR Window counters API */
         boolean countersEnabled(Window w);
-        void incrementCounter(Window w, String counterName);
-        void addStat(Window w, String statName, double value);
-
+        void bumpCounter(Window w, String counterName);
         long getCounter(Window w, String counterName);
-        double getCounterPerSecond(Window w, String counterName);
-
-        void dumpStats(Window w, boolean reset, StringBuilder sb);
-
-        void addWindowListener(Window w, WindowListener listener);
+        long getCounterPerSecond(Window w, String counterName);
     }
 
     /**

src/java.desktop/share/classes/sun/awt/SunToolkit.java

@@ -50,7 +50,6 @@ import java.awt.KeyboardFocusManager;
 import java.awt.Label;
 import java.awt.MenuComponent;
 import java.awt.Panel;
-import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.ScrollPane;
 import java.awt.Scrollbar;
@@ -91,7 +90,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.jetbrains.exported.JBRApi;
 import sun.awt.im.InputContext;
 import sun.awt.image.ByteArrayImageSource;
 import sun.awt.image.FileImageSource;
@@ -2086,23 +2084,6 @@ public abstract class SunToolkit extends Toolkit
         return AWTAccessor.getAWTEventAccessor().isSystemGenerated(e);
     }
 
-    @JBRApi.Service
-    @JBRApi.Provides("RelativePointerMovement")
-    public interface RelativePointerMovementInfoProvider {
-        private static RelativePointerMovementInfoProvider create() {
-            var tk = Toolkit.getDefaultToolkit();
-            if (tk instanceof ComponentFactory cf) {
-                var mouseInfoPeer = cf.getMouseInfoPeer();
-                if (mouseInfoPeer instanceof RelativePointerMovementInfoProvider p){
-                    return p;
-                }
-            }
-
-            throw new JBRApi.ServiceNotAvailableException("Service not supported for toolkit " + tk.getClass().getName());
-        }
-
-        Point getAccumulatedMouseDeltaAndReset();
-    }
 } // class SunToolkit
 
 

src/java.desktop/share/classes/sun/awt/SurfacePixelGrabber.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2025 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.awt;
-
-import java.awt.image.BufferedImage;
-
-public interface SurfacePixelGrabber {
-    BufferedImage getClientAreaSnapshot(int x, int y, int width, int height);
-}

src/java.desktop/share/classes/sun/java2d/marlin/Curve.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,9 +144,7 @@ final class Curve {
     // finds points where the first and second derivative are
     // perpendicular. This happens when g(t) = f'(t)*f''(t) == 0 (where
     // * is a dot product). Unfortunately, we have to solve a cubic.
-    private int perpendiculardfddf(final double[] pts, final int off,
-                                   final double A, final double B)
-    {
+    private int perpendiculardfddf(final double[] pts, final int off) {
         assert pts.length >= off + 4;
 
         // these are the coefficients of some multiple of g(t) (not g(t),
@@ -157,7 +155,7 @@ final class Curve {
         final double c = 2.0d * (dax * cx + day * cy) + dbx * dbx + dby * dby;
         final double d = dbx * cx + dby * cy;
 
-        return Helpers.cubicRootsInAB(a, b, c, d, pts, off, A, B);
+        return Helpers.cubicRootsInAB(a, b, c, d, pts, off, 0.0d, 1.0d);
     }
 
     // Tries to find the roots of the function ROC(t)-w in [0, 1). It uses
@@ -173,43 +171,35 @@ final class Curve {
     // at most 4 sub-intervals of (0,1). ROC has asymptotes at inflection
     // points, so roc-w can have at least 6 roots. This shouldn't be a
     // problem for what we're trying to do (draw a nice looking curve).
-    int rootsOfROCMinusW(final double[] roots, final int off, final double w2,
-                         final double A, final double B)
-    {
+    int rootsOfROCMinusW(final double[] roots, final int off, final double w2, final double err) {
         // no OOB exception, because by now off<=6, and roots.length >= 10
         assert off <= 6 && roots.length >= 10;
 
         int ret = off;
-        final int end = off + perpendiculardfddf(roots, off, A, B);
-        Helpers.isort(roots, off, end);
+        final int end = off + perpendiculardfddf(roots, off);
         roots[end] = 1.0d; // always check interval end points
 
-        double t0 = 0.0d;
-        double ft0 = eliminateInf(ROCsq(t0) - w2);
-        double t1, ft1;
+        double t0 = 0.0d, ft0 = ROCsq(t0) - w2;
 
         for (int i = off; i <= end; i++) {
-            t1 = roots[i];
-            ft1 = eliminateInf(ROCsq(t1) - w2);
+            double t1 = roots[i], ft1 = ROCsq(t1) - w2;
             if (ft0 == 0.0d) {
                 roots[ret++] = t0;
             } else if (ft1 * ft0 < 0.0d) { // have opposite signs
                 // (ROC(t)^2 == w^2) == (ROC(t) == w) is true because
                 // ROC(t) >= 0 for all t.
-                roots[ret++] = falsePositionROCsqMinusX(t0, t1, ft0, ft1, w2, A); // A = err
+                roots[ret++] = falsePositionROCsqMinusX(t0, t1, w2, err);
             }
             t0 = t1;
             ft0 = ft1;
         }
+
         return ret - off;
     }
 
-    private final static double MAX_ROC_SQ = 1e20;
-
-    private static double eliminateInf(final double x2) {
-        // limit the value of x to avoid numerical problems (smaller step):
-        // must handle NaN and +Infinity:
-        return (x2 <= MAX_ROC_SQ) ? x2 : MAX_ROC_SQ;
+    private static double eliminateInf(final double x) {
+        return (x == Double.POSITIVE_INFINITY ? Double.MAX_VALUE :
+               (x == Double.NEGATIVE_INFINITY ? Double.MIN_VALUE : x));
     }
 
     // A slight modification of the false position algorithm on wikipedia.
@@ -220,18 +210,17 @@ final class Curve {
     // and turn out. Same goes for the newton's method
     // algorithm in Helpers.java
     private double falsePositionROCsqMinusX(final double t0, final double t1,
-                                            final double ft0, final double ft1,
                                             final double w2, final double err)
     {
         final int iterLimit = 100;
         int side = 0;
-        double s = t0, fs = eliminateInf(ft0);
-        double t = t1, ft = eliminateInf(ft1);
+        double t = t1, ft = eliminateInf(ROCsq(t) - w2);
+        double s = t0, fs = eliminateInf(ROCsq(s) - w2);
         double r = s, fr;
 
-        for (int i = 0; i < iterLimit && Math.abs(t - s) > err; i++) {
+        for (int i = 0; i < iterLimit && Math.abs(t - s) > err * Math.abs(t + s); i++) {
             r = (fs * t - ft * s) / (fs - ft);
-            fr = eliminateInf(ROCsq(r) - w2);
+            fr = ROCsq(r) - w2;
             if (sameSign(fr, ft)) {
                 ft = fr; t = r;
                 if (side < 0) {
@@ -252,7 +241,7 @@ final class Curve {
                 break;
             }
         }
-        return (Math.abs(ft) <= Math.abs(fs)) ? t : s;
+        return r;
     }
 
     private static boolean sameSign(final double x, final double y) {
@@ -267,9 +256,9 @@ final class Curve {
         final double dy = t * (t * day + dby) + cy;
         final double ddx = 2.0d * dax * t + dbx;
         final double ddy = 2.0d * day * t + dby;
-        final double dx2dy2 = dx * dx + dy * dy; // positive
-        final double dxddyddxdy = dx * ddy - dy * ddx;
-        // may return +Infinity if dxddyddxdy = 0 or NaN if 0/0:
-        return (dx2dy2 * dx2dy2 * dx2dy2) / (dxddyddxdy * dxddyddxdy); // both positive
+        final double dx2dy2 = dx * dx + dy * dy;
+        final double ddx2ddy2 = ddx * ddx + ddy * ddy;
+        final double ddxdxddydy = ddx * dx + ddy * dy;
+        return dx2dy2 * ((dx2dy2 * dx2dy2) / (dx2dy2 * ddx2ddy2 - ddxdxddydy * ddxdxddydy));
     }
 }

src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -564,7 +564,7 @@ public final class DMarlinRenderingEngine extends RenderingEngine
     }
 
     private static boolean nearZero(final double num) {
-        return Math.abs(num) < 2.0d * Helpers.ulp(num);
+        return Math.abs(num) < 2.0d * Math.ulp(num);
     }
 
     abstract static class NormalizingPathIterator implements PathIterator {

src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,19 +31,12 @@ import sun.java2d.marlin.stats.StatLong;
 
 final class Helpers implements MarlinConst {
 
-    private final static double T_ERR = 1e-4;
-    private final static double T_A = T_ERR;
-    private final static double T_B = 1.0 - T_ERR;
-
     private static final double EPS = 1e-9d;
 
     private Helpers() {
         throw new Error("This is a non instantiable class");
     }
 
-    /** use lower precision like former Pisces and Marlin (float-precision) */
-    static double ulp(final double value) { return Math.ulp((float)value); }
-
     static boolean within(final double x, final double y) {
         return within(x, y, EPS);
     }
@@ -329,10 +322,10 @@ final class Helpers implements MarlinConst {
 
         // now we must subdivide at points where one of the offset curves will have
         // a cusp. This happens at ts where the radius of curvature is equal to w.
-        ret += c.rootsOfROCMinusW(ts, ret, w2, T_A, T_B);
+        ret += c.rootsOfROCMinusW(ts, ret, w2, 0.0001d);
 
-        ret = filterOutNotInAB(ts, 0, ret, T_A, T_B);
-        isort(ts, 0, ret);
+        ret = filterOutNotInAB(ts, 0, ret, 0.0001d, 0.9999d);
+        isort(ts, ret);
         return ret;
     }
 
@@ -361,7 +354,7 @@ final class Helpers implements MarlinConst {
         if ((outCodeOR & OUTCODE_BOTTOM) != 0) {
             ret += curve.yPoints(ts, ret, clipRect[1]);
         }
-        isort(ts, 0, ret);
+        isort(ts, ret);
         return ret;
     }
 
@@ -381,11 +374,11 @@ final class Helpers implements MarlinConst {
         }
     }
 
-    static void isort(final double[] a, final int off, final int len) {
-        for (int i = off + 1, j; i < len; i++) {
+    static void isort(final double[] a, final int len) {
+        for (int i = 1, j; i < len; i++) {
             final double ai = a[i];
             j = i - 1;
-            for (; j >= off && a[j] > ai; j--) {
+            for (; j >= 0 && a[j] > ai; j--) {
                 a[j + 1] = a[j];
             }
             a[j + 1] = ai;

src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@ package sun.java2d.marlin;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
-import jdk.internal.misc.InnocuousThread;
 import jdk.internal.ref.CleanerFactory;
 import sun.java2d.marlin.ArrayCacheConst.CacheStats;
 import static sun.java2d.marlin.MarlinUtils.logInfo;
@@ -385,13 +383,21 @@ public final class RendererStats implements MarlinConst {
             = new ConcurrentLinkedQueue<>();
 
         private RendererStatsHolder() {
-            final Thread hook = InnocuousThread.newSystemThread("MarlinStatsHook", () -> dump());
-            hook.setDaemon(true);
+            final Thread hook = new Thread(
+                    MarlinUtils.getRootThreadGroup(),
+                    new Runnable() {
+                        @Override
+                        public void run() {
+                            dump();
+                        }
+                    },
+                    "MarlinStatsHook"
+                    );
             hook.setContextClassLoader(null);
             Runtime.getRuntime().addShutdownHook(hook);
 
             if (USE_DUMP_THREAD) {
-                final Timer statTimer = new Timer("RendererStats", true);
+                final Timer statTimer = new Timer("RendererStats");
                 statTimer.scheduleAtFixedRate(new TimerTask() {
                     @Override
                     public void run() {

src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -886,8 +886,8 @@ final class Stroker implements StartFlagPathConsumer2D, MarlinConst {
 
         // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4,
         // in which case ignore if p1 == p2
-        final boolean p1eqp2 = Helpers.withinD(dx1, dy1, 6.0d * Helpers.ulp(y2));
-        final boolean p3eqp4 = Helpers.withinD(dx4, dy4, 6.0d * Helpers.ulp(y4));
+        final boolean p1eqp2 = Helpers.withinD(dx1, dy1, 6.0d * Math.ulp(y2));
+        final boolean p3eqp4 = Helpers.withinD(dx4, dy4, 6.0d * Math.ulp(y4));
 
         if (p1eqp2 && p3eqp4) {
             return getLineOffsets(x1, y1, x4, y4, leftOff, rightOff);
@@ -905,7 +905,7 @@ final class Stroker implements StartFlagPathConsumer2D, MarlinConst {
         final double l1sq = dx1 * dx1 + dy1 * dy1;
         final double l4sq = dx4 * dx4 + dy4 * dy4;
 
-        if (Helpers.within(dotsq, l1sq * l4sq, 4.0d * Helpers.ulp(dotsq))) {
+        if (Helpers.within(dotsq, l1sq * l4sq, 4.0d * Math.ulp(dotsq))) {
             return getLineOffsets(x1, y1, x4, y4, leftOff, rightOff);
         }
 
@@ -1078,8 +1078,8 @@ final class Stroker implements StartFlagPathConsumer2D, MarlinConst {
         // equal if they're very close to each other.
 
         // if p1 == p2 or p2 == p3: draw line from p1->p3
-        final boolean p1eqp2 = Helpers.withinD(dx12, dy12, 6.0d * Helpers.ulp(y2));
-        final boolean p2eqp3 = Helpers.withinD(dx23, dy23, 6.0d * Helpers.ulp(y3));
+        final boolean p1eqp2 = Helpers.withinD(dx12, dy12, 6.0d * Math.ulp(y2));
+        final boolean p2eqp3 = Helpers.withinD(dx23, dy23, 6.0d * Math.ulp(y3));
 
         if (p1eqp2 || p2eqp3) {
             return getLineOffsets(x1, y1, x3, y3, leftOff, rightOff);
@@ -1091,7 +1091,7 @@ final class Stroker implements StartFlagPathConsumer2D, MarlinConst {
         final double l1sq = dx12 * dx12 + dy12 * dy12;
         final double l3sq = dx23 * dx23 + dy23 * dy23;
 
-        if (Helpers.within(dotsq, l1sq * l3sq, 4.0d * Helpers.ulp(dotsq))) {
+        if (Helpers.within(dotsq, l1sq * l3sq, 4.0d * Math.ulp(dotsq))) {
             return getLineOffsets(x1, y1, x3, y3, leftOff, rightOff);
         }
 

src/java.desktop/share/classes/sun/java2d/marlin/Version.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ package sun.java2d.marlin;
 
 public final class Version {
 
-    private static final String VERSION = "marlin-0.9.4.9-Unsafe-OpenJDK";
+    private static final String VERSION = "marlin-0.9.4.7-Unsafe-OpenJDK";
 
     public static String getVersion() {
         return VERSION;

src/java.desktop/share/classes/sun/java2d/marlin/stats/StatDouble.java

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2025 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.java2d.marlin.stats;
-
-import static sun.java2d.marlin.stats.StatLong.trimTo3Digits;
-
-/**
- * Statistics on double values
- */
-public final class StatDouble {
-    // rolling mean weight (lerp):
-    private final static double EMA_ALPHA = 0.25;
-    private final static double EMA_ONE_MINUS_ALPHA = 1.0 - EMA_ALPHA;
-
-    public final String name;
-    private long count, lastLogCount;
-    private double min, max, mean, ema_mean = 0.0, squaredError;
-
-    public StatDouble(final String name) {
-        this.name = name;
-        reset();
-    }
-
-    public void reset() {
-        count = 0L;
-        lastLogCount = 0L;
-        min = Double.POSITIVE_INFINITY;
-        max = Double.NEGATIVE_INFINITY;
-        mean = 0.0;
-        // skip ema_mean = 0.0;
-        squaredError = 0.0;
-    }
-
-    public void add(final double val) {
-        count++;
-        if (val < min) {
-            min = val;
-        }
-        if (val > max) {
-            max = val;
-        }
-        // Exponential smoothing (EMA):
-        ema_mean = EMA_ALPHA * val + EMA_ONE_MINUS_ALPHA * ema_mean;
-        // Welford's algorithm:
-        final double oldMean = mean;
-        mean += (val - mean) / count;
-        squaredError += (val - mean) * (val - oldMean);
-    }
-
-    public boolean shouldLog() {
-        return (count > lastLogCount);
-    }
-
-    public void updateLastLogCount() {
-        this.lastLogCount = this.count;
-    }
-
-    public long count() {
-        return count;
-    }
-
-    public double min() {
-        return (count != 0L) ? min : Double.NaN;
-    }
-
-    public double max() {
-        return (count != 0L) ? max : Double.NaN;
-    }
-
-    public double mean() {
-        return (count != 0L) ? mean : Double.NaN;
-    }
-
-    public double ema() {
-        return (count != 0L) ? ema_mean : Double.NaN;
-    }
-
-    public double variance() {
-        return (count != 0L) ? (squaredError / (count - 1L)) : Double.NaN;
-    }
-
-    public double stddev() {
-        return (count != 0L) ? Math.sqrt(variance()) : Double.NaN;
-    }
-
-    public double total() {
-        return (count != 0L) ? (mean() * count) : Double.NaN;
-    }
-
-    @Override
-    public String toString() {
-        return toString(new StringBuilder(128)).toString();
-    }
-
-    public StringBuilder toString(final StringBuilder sb) {
-        sb.append(name).append('[').append(count);
-        sb.append("] sum: ").append(trimTo3Digits(total()));
-        sb.append(" avg: ").append(trimTo3Digits(mean()));
-        sb.append(" stddev: ").append(trimTo3Digits(stddev()));
-        sb.append(" ema: ").append(trimTo3Digits(ema()));
-        sb.append(" [").append(trimTo3Digits(min())).append(" - ").append(trimTo3Digits(max())).append("]");
-        return sb;
-    }
-}

src/java.desktop/share/classes/sun/java2d/vulkan/VKEnv.java

@@ -31,11 +31,12 @@ import sun.util.logging.PlatformLogger;
 import java.awt.Toolkit;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public final class VKEnv {
 
-    private static final PlatformLogger log = PlatformLogger.getLogger("sun.java2d.vulkan.VKEnv");
+    private static final PlatformLogger log = PlatformLogger.getLogger("sun.java2d.vulkan.VKInstance");
 
     private static final class Options {
 
@@ -48,7 +49,7 @@ public final class VKEnv {
 
         @SuppressWarnings("removal")
         private static final boolean accelsd = vulkan && "true".equalsIgnoreCase(AccessController.doPrivileged(
-                (PrivilegedAction<String>) () -> System.getProperty("sun.java2d.vulkan.accelsd", "true")));
+                (PrivilegedAction<String>) () -> System.getProperty("sun.java2d.vulkan.accelsd", "")));
 
         @SuppressWarnings("removal")
         private static final int deviceNumber = !vulkan ? 0 : AccessController.doPrivileged(
@@ -71,57 +72,42 @@ public final class VKEnv {
 
     public static synchronized void init(long nativePtr) {
         if (state > INITIALIZING) return;
+        long platformData = nativePtr == 0 ? 0 : initPlatform(nativePtr);
         int newState = DISABLED;
         if (Options.vulkan) {
-            try {
-                long platformData = nativePtr == 0 ? 0 : initPlatform(nativePtr);
-                devices = initNative(platformData);
-                if (devices != null) {
-                    newState = ENABLED;
-                    if (Options.accelsd) newState |= ACCELSD_BIT;
-                    defaultDevice = devices[Options.deviceNumber >= 0 && Options.deviceNumber < devices.length ?
-                            Options.deviceNumber : 0];
-                    // Check whether the presentation is supported.
-                    for (VKGPU device : devices) {
-                        if (device.hasCap(VKGPU.CAP_PRESENTABLE_BIT) &&
-                                device.getPresentableGraphicsConfigs().findAny().isPresent()) {
-                            newState |= PRESENT_BIT;
-                            break;
-                        }
+            devices = initNative(platformData);
+            if (devices != null) {
+                newState = ENABLED;
+                if (Options.accelsd) newState |= ACCELSD_BIT;
+                defaultDevice = devices[Options.deviceNumber >= 0 && Options.deviceNumber < devices.length ?
+                        Options.deviceNumber : 0];
+                // Check whether the presentation is supported.
+                for (VKGPU device : devices) {
+                    if (device.hasCap(VKGPU.CAP_PRESENTABLE_BIT) &&
+                            device.getPresentableGraphicsConfigs().findAny().isPresent()) {
+                        newState |= PRESENT_BIT;
+                        break;
                     }
+                }
 
-                    VKBlitLoops.register();
-                    VKMaskFill.register();
-                    VKMaskBlit.register();
-                }
-            } catch (UnsatisfiedLinkError e) {
-                newState = DISABLED;
-                if (Options.verbose) {
-                    System.err.println("Vulkan backend is not available");
-                    e.printStackTrace(System.err);
-                }
-                if (log.isLoggable(PlatformLogger.Level.WARNING)) {
-                    log.warning("Vulkan backend is not available", e);
-                }
+                VKBlitLoops.register();
+                VKMaskFill.register();
+                VKMaskBlit.register();
             }
         }
         state = newState;
 
         if (Options.verbose || log.isLoggable(PlatformLogger.Level.FINE)) {
-            StringBuilder msg = new StringBuilder("Vulkan rendering enabled: ");
+            String message;
             if (isVulkanEnabled()) {
-                msg.append("YES")
-                        .append("\n  Presentation enabled: ").append(isPresentationEnabled() ? "YES" : "NO")
-                        .append("\n  Accelerated surface data enabled: ").append(isSurfaceDataAccelerated() ? "YES" : "NO")
-                        .append("\n  Devices:");
-                for (int i = 0; i < devices.length; i++) {
-                    VKGPU d = devices[i];
-                    msg.append(d == defaultDevice ? "\n    *" : "\n     ").append(i).append(": ").append(d.getName());
-                }
+                message = "Vulkan rendering enabled: YES" +
+                          "\n  presentation enabled: " + (isPresentationEnabled() ? "YES" : "NO") +
+                          "\n  accelerated surface data enabled: " + (isSurfaceDataAccelerated() ? "YES" : "NO") +
+                          "\n  devices:" + Stream.of(devices).map(d -> (d == defaultDevice ?
+                          "\n    *" : "\n     ") + d.getName()).collect(Collectors.joining());
             } else {
-                msg.append("NO");
+                message = "Vulkan rendering enabled: NO";
             }
-            String message = msg.toString();
             if (Options.verbose) {
                 System.err.println(message);
             }

src/java.desktop/share/classes/sun/java2d/vulkan/VKSurfaceData.java

@@ -36,7 +36,6 @@ import sun.java2d.loops.CompositeType;
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.loops.SurfaceType;
 import static sun.java2d.pipe.BufferedOpCodes.CONFIGURE_SURFACE;
-import static sun.java2d.pipe.BufferedOpCodes.DISPOSE_SURFACE;
 import sun.java2d.pipe.BufferedContext;
 import sun.java2d.pipe.ParallelogramPipe;
 import sun.java2d.pipe.PixelToParallelogramConverter;
@@ -44,6 +43,7 @@ import sun.java2d.pipe.RenderBuffer;
 import sun.java2d.pipe.TextPipe;
 import sun.java2d.pipe.hw.AccelSurface;
 import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.awt.image.Raster;
@@ -137,29 +137,7 @@ public abstract class VKSurfaceData extends SurfaceData
         }
     }
 
-    /**
-     * Disposes the native resources associated with the given VKSurfaceData
-     * (referenced by the pData parameter).  This method is invoked from
-     * the native Dispose() method from the Disposer thread when the
-     * Java-level VKSurfaceData object is about to go away.
-     */
-    static void dispose(long pData) {
-        VKRenderQueue rq = VKRenderQueue.getInstance();
-        rq.lock();
-        try {
-            RenderBuffer buf = rq.getBuffer();
-            rq.ensureCapacityAndAlignment(12, 4);
-            buf.putInt(DISPOSE_SURFACE);
-            buf.putLong(pData);
-
-            // this call is expected to complete synchronously, so flush now
-            rq.flushNow();
-        } finally {
-            rq.unlock();
-        }
-    }
-
-    public BufferedImage getSnapshot(int x, int y, int width, int height) {
+    protected BufferedImage getSnapshot(int x, int y, int width, int height) {
         BufferedImage image = getFormat().createCompatibleImage(width, height, getTransparency());
         SurfaceData sd = SurfaceData.getPrimarySurfaceData(image);
         Blit blit = Blit.getFromCache(getSurfaceType(), CompositeType.SrcNoEa, sd.getSurfaceType());

src/java.desktop/share/glsl/vulkan/alpha_type.glsl

@@ -0,0 +1,20 @@
+
+#define ALPHA_TYPE_PRE_MULTIPLIED 0U
+#define ALPHA_TYPE_STRAIGHT       1U
+
+vec4 convertAlpha(vec4 color, uint inType, uint outType) {
+    if (inType == ALPHA_TYPE_STRAIGHT && outType == ALPHA_TYPE_PRE_MULTIPLIED) {
+        return vec4(color.rgb * color.a, color.a);
+    } else if (inType == ALPHA_TYPE_PRE_MULTIPLIED && outType == ALPHA_TYPE_STRAIGHT && color.a > 0.0) {
+        return vec4(color.rgb / color.a, color.a);
+    } else return color;
+}
+
+#ifdef ALPHA_TYPE_SPEC_INDEX
+layout (constant_id = ALPHA_TYPE_SPEC_INDEX  ) const uint const_InAlphaType  = ALPHA_TYPE_PRE_MULTIPLIED;
+layout (constant_id = ALPHA_TYPE_SPEC_INDEX+1) const uint const_OutAlphaType = ALPHA_TYPE_PRE_MULTIPLIED;
+
+vec4 convertAlpha(vec4 color) {
+    return convertAlpha(color, const_InAlphaType, const_OutAlphaType);
+}
+#endif

src/java.desktop/share/glsl/vulkan/blit.frag

@@ -1,7 +1,7 @@
 #version 450
 #extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
-DEFAULT_PUSH_CONSTANTS();
+#define ALPHA_TYPE_SPEC_INDEX 0
+#include "alpha_type.glsl"
 
 layout(set = 0, binding = 0) uniform texture2D u_Texture;
 layout(set = 1, binding = 0) uniform sampler u_Sampler;
@@ -9,5 +9,5 @@ layout(location = 0) in  vec2 in_TexCoord;
 layout(location = 0) out vec4 out_Color;
 
 void main() {
-    out_Color = APPLY_COMPOSITE(convertAlpha(texture(sampler2D(u_Texture, u_Sampler), in_TexCoord)));
+    out_Color = convertAlpha(texture(sampler2D(u_Texture, u_Sampler), in_TexCoord));
 }

src/java.desktop/share/glsl/vulkan/blit.vert

@@ -1,12 +1,14 @@
 #version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
+
+layout(push_constant) uniform PushConstants {
+    mat2x3 transform;
+} push;
 
 layout(location = 0) in  vec2 in_Position;
 layout(location = 1) in  vec2 in_TexCoord;
 layout(location = 0) out vec2 out_TexCoord;
 
 void main() {
-    gl_Position = transformToDeviceSpace(in_Position);
+    gl_Position = vec4(vec3(in_Position, 1.0)*push.transform, 0.0, 1.0);
     out_TexCoord = in_TexCoord;
 }

src/java.desktop/share/glsl/vulkan/clip.vert

@@ -1,9 +1,11 @@
 #version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
+
+layout(push_constant) uniform PushConstants {
+    mat2x3 transform;
+} push;
 
 layout(location = 0) in ivec2 in_Position;
 
 void main() {
-    gl_Position = transformToDeviceSpace(in_Position);
+    gl_Position = vec4(vec3(in_Position, 1)*push.transform, 0.0, 1.0);
 }

src/java.desktop/share/glsl/vulkan/color.vert

@@ -1,12 +1,14 @@
 #version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
+
+layout(push_constant) uniform PushConstants {
+    mat2x3 transform;
+} push;
 
 layout(location = 0) in vec2 in_Position;
-layout(location = 1) in uint in_Color;
+layout(location = 1) in vec4 in_Color;
 layout(location = 0) out flat vec4 out_Color;
 
 void main() {
-    gl_Position = transformToDeviceSpace(in_Position);
-    out_Color = convertAlpha(decodeColor(in_Color)); // No need to APPLY_COMPOSITE - it was already done on the host.
+    gl_Position = vec4(vec3(in_Position, 1)*push.transform, 0.0, 1.0);
+    out_Color = in_Color;
 }

src/java.desktop/share/glsl/vulkan/common.glsl

@@ -1,103 +0,0 @@
-
-// Shader specialization.
-#define SHADER_MOD_XOR  1U // Xor composite mode
-#define SHADER_MOD_MASK 2U // MASK_FILL / MASK_BLIT
-
-layout (constant_id = 0) const uint const_InAlphaType    = 0;
-layout (constant_id = 1) const uint const_OutAlphaType   = 0;
-layout (constant_id = 2) const uint const_ShaderVariant  = 0;
-layout (constant_id = 3) const uint const_ShaderModifier = 0;
-
-// Host structs.
-struct VKTransform {
-    float m00, m01, m02;
-    float m10, m11, m12;
-};
-struct VKCompositeConstants {
-    uint xorColor;
-    float extraAlpha;
-};
-
-// Vertex shader transformation support.
-#ifdef STAGE_VERT
-layout(push_constant) uniform PushConstants { VKTransform transform; } push;
-
-vec4 transformToDeviceSpace(vec2 v) {
-    return vec4(vec3(v, 1.0) * mat2x3(push.transform.m00, push.transform.m01, push.transform.m02, push.transform.m10, push.transform.m11, push.transform.m12), 0.0, 1.0);
-}
-#endif
-
-// Fragment shader push constant support.
-#ifdef STAGE_FRAG
-#define PUSH_CONSTANTS_IMPL(STATEMENT) \
-    layout(push_constant) uniform PushConstants { VKTransform _; VKCompositeConstants push_composite; STATEMENT }
-#define DEFAULT_PUSH_CONSTANTS() PUSH_CONSTANTS_IMPL(STAGE_FRAG)
-#define PUSH_CONSTANTS(TYPE) PUSH_CONSTANTS_IMPL(TYPE push;)
-#endif
-
-// Color conversion support.
-#define ALPHA_TYPE_PRE_MULTIPLIED 0U
-#define ALPHA_TYPE_STRAIGHT       1U
-
-vec4 convertAlpha(vec4 color, uint inType, uint outType) {
-    if (inType == ALPHA_TYPE_STRAIGHT && outType == ALPHA_TYPE_PRE_MULTIPLIED) {
-        return vec4(color.rgb * color.a, color.a);
-    } else if (inType == ALPHA_TYPE_PRE_MULTIPLIED && outType == ALPHA_TYPE_STRAIGHT && color.a > 0.0) {
-        return vec4(color.rgb / color.a, color.a);
-    } else return color;
-}
-
-vec4 convertAlpha(vec4 color) {
-    return convertAlpha(color, const_InAlphaType, const_OutAlphaType);
-}
-
-// When applying alpha to a color, straight alpha only multiplies alpha,
-// and pre-multiplied multiplies the whole color. Use this for convenience.
-vec4 alphaMask(float alpha, uint alphaType) {
-    return alphaType == ALPHA_TYPE_PRE_MULTIPLIED ? vec4(alpha) : vec4(1.0, 1.0, 1.0, alpha);
-}
-
-// Decode color from uint-packed ARGB components.
-vec4 decodeColor(uint srgb) {
-    return vec4((uvec4(srgb) >> uvec4(16, 8, 0, 24)) & 0xFFU) / 255.0;
-}
-
-#ifdef STAGE_FRAG
-// Before outputting the color, some post-processing is needed:
-// - For alpha composite, apply extra alpha.
-// - For XOR composite, apply xor.
-vec4 applyComposite(vec4 color, VKCompositeConstants composite) {
-    if ((const_ShaderModifier & SHADER_MOD_XOR) != 0) {
-        uvec4 xor = uvec4(composite.xorColor) >> uvec4(16, 8, 0, 24);
-        xor = (uvec4(color * 255.0) ^ xor) & 0xFFU;
-        return vec4(xor) / 255.0;
-    } else return color * alphaMask(composite.extraAlpha, const_OutAlphaType);
-}
-#define APPLY_COMPOSITE(COLOR) applyComposite(COLOR, push_composite)
-
-// MASK_FILL / MASK_BLIT support.
-int calculateMaskIndex(vec2 localCoord, ivec4 originOffsetAndScanline) {
-    ivec2 maskPos = ivec2(localCoord - vec2(originOffsetAndScanline.xy));
-    int offset = originOffsetAndScanline.z;
-    int scanline = originOffsetAndScanline.w;
-    return offset + scanline * maskPos.y + min(scanline, maskPos.x);
-}
-vec4 applyMaskOp(vec4 color, float mask) {
-    if ((const_ShaderModifier & SHADER_MOD_XOR) != 0) return color * float(mask > 0.0);
-    else return color * alphaMask(mask, const_OutAlphaType);
-}
-#define APPLY_MASK(COLOR) applyMaskOp(COLOR, imageLoad(u_Mask, calculateMaskIndex(gl_FragCoord.xy, in_OriginOffsetAndScanline)).r)
-
-// Generic shader support.
-#define GENERIC_INOUT()                                            \
-    layout(location = 0) out      vec4 out_Color;                  \
-    layout(location = 0) in       vec2 in_Position;                \
-    layout(location = 1) in flat  uint in_Data;                    \
-    layout(location = 2) in flat ivec4 in_OriginOffsetAndScanline; \
-    layout(origin_upper_left) in  vec4 gl_FragCoord;               \
-    layout(set = 0, binding = 0, r8) uniform readonly restrict imageBuffer u_Mask
-
-// Generic color output - handles composite and mask automatically.
-#define OUTPUT(COLOR) out_Color = COLOR; out_Color = APPLY_COMPOSITE(out_Color); \
-    if ((const_ShaderModifier & SHADER_MOD_MASK) != 0) out_Color = APPLY_MASK(out_Color)
-#endif

src/java.desktop/share/glsl/vulkan/gradient.frag

@@ -1,21 +0,0 @@
-#version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
-
-#define SHADER_VARIANT_GRADIENT_CLAMP 0
-#define SHADER_VARIANT_GRADIENT_CYCLE 1
-
-struct VKGradientPaintConstants {
-    vec4 c0, c1;
-    vec3 p;
-};
-PUSH_CONSTANTS(VKGradientPaintConstants);
-GENERIC_INOUT();
-
-void main() {
-    float t = dot(vec3(in_Position, 1.0), push.p);
-    t = const_ShaderVariant == SHADER_VARIANT_GRADIENT_CYCLE ?
-        abs(mod(t + 1.0, 2.0) - 1.0) : // Cycle
-        clamp(t, 0.0, 1.0);            // Clamp
-    OUTPUT(convertAlpha(mix(push.c0, push.c1, t)));
-}

src/java.desktop/share/glsl/vulkan/mask_fill.vert

@@ -1,21 +0,0 @@
-#version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
-
-layout(location = 0) in ivec4 in_PositionOffsetAndScanline;
-layout(location = 1) in  uint in_Data;
-
-layout(location = 0) out vec2 out_Position;
-layout(location = 1) out uint out_Data;
-
-// This starts with "Origin" and not "Position" intentionally.
-// When drawing, vertices are ordered in a such way, that provoking vertex is always the top-left one.
-// This gives us an easy way to calculate offset within the rectangle without additional inputs.
-layout(location = 2) out flat ivec4 out_OriginOffsetAndScanline;
-
-void main() {
-    out_Position = in_PositionOffsetAndScanline.xy;
-    out_Data = in_Data;
-    out_OriginOffsetAndScanline = in_PositionOffsetAndScanline;
-    gl_Position = transformToDeviceSpace(in_PositionOffsetAndScanline.xy);
-}

src/java.desktop/share/glsl/vulkan/mask_fill_color.frag

@@ -1,6 +1,4 @@
 #version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
 
 layout(set = 0, binding = 0, r8) uniform readonly restrict imageBuffer u_Mask;
 
@@ -12,5 +10,9 @@ layout(location = 1) in flat  vec4 in_Color;
 layout(location = 0) out vec4 out_Color;
 
 void main() {
-    out_Color = APPLY_MASK(in_Color);
+    ivec2 maskPos = ivec2(gl_FragCoord.xy - vec2(in_OriginOffsetAndScanline.xy));
+    int offset = in_OriginOffsetAndScanline.z;
+    int scanline = in_OriginOffsetAndScanline.w;
+    int maskIndex = offset + scanline * maskPos.y + min(scanline, maskPos.x);
+    out_Color = in_Color * imageLoad(u_Mask, maskIndex).r;
 }

src/java.desktop/share/glsl/vulkan/mask_fill_color.vert

@@ -1,9 +1,11 @@
 #version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
+
+layout(push_constant) uniform PushConstants {
+    mat2x3 transform;
+} push;
 
 layout(location = 0) in ivec4 in_PositionOffsetAndScanline;
-layout(location = 1) in  uint in_Color;
+layout(location = 1) in  vec4 in_Color;
 
 // This starts with "Origin" and not "Position" intentionally.
 // When drawing, vertices are ordered in a such way, that provoking vertex is always the top-left one.
@@ -12,7 +14,7 @@ layout(location = 0) out flat ivec4 out_OriginOffsetAndScanline;
 layout(location = 1) out flat  vec4 out_Color;
 
 void main() {
-    gl_Position = transformToDeviceSpace(in_PositionOffsetAndScanline.xy);
+    gl_Position = vec4(vec3(in_PositionOffsetAndScanline.xy, 1)*push.transform, 0.0, 1.0);
     out_OriginOffsetAndScanline = in_PositionOffsetAndScanline;
-    out_Color = convertAlpha(decodeColor(in_Color));
+    out_Color = in_Color;
 }

src/java.desktop/share/glsl/vulkan/primitive.vert

@@ -1,15 +0,0 @@
-#version 450
-#extension GL_GOOGLE_include_directive: require
-#include "common.glsl"
-
-layout(location = 0) in  vec2 in_Position;
-layout(location = 1) in  uint in_Data;
-layout(location = 0) out vec2 out_Position;
-layout(location = 1) out uint out_Data;
-layout(location = 2) out flat ivec4 _; // Unused output
-
-void main() {
-    out_Position = in_Position;
-    out_Data = in_Data;
-    gl_Position = transformToDeviceSpace(in_Position);
-}

src/java.desktop/share/native/common/java2d/vulkan/VKBlitLoops.c

@@ -113,7 +113,7 @@ void VKBlitLoops_IsoBlit(VKSDOps* srcOps, jint filter,
                                                                   VK_COMPONENT_SWIZZLE_ONE);
     VKPackedSwizzle swizzle = srcOpaque ? OPAQUE_SWIZZLE : 0;
 
-    if (!VKRenderer_Validate(SHADER_BLIT, NO_SHADER_VARIANT, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, alphaType)) return;
+    if (!VKRenderer_Validate(SHADER_BLIT, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, alphaType)) return;
     VKRenderer_DrawImage(srcOps->image, srcOps->image->format, swizzle, filter, SAMPLER_WRAP_BORDER,
                          (float)sx1, (float)sy1, (float)sx2, (float)sy2, (float)dx1, (float)dy1, (float)dx2, (float)dy2);
     VKRenderer_AddSurfaceDependency(srcOps, context->surface);
@@ -165,12 +165,11 @@ void VKBlitLoops_Blit(JNIEnv *env, SurfaceDataOps* src, jshort srctype, jint fil
 
             // Need to validate render pass early, as image may not yet be configured.
             AlphaType alphaType = getSrcAlphaType(srctype);
-            if (!VKRenderer_Validate(SHADER_BLIT, NO_SHADER_VARIANT, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, alphaType)) return;
+            if (!VKRenderer_Validate(SHADER_BLIT, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, alphaType)) return;
 
             VKDevice* device = context->surface->device;
             BlitSrcType type = decodeSrcType(device, srctype);
-            VKTexturePoolHandle* imageHandle =
-                    VKTexturePool_GetTexture(VKRenderer_GetTexturePool(device->renderer), sw, sh, type.format);
+            VKTexturePoolHandle* imageHandle = VKTexturePool_GetTexture(device->texturePool, sw, sh, type.format);
             VKImage* image = VKTexturePoolHandle_GetTexture(imageHandle);
 
             VkDeviceSize dataSize = sh * sw * srcInfo.pixelStride;

src/java.desktop/share/native/common/java2d/vulkan/VKComposites.c

@@ -56,7 +56,7 @@ VKComposites VKComposites_Create() {
             .colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT |
                               VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT },
         {   .logicOpEnable = VK_TRUE,
-            .logicOp = VK_LOGIC_OP_XOR }, ALPHA_TYPE_STRAIGHT });
+            .logicOp = VK_LOGIC_OP_XOR }, ALPHA_TYPE_PRE_MULTIPLIED });
 
     //                NAME |      SRC_COLOR       |       DST_COLOR      |      SRC_ALPHA       |       DST_ALPHA     ||
     ALPHA_BLEND(     CLEAR , ZERO                 , ZERO                 , ZERO                 , ZERO                );
@@ -138,6 +138,7 @@ void VKComposites_AddState(VKComposites* composites, VKCompositeMode mode, VKCom
     state.blendState.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
     state.blendState.pNext = NULL;
     state.blendState.attachmentCount = 1;
+    state.outAlphaType = ALPHA_TYPE_PRE_MULTIPLIED;
     MAP_AT(composites->map, (VKCompositeDescriptor) { mode, VK_FALSE }) = state;
 
     // Using pre-multiplied alpha is necessary for correct blending,

src/java.desktop/share/native/common/java2d/vulkan/VKDevice.c

@@ -272,6 +272,7 @@ void VKDevice_CheckAndAdd(VKEnv* vk, VkPhysicalDevice physicalDevice) {
 void VKDevice_Reset(VKDevice* device) {
     if (device == NULL) return;
     VKRenderer_Destroy(device->renderer);
+    VKTexturePool_Dispose(device->texturePool);
     VKAllocator_Destroy(device->allocator);
     ARRAY_FREE(device->enabledExtensions);
     ARRAY_FREE(device->enabledLayers);
@@ -391,4 +392,11 @@ Java_sun_java2d_vulkan_VKGPU_init(JNIEnv *env, jclass jClass, jlong jDevice) {
         JNU_ThrowByName(env, "java/lang/RuntimeException", "Vulkan: Cannot create renderer");
         return;
     }
+
+    device->texturePool = VKTexturePool_InitWithDevice(device);
+    if (!device->texturePool) {
+        VKDevice_Reset(device);
+        JNU_ThrowByName(env, "java/lang/RuntimeException", "Vulkan: Cannot create texture pool");
+        return;
+    }
 }

src/java.desktop/share/native/common/java2d/vulkan/VKDevice.h

@@ -59,6 +59,7 @@ struct VKDevice {
 
     VKAllocator*     allocator;
     VKRenderer*      renderer;
+    VKTexturePool*   texturePool;
 
     DEVICE_FUNCTION_TABLE(DECL_PFN)
     SWAPCHAIN_DEVICE_FUNCTION_TABLE(DECL_PFN)

src/java.desktop/share/native/common/java2d/vulkan/VKPipelines.c

@@ -49,7 +49,6 @@ static size_t pipelineDescriptorHash(const void* ptr) {
     hash(&h, d->inAlphaType);
     hash(&h, d->composite);
     hash(&h, d->shader);
-    hash(&h, d->shaderVariant);
     hash(&h, d->topology);
     return (size_t) h;
 }
@@ -60,7 +59,6 @@ static bool pipelineDescriptorEquals(const void* ap, const void* bp) {
            a->inAlphaType == b->inAlphaType &&
              a->composite == b->composite &&
                 a->shader == b->shader &&
-         a->shaderVariant == b->shaderVariant &&
               a->topology == b->topology;
 }
 
@@ -146,20 +144,12 @@ static VKPipelineInfo VKPipelines_CreatePipelines(VKRenderPassContext* renderPas
         VkPipelineShaderStageCreateInfo createInfos[2]; // vert + frag
     } ShaderStages;
     ShaderStages stages[count];
-    typedef struct {
-        uint32_t inAlphaType, outAlphaType, shaderVariant, shaderModifier;
-    } SpecializationData;
-    const VkSpecializationMapEntry SPECIALIZATION_ENTRIES[] = {
-        { 0,  0, 4 },
-        { 1,  4, 4 },
-        { 2,  8, 4 },
-        { 3, 12, 4 }
-    };
     typedef struct {
         VkSpecializationInfo info;
-        SpecializationData data;
+        VkSpecializationMapEntry entries[2];
+        uint64_t data[1];
     } Specialization;
-    Specialization specializations[count];
+    Specialization specializations[count][2];
     VkPipelineInputAssemblyStateCreateInfo inputAssemblyStates[count];
     VkPipelineDepthStencilStateCreateInfo depthStencilStates[count];
     VkPipelineDynamicStateCreateInfo dynamicStates[count];
@@ -173,19 +163,14 @@ static VKPipelineInfo VKPipelines_CreatePipelines(VKRenderPassContext* renderPas
         // - pStages (but stageCount is set to 2)
         // - pVertexInputState
         // - createInfo.layout
-        specializations[i] = (Specialization) {
-            .info = {
-                .mapEntryCount = SARRAY_COUNT_OF(SPECIALIZATION_ENTRIES),
-                .pMapEntries = SPECIALIZATION_ENTRIES,
-                .dataSize = sizeof(SpecializationData),
-                .pData = &specializations[i].data
-            },
-            .data = {
-                descriptors[i].inAlphaType, pipelineInfos[i].outAlphaType, (uint32_t) descriptors[i].shaderVariant,
-                (descriptors[i].composite == LOGIC_COMPOSITE_XOR ? 1 : 0) |
-                (descriptors[i].shader & SHADER_MASK ? 2 : 0)
-            }
-        };
+        for (uint32_t j = 0; j < SARRAY_COUNT_OF(specializations[i]); j++) {
+            specializations[i][j].info = (VkSpecializationInfo) {
+                .mapEntryCount = 0,
+                .pMapEntries = specializations[i][j].entries,
+                .dataSize = 0,
+                .pData = specializations[i][j].data
+            };
+        }
         inputAssemblyStates[i] = (VkPipelineInputAssemblyStateCreateInfo) {
             .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
             .topology = descriptors[i].topology
@@ -249,38 +234,37 @@ static VKPipelineInfo VKPipelines_CreatePipelines(VKRenderPassContext* renderPas
     }
 
     // Setup input states.
-    MAKE_INPUT_STATE(PRIMITIVE, VKVertex, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32_UINT);
-    MAKE_INPUT_STATE(MASK_FILL, VKMaskFillVertex, VK_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32_UINT);
+    MAKE_INPUT_STATE(COLOR, VKColorVertex, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32A32_SFLOAT);
+    MAKE_INPUT_STATE(MASK_FILL_COLOR, VKMaskFillColorVertex, VK_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SFLOAT);
     MAKE_INPUT_STATE(BLIT, VKTxVertex, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32_SFLOAT);
     MAKE_INPUT_STATE(CLIP, VKIntVertex, VK_FORMAT_R32G32_SINT);
 
     for (uint32_t i = 0; i < count; i++) {
         // Setup shader-specific pipeline parameters.
-        switch ((int) descriptors[i].shader) {
+        switch (descriptors[i].shader) {
         case SHADER_COLOR:
-            createInfos[i].pVertexInputState = &INPUT_STATE_PRIMITIVE;
-            createInfos[i].layout = pipelineContext->commonPipelineLayout;
+            createInfos[i].pVertexInputState = &INPUT_STATE_COLOR;
+            createInfos[i].layout = pipelineContext->colorPipelineLayout;
             stages[i] = (ShaderStages) {{ shaders->color_vert, shaders->color_frag }};
             break;
-        case SHADER_COLOR | SHADER_MASK:
-            createInfos[i].pVertexInputState = &INPUT_STATE_MASK_FILL;
+        case SHADER_MASK_FILL_COLOR:
+            createInfos[i].pVertexInputState = &INPUT_STATE_MASK_FILL_COLOR;
             createInfos[i].layout = pipelineContext->maskFillPipelineLayout;
             stages[i] = (ShaderStages) {{ shaders->mask_fill_color_vert, shaders->mask_fill_color_frag }};
             break;
-        case SHADER_GRADIENT:
-            createInfos[i].pVertexInputState = &INPUT_STATE_PRIMITIVE;
-            createInfos[i].layout = pipelineContext->maskFillPipelineLayout;
-            stages[i] = (ShaderStages) {{ shaders->primitive_vert, shaders->gradient_frag }};
-            break;
-        case SHADER_GRADIENT | SHADER_MASK:
-            createInfos[i].pVertexInputState = &INPUT_STATE_MASK_FILL;
-            createInfos[i].layout = pipelineContext->maskFillPipelineLayout;
-            stages[i] = (ShaderStages) {{ shaders->mask_fill_vert, shaders->gradient_frag }};
-            break;
         case SHADER_BLIT:
             createInfos[i].pVertexInputState = &INPUT_STATE_BLIT;
             createInfos[i].layout = pipelineContext->texturePipelineLayout;
             stages[i] = (ShaderStages) {{ shaders->blit_vert, shaders->blit_frag }};
+            // Alpha conversion specialization.
+            uint32_t* spec = (uint32_t*) specializations[i][1].data;
+            spec[0] = descriptors[i].inAlphaType;
+            spec[1] = pipelineInfos[i].outAlphaType;
+            specializations[i][1].info.dataSize = 8;
+            specializations[i][1].entries[0] = (VkSpecializationMapEntry) { 0, 0, 4 };
+            specializations[i][1].entries[1] = (VkSpecializationMapEntry) { 1, 4, 4 };
+            specializations[i][1].info.mapEntryCount = 2;
+            stages[i].createInfos[1].pSpecializationInfo = &specializations[i][1].info;
             break;
         case SHADER_CLIP:
             createInfos[i].pVertexInputState = &INPUT_STATE_CLIP;
@@ -306,9 +290,6 @@ static VKPipelineInfo VKPipelines_CreatePipelines(VKRenderPassContext* renderPas
         default:
             VK_FATAL_ERROR("Cannot create pipeline, unknown shader requested!");
         }
-        for (uint32_t j = 0; j < createInfos[i].stageCount; j++) {
-            stages[i].createInfos[j].pSpecializationInfo = &specializations[i].info;
-        }
         assert(createInfos[i].pDynamicState->dynamicStateCount <= MAX_DYNAMIC_STATES);
         J2dRlsTraceLn(J2D_TRACE_INFO, "VKPipelines_CreatePipelines: stencilMode=%d, dstOpaque=%d, composite=%d, shader=%d, topology=%d",
                 descriptors[i].stencilMode, descriptors[i].dstOpaque, descriptors[i].composite, descriptors[i].shader, descriptors[i].topology);
@@ -322,7 +303,6 @@ static VKPipelineInfo VKPipelines_CreatePipelines(VKRenderPassContext* renderPas
     J2dRlsTraceLn(J2D_TRACE_INFO, "VKPipelines_CreatePipelines: created %d pipelines", count);
     for (uint32_t i = 0; i < count; i++) {
         pipelineInfos[i].pipeline = pipelines[i];
-        pipelineInfos[i].layout = createInfos[i].layout;
         MAP_AT(renderPassContext->pipelines, descriptors[i]) = pipelineInfos[i];
     }
     return pipelineInfos[0];
@@ -423,49 +403,21 @@ static VkResult VKPipelines_InitPipelineLayouts(VKDevice* device, VKPipelineCont
     assert(device != NULL && pipelines != NULL);
     VkResult result;
 
-    // We want all our pipelines to have the same push constant ranges to ensure a common state is compatible between pipelines.
-    VkPushConstantRange pushConstantRanges[] = {{
+    // We want all our pipelines to have same push constant range to ensure common state is compatible between pipelines.
+    VkPushConstantRange pushConstantRange = {
             .stageFlags = VK_SHADER_STAGE_VERTEX_BIT,
             .offset = 0,
             .size = sizeof(VKTransform)
-    }, {
-            .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
-            .offset = PUSH_CONSTANTS_OFFSET,
-            .size = PUSH_CONSTANTS_SIZE
-    }};
-
-    // Common pipeline.
+    };
     VkPipelineLayoutCreateInfo createInfo = {
             .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
             .setLayoutCount = 0,
-            .pushConstantRangeCount = SARRAY_COUNT_OF(pushConstantRanges),
-            .pPushConstantRanges = pushConstantRanges
+            .pushConstantRangeCount = 1,
+            .pPushConstantRanges = &pushConstantRange
     };
-    result = device->vkCreatePipelineLayout(device->handle, &createInfo, NULL, &pipelines->commonPipelineLayout);
+    result = device->vkCreatePipelineLayout(device->handle, &createInfo, NULL, &pipelines->colorPipelineLayout);
     VK_IF_ERROR(result) return result;
 
-    // Mask fill pipeline.
-    VkDescriptorSetLayoutBinding maskBufferLayoutBinding = {
-            .binding = 0,
-            .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER,
-            .descriptorCount = 1,
-            .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
-            .pImmutableSamplers = NULL
-    };
-    VkDescriptorSetLayoutCreateInfo descriptorSetLayoutCreateInfo = {
-            .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
-            .bindingCount = 1,
-            .pBindings = &maskBufferLayoutBinding
-    };
-    result = device->vkCreateDescriptorSetLayout(device->handle, &descriptorSetLayoutCreateInfo, NULL, &pipelines->maskFillDescriptorSetLayout);
-    VK_IF_ERROR(result) return result;
-
-    createInfo.setLayoutCount = 1;
-    createInfo.pSetLayouts = &pipelines->maskFillDescriptorSetLayout;
-    result = device->vkCreatePipelineLayout(device->handle, &createInfo, NULL, &pipelines->maskFillPipelineLayout);
-    VK_IF_ERROR(result) return result;
-
-    // Texture pipeline.
     VkDescriptorSetLayoutBinding textureLayoutBinding = {
             .binding = 0,
             .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
@@ -485,11 +437,31 @@ static VkResult VKPipelines_InitPipelineLayouts(VKDevice* device, VKPipelineCont
         pipelines->textureDescriptorSetLayout,
         pipelines->samplers.descriptorSetLayout
     };
-    createInfo.setLayoutCount = SARRAY_COUNT_OF(textureDescriptorSetLayouts);
+    createInfo.setLayoutCount = 2;
     createInfo.pSetLayouts = textureDescriptorSetLayouts;
     result = device->vkCreatePipelineLayout(device->handle, &createInfo, NULL, &pipelines->texturePipelineLayout);
     VK_IF_ERROR(result) return result;
 
+    VkDescriptorSetLayoutBinding maskBufferLayoutBinding = {
+            .binding = 0,
+            .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER,
+            .descriptorCount = 1,
+            .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
+            .pImmutableSamplers = NULL
+    };
+    VkDescriptorSetLayoutCreateInfo descriptorSetLayoutCreateInfo = {
+            .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+            .bindingCount = 1,
+            .pBindings = &maskBufferLayoutBinding
+    };
+    result = device->vkCreateDescriptorSetLayout(device->handle, &descriptorSetLayoutCreateInfo, NULL, &pipelines->maskFillDescriptorSetLayout);
+    VK_IF_ERROR(result) return result;
+
+    createInfo.setLayoutCount = 1;
+    createInfo.pSetLayouts = &pipelines->maskFillDescriptorSetLayout;
+    result = device->vkCreatePipelineLayout(device->handle, &createInfo, NULL, &pipelines->maskFillPipelineLayout);
+    VK_IF_ERROR(result) return result;
+
     return VK_SUCCESS;
 }
 
@@ -532,7 +504,7 @@ void VKPipelines_DestroyContext(VKPipelineContext* pipelineContext) {
 
     VKPipelines_DestroyShaders(device, pipelineContext->shaders);
 
-    device->vkDestroyPipelineLayout(device->handle, pipelineContext->commonPipelineLayout, NULL);
+    device->vkDestroyPipelineLayout(device->handle, pipelineContext->colorPipelineLayout, NULL);
     device->vkDestroyPipelineLayout(device->handle, pipelineContext->texturePipelineLayout, NULL);
     device->vkDestroyDescriptorSetLayout(device->handle, pipelineContext->textureDescriptorSetLayout, NULL);
     device->vkDestroyPipelineLayout(device->handle, pipelineContext->maskFillPipelineLayout, NULL);

src/java.desktop/share/native/common/java2d/vulkan/VKPipelines.h

@@ -36,26 +36,13 @@
  * Shader programs.
  */
 typedef enum {
-    // Base shaders.
     SHADER_COLOR,
-    SHADER_GRADIENT,
+    SHADER_MASK_FILL_COLOR,
     SHADER_BLIT,
     SHADER_CLIP,
-    NO_SHADER = 0x7FFFFFFF,
-    // Mask modifier bit (MASK_FILL & MASK_BLIT).
-    SHADER_MASK = ~NO_SHADER
+    NO_SHADER = 0x7FFFFFFF
 } VKShader;
 
-/**
- * Shader variant.
- * It is used to specialize shader behavior, and its meaning varies with each particular shader.
- */
-typedef enum {
-    SHADER_VARIANT_GRADIENT_CLAMP = 0,
-    SHADER_VARIANT_GRADIENT_CYCLE = 1,
-    NO_SHADER_VARIANT = 0x7FFFFFFF
-} VKShaderVariant;
-
 typedef enum {
     STENCIL_MODE_NONE = 0, // No stencil attachment.
     STENCIL_MODE_OFF  = 1, // Has stencil attachment, stencil test disabled.
@@ -72,14 +59,12 @@ typedef struct {
     AlphaType           inAlphaType : 1;
     VKCompositeMode     composite;
     VKShader            shader;
-    VKShaderVariant     shaderVariant;
     VkPrimitiveTopology topology;
 } VKPipelineDescriptor;
 
 typedef struct {
-    VkPipeline       pipeline;
-    VkPipelineLayout layout;
-    AlphaType        outAlphaType;
+    VkPipeline pipeline;
+    AlphaType  outAlphaType;
 } VKPipelineInfo;
 
 /**
@@ -87,7 +72,7 @@ typedef struct {
  */
 struct VKPipelineContext {
     VKDevice*                   device;
-    VkPipelineLayout            commonPipelineLayout;
+    VkPipelineLayout            colorPipelineLayout;
     VkDescriptorSetLayout       textureDescriptorSetLayout;
     VkPipelineLayout            texturePipelineLayout;
     VkDescriptorSetLayout       maskFillDescriptorSetLayout;
@@ -108,42 +93,14 @@ struct VKRenderPassContext {
     MAP(VKPipelineDescriptor, VKPipelineInfo) pipelines;
 };
 
-typedef struct {
-    unsigned int xorColor;
-    float extraAlpha;
-} VKCompositeConstants;
-
-typedef struct {
-    RGBA c0, c1;
-    float p0, p1, p3;
-} VKGradientPaintConstants;
-
-typedef union {
-    // The minimum guaranteed size of push constants is 128 bytes.
-    alignas(32) // The maximum alignment for built-in glsl types is 32 bytes (dvec4).
-    char data[(128 - sizeof(VKTransform) - sizeof(VKCompositeConstants)) / 32 * 32];
-    VKGradientPaintConstants gradientPaint;
-} VKShaderConstants;
-#define MAX_SHADER_CONSTANTS_SIZE 96 // We expect 96 bytes
-typedef char VKShaderConstantsCheckOffset[sizeof(VKShaderConstants) == MAX_SHADER_CONSTANTS_SIZE ? 1 : -1]; // Verify.
-
-typedef struct {
-    VKTransform transform;
-    VKCompositeConstants composite;
-    VKShaderConstants shader;
-} VKPushConstants;
-typedef char VKPushConstantsCheckSize[sizeof(VKPushConstants) <= 128 ? 1 : -1]; // We should not exceed 128 bytes.
-static const uint32_t PUSH_CONSTANTS_OFFSET = (uintptr_t) &((VKPushConstants*) NULL)->composite;
-static const uint32_t PUSH_CONSTANTS_SIZE = sizeof(VKPushConstants) - PUSH_CONSTANTS_OFFSET;
-
 typedef struct {
     int x, y;
 } VKIntVertex;
 
 typedef struct {
     float x, y;
-    unsigned int data;
-} VKVertex;
+    RGBA color;
+} VKColorVertex;
 
 typedef struct {
     float px, py;
@@ -152,8 +109,8 @@ typedef struct {
 
 typedef struct {
     int x, y, maskOffset, maskScanline;
-    unsigned int data;
-} VKMaskFillVertex;
+    RGBA color;
+} VKMaskFillColorVertex;
 
 VKPipelineContext* VKPipelines_CreateContext(VKDevice* device);
 void VKPipelines_DestroyContext(VKPipelineContext* pipelines);

src/java.desktop/share/native/common/java2d/vulkan/VKRenderQueue.c

@@ -93,21 +93,6 @@
 #define OFFSET_XFORM   sun_java2d_vulkan_VKBlitLoops_OFFSET_XFORM
 #define OFFSET_ISOBLIT sun_java2d_vulkan_VKBlitLoops_OFFSET_ISOBLIT
 
-static void applyXor() {
-    if (VKRenderer_GetContext()->shader == SHADER_COLOR) {
-        VKRenderer_GetContext()->vertexData ^= VKRenderer_GetContext()->constants.composite.xorColor;
-    }
-}
-
-static void setComposite(VKCompositeMode comp, unsigned int xorColor, float extraAlpha) {
-    VKRenderer_GetContext()->composite = comp;
-    if (VKRenderer_GetContext()->constants.composite.xorColor != xorColor ||
-        VKRenderer_GetContext()->constants.composite.extraAlpha != extraAlpha) {
-        VKRenderer_GetContext()->constants.composite = (VKCompositeConstants) { xorColor, extraAlpha };
-        VKRenderer_GetContext()->constantsModCount++;
-    }
-}
-
 JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
     (JNIEnv *env, jobject oglrq, jlong buf, jint limit)
 {
@@ -491,26 +476,30 @@ JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint   flags      = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_ALPHA_COMPOSITE(%d, %f, %d)", rule, extraAlpha, flags);
-                applyXor();
-                setComposite((VKCompositeMode) rule, 0, extraAlpha);
+                VKRenderer_GetContext()->renderColor      = VKRenderer_GetContext()->color;
+                VKRenderer_GetContext()->composite  = (VKCompositeMode) rule;
+                VKRenderer_GetContext()->extraAlpha = extraAlpha;
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_XOR_COMPOSITE:
             {
                 jint xorPixel = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
-                    "VKRenderQueue_flushBuffer: SET_XOR_COMPOSITE(0x%08x)", xorPixel);
-                applyXor();
-                setComposite(LOGIC_COMPOSITE_XOR, xorPixel, -1.0f);
-                applyXor();
+                    "VKRenderQueue_flushBuffer: SET_XOR_COMPOSITE");
+                VKRenderer_GetContext()->renderColor = VKUtil_DecodeJavaColor(xorPixel, ALPHA_TYPE_STRAIGHT);
+                // TODO Fix XOR mode!
+                // VKRenderer_GetContext()->renderColor.a = 0.0f; // Alpha is left unchanged in XOR mode.
+                VKRenderer_GetContext()->composite  = LOGIC_COMPOSITE_XOR;
+                VKRenderer_GetContext()->extraAlpha = 1.0f;
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_RESET_COMPOSITE:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_COMPOSITE");
-                applyXor();
-                setComposite(ALPHA_COMPOSITE_SRC, 0, 1.0f);
+                VKRenderer_GetContext()->renderColor = VKRenderer_GetContext()->color;
+                VKRenderer_GetContext()->composite  = ALPHA_COMPOSITE_SRC;
+                VKRenderer_GetContext()->extraAlpha = 1.0f;
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_TRANSFORM:
@@ -533,8 +522,8 @@ JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 };
 
                 VKRenderingContext* context = VKRenderer_GetContext();
-                if (VK_IS_NEQ_TRANSFORM(&context->constants.transform, &transform)) {
-                    context->constants.transform = transform;
+                if (VK_IS_NEQ_TRANSFORM(&context->transform, &transform)) {
+                    context->transform = transform;
                     context->transformModCount++;
                 }
             }
@@ -544,8 +533,8 @@ JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_TRANSFORM");
                 VKRenderingContext* context = VKRenderer_GetContext();
-                if (VK_IS_NEQ_TRANSFORM(&context->constants.transform, &VK_ID_TRANSFORM)) {
-                    context->constants.transform = VK_ID_TRANSFORM;
+                if (VK_IS_NEQ_TRANSFORM(&context->transform, &VK_ID_TRANSFORM)) {
+                    context->transform = VK_ID_TRANSFORM;
                     context->transformModCount++;
                 }
             }
@@ -579,10 +568,9 @@ JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISPOSE_SURFACE:
             {
-                VKSDOps* surface = NEXT_VK_SURFACE(b);
+                jlong pData = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DISPOSE_SURFACE");
-                VKSD_ResetSurface(surface);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISPOSE_CONFIG:
@@ -655,34 +643,31 @@ JNIEXPORT void JNICALL Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_COLOR:
             {
-                VKRenderer_GetContext()->inAlphaType = ALPHA_TYPE_STRAIGHT;
-                VKRenderer_GetContext()->shader = SHADER_COLOR;
-                VKRenderer_GetContext()->shaderVariant = NO_SHADER_VARIANT;
-                VKRenderer_GetContext()->vertexData = NEXT_INT(b);
-                applyXor();
-                J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: SET_COLOR(0x%08x)", VKRenderer_GetContext()->vertexData);
+                jint javaColor = NEXT_INT(b);
+                VKRenderer_GetContext()->color = VKUtil_DecodeJavaColor(javaColor, ALPHA_TYPE_STRAIGHT);
+                if (COMPOSITE_GROUP(VKRenderer_GetContext()->composite) == ALPHA_COMPOSITE_GROUP) {
+                    VKRenderer_GetContext()->renderColor = VKRenderer_GetContext()->color;
+                }
+                J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: SET_COLOR(0x%08x)", javaColor);
+                J2dTraceLn(J2D_TRACE_VERBOSE, // Print color values with straight alpha for convenience.
+                    "    srgb={%.3f, %.3f, %.3f, %.3f}",
+                    VKUtil_GetRGBA(VKRenderer_GetContext()->color, ALPHA_TYPE_STRAIGHT).r,
+                    VKUtil_GetRGBA(VKRenderer_GetContext()->color, ALPHA_TYPE_STRAIGHT).g,
+                    VKUtil_GetRGBA(VKRenderer_GetContext()->color, ALPHA_TYPE_STRAIGHT).b,
+                    VKUtil_GetRGBA(VKRenderer_GetContext()->color, ALPHA_TYPE_STRAIGHT).a);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_GRADIENT_PAINT:
             {
-                jboolean useMask = NEXT_BOOLEAN(b); // Unused.
-                jboolean cyclic  = NEXT_BOOLEAN(b);
-                jdouble p0       = NEXT_DOUBLE(b);
-                jdouble p1       = NEXT_DOUBLE(b);
-                jdouble p3       = NEXT_DOUBLE(b);
-                jint pixel1      = NEXT_INT(b);
-                jint pixel2      = NEXT_INT(b);
+                jboolean useMask= NEXT_BOOLEAN(b);
+                jboolean cyclic = NEXT_BOOLEAN(b);
+                jdouble p0      = NEXT_DOUBLE(b);
+                jdouble p1      = NEXT_DOUBLE(b);
+                jdouble p3      = NEXT_DOUBLE(b);
+                jint pixel1     = NEXT_INT(b);
+                jint pixel2     = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_GRADIENT_PAINT");
-                VKRenderer_GetContext()->inAlphaType = ALPHA_TYPE_PRE_MULTIPLIED;
-                VKRenderer_GetContext()->shader = SHADER_GRADIENT;
-                VKRenderer_GetContext()->shaderVariant = cyclic ? SHADER_VARIANT_GRADIENT_CYCLE : SHADER_VARIANT_GRADIENT_CLAMP;
-                VKRenderer_GetContext()->constants.shader.gradientPaint = (VKGradientPaintConstants) {
-                    VKUtil_GetRGBA(VKUtil_DecodeJavaColor(pixel1, ALPHA_TYPE_PRE_MULTIPLIED), ALPHA_TYPE_PRE_MULTIPLIED),
-                    VKUtil_GetRGBA(VKUtil_DecodeJavaColor(pixel2, ALPHA_TYPE_PRE_MULTIPLIED), ALPHA_TYPE_PRE_MULTIPLIED),
-                    p0*2.0, p1*2.0, p3*2.0-0.5
-                };
-                VKRenderer_GetContext()->constantsModCount++;
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_LINEAR_GRADIENT_PAINT:

src/java.desktop/share/native/common/java2d/vulkan/VKRenderer.c

@@ -94,7 +94,6 @@ typedef struct {
 struct VKRenderer {
     VKDevice*          device;
     VKPipelineContext* pipelineContext;
-    VKTexturePool*     texturePool;
 
     POOL(VkCommandBuffer,   commandBufferPool);
     POOL(VkCommandBuffer,   secondaryCommandBufferPool);
@@ -164,7 +163,6 @@ struct VKRenderPass {
     BufferWritingState maskFillBufferWriting;
 
     VKPipelineDescriptor state;
-    uint64_t             constantsModCount; // Just a tag to detect when constants were changed.
     uint64_t             transformModCount; // Just a tag to detect when transform was changed.
     uint64_t             clipModCount; // Just a tag to detect when clip was changed.
     VkBool32             pendingFlush    : 1;
@@ -177,17 +175,12 @@ struct VKRenderPass {
 // which is only called from queue flusher thread, no need for synchronization.
 static VKRenderingContext context = {
         .surface = NULL,
-        .composite = ALPHA_COMPOSITE_SRC_OVER,
-        .inAlphaType = ALPHA_TYPE_UNKNOWN,
-        .shader = NO_SHADER,
-        .shaderVariant = NO_SHADER_VARIANT,
-        .vertexData = 0,
-        .constantsModCount = 1,
+        .transform = VK_ID_TRANSFORM,
         .transformModCount = 1,
-        .constants = {
-            .transform = VK_ID_TRANSFORM,
-            .composite = { 0, 1.0f }
-        },
+        .color = {},
+        .renderColor = {},
+        .composite = ALPHA_COMPOSITE_SRC_OVER,
+        .extraAlpha = 1.0f,
         .clipModCount = 1,
         .clipRect = NO_CLIP,
         .clipSpanVertices = NULL
@@ -200,9 +193,6 @@ VKRenderingContext *VKRenderer_GetContext() {
     return &context;
 }
 
-VKTexturePool *VKRenderer_GetTexturePool(VKRenderer* renderer) {
-    return renderer->texturePool;
-}
 /**
  * Helper function for POOL_TAKE macro.
  */
@@ -227,7 +217,7 @@ static VkBool32 VKRenderer_CheckPoolDrain(void* pool, void* entry) {
     return VK_FALSE;
 }
 
-#define VERTEX_BUFFER_SIZE (128 * 1024) // 128KiB - enough to draw 1820 quads (6 verts) with VKVertex.
+#define VERTEX_BUFFER_SIZE (128 * 1024) // 128KiB - enough to draw 910 quads (6 verts) with VKColorVertex.
 #define VERTEX_BUFFER_PAGE_SIZE (1 * 1024 * 1024) // 1MiB - fits 8 buffers.
 static void VKRenderer_FindVertexBufferMemoryType(VKMemoryRequirements* requirements) {
     VKAllocator_FindMemoryType(requirements, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
@@ -378,12 +368,6 @@ VKRenderer* VKRenderer_Create(VKDevice* device) {
         return NULL;
     }
 
-    renderer->texturePool = VKTexturePool_InitWithDevice(device);
-    if (!renderer->texturePool) {
-        VKRenderer_Destroy(renderer);
-        return NULL;
-    }
-
     // Create command pool
     // TODO we currently have single command pool with VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT
     //      we may need to consider having multiple pools to avoid resetting buffers one-by-one
@@ -454,9 +438,6 @@ void VKRenderer_Destroy(VKRenderer* renderer) {
         device->vkDestroyDescriptorPool(device->handle, renderer->descriptorPools[i], NULL);
     }
     ARRAY_FREE(renderer->descriptorPools);
-
-    VKTexturePool_Dispose(renderer->texturePool);
-
     for (uint32_t i = 0; i < ARRAY_SIZE(renderer->imageDescriptorPools); i++) {
         device->vkDestroyDescriptorPool(device->handle, renderer->imageDescriptorPools[i], NULL);
     }
@@ -603,47 +584,25 @@ inline void VKRenderer_FlushDraw(VKSDOps* surface) {
 static void VKRenderer_ResetDrawing(VKSDOps* surface) {
     assert(surface != NULL && surface->renderPass != NULL);
     VKRenderer* renderer = surface->device->renderer;
-    VKRenderPass* renderPass = surface->renderPass;
-    renderPass->state.composite = NO_COMPOSITE;
-    renderPass->state.shader = NO_SHADER;
-    renderPass->constantsModCount = 0;
-    renderPass->transformModCount = 0;
-    renderPass->firstVertex = 0;
-    renderPass->vertexCount = 0;
-    renderPass->vertexBufferWriting = (BufferWritingState) { NULL, 0, VK_FALSE };
-    renderPass->maskFillBufferWriting = (BufferWritingState) { NULL, 0, VK_FALSE };
-    if (ARRAY_SIZE(renderPass->flushRanges) > 0) {
+    surface->renderPass->state.composite = NO_COMPOSITE;
+    surface->renderPass->state.shader = NO_SHADER;
+    surface->renderPass->transformModCount = 0;
+    surface->renderPass->firstVertex = 0;
+    surface->renderPass->vertexCount = 0;
+    surface->renderPass->vertexBufferWriting = (BufferWritingState) {NULL, 0, VK_FALSE};
+    surface->renderPass->maskFillBufferWriting = (BufferWritingState) {NULL, 0, VK_FALSE};
+    if (ARRAY_SIZE(surface->renderPass->flushRanges) > 0) {
         VK_IF_ERROR(surface->device->vkFlushMappedMemoryRanges(surface->device->handle,
-            ARRAY_SIZE(renderPass->flushRanges), renderPass->flushRanges)) {}
-        ARRAY_RESIZE(renderPass->flushRanges, 0);
+            ARRAY_SIZE(surface->renderPass->flushRanges), surface->renderPass->flushRanges)) {}
+        ARRAY_RESIZE(surface->renderPass->flushRanges, 0);
     }
-    size_t vertexBufferCount = ARRAY_SIZE(renderPass->vertexBuffers);
-    size_t maskFillBufferCount = ARRAY_SIZE(renderPass->maskFillBuffers);
-    size_t cleanupQueueCount = ARRAY_SIZE(renderPass->cleanupQueue);
-    for (uint32_t i = 0; i < vertexBufferCount; i++) {
-        POOL_RETURN(renderer, vertexBufferPool, renderPass->vertexBuffers[i]);
-    }
-    for (uint32_t i = 0; i < maskFillBufferCount; i++) {
-        POOL_RETURN(renderer, maskFillBufferPool, renderPass->maskFillBuffers[i]);
-    }
-    for (uint32_t i = 0; i < cleanupQueueCount; i++) {
-        POOL_RETURN(renderer, cleanupQueue, renderPass->cleanupQueue[i]);
-    }
-    ARRAY_RESIZE(renderPass->vertexBuffers, 0);
-    ARRAY_RESIZE(renderPass->maskFillBuffers, 0);
-    ARRAY_RESIZE(renderPass->cleanupQueue, 0);
-
-    // Update dependencies on used surfaces.
-    for (uint32_t i = 0, surfaces = (uint32_t) ARRAY_SIZE(renderPass->usedSurfaces); i < surfaces; i++) {
-        VKSDOps* usedSurface = renderPass->usedSurfaces[i];
-        uint32_t newSize = 0, oldSize = (uint32_t) ARRAY_SIZE(usedSurface->dependentSurfaces);
-        for (uint32_t j = 0; j < oldSize; j++) {
-            VKSDOps* s = usedSurface->dependentSurfaces[j];
-            if (s != surface) usedSurface->dependentSurfaces[newSize++] = s;
-        }
-        if (newSize != oldSize) ARRAY_RESIZE(usedSurface->dependentSurfaces, newSize);
-    }
-    ARRAY_RESIZE(renderPass->usedSurfaces, 0);
+#define MOVE_TO_POOL(ARRAY, POOL)                                           \
+    for (uint32_t i = 0; i < ARRAY_SIZE(surface->renderPass->ARRAY); i++) { \
+        POOL_RETURN(renderer, POOL, surface->renderPass->ARRAY[i]);         \
+    } ARRAY_RESIZE(surface->renderPass->ARRAY, 0)
+    MOVE_TO_POOL(vertexBuffers, vertexBufferPool);
+    MOVE_TO_POOL(maskFillBuffers, maskFillBufferPool);
+    MOVE_TO_POOL(cleanupQueue, cleanupQueue);
 }
 
 /**
@@ -731,7 +690,6 @@ static VkBool32 VKRenderer_InitRenderPass(VKSDOps* surface) {
                 .composite = NO_COMPOSITE,
                 .shader = NO_SHADER
             },
-            .constantsModCount = 0,
             .transformModCount = 0,
             .clipModCount = 0,
             .pendingFlush = VK_FALSE,
@@ -898,11 +856,19 @@ VkBool32 VKRenderer_FlushRenderPass(VKSDOps* surface) {
     VKRenderer* renderer = device->renderer;
     VkCommandBuffer cb = VKRenderer_Record(renderer);
 
-    // Update timestamps on used surfaces.
+    // Update dependencies on used surfaces.
     surface->lastTimestamp = renderer->writeTimestamp;
     for (uint32_t i = 0, surfaces = (uint32_t) ARRAY_SIZE(surface->renderPass->usedSurfaces); i < surfaces; i++) {
-        surface->renderPass->usedSurfaces[i]->lastTimestamp = renderer->writeTimestamp;
+        VKSDOps* usedSurface = surface->renderPass->usedSurfaces[i];
+        usedSurface->lastTimestamp = renderer->writeTimestamp;
+        uint32_t newSize = 0, oldSize = (uint32_t) ARRAY_SIZE(usedSurface->dependentSurfaces);
+        for (uint32_t j = 0; j < oldSize; j++) {
+            VKSDOps* s = usedSurface->dependentSurfaces[j];
+            if (s != surface) usedSurface->dependentSurfaces[newSize++] = s;
+        }
+        if (newSize != oldSize) ARRAY_RESIZE(usedSurface->dependentSurfaces, newSize);
     }
+    ARRAY_RESIZE(surface->renderPass->usedSurfaces, 0);
 
     // Insert barriers to prepare surface for rendering.
     VkImageMemoryBarrier barriers[2];
@@ -1135,7 +1101,7 @@ static uint32_t VKRenderer_AllocateVertices(uint32_t primitives, uint32_t vertic
  * This function can invalidate drawing state, always call it before VK_DRAW.
  */
 static BufferWritingState VKRenderer_AllocateMaskFillBytes(uint32_t size) {
-    // assert(size > 0); // size can be 0 when binding the buffer without allocating any data.
+    assert(size > 0);
     assert(size <= MASK_FILL_BUFFER_SIZE);
     VKSDOps* surface = VKRenderer_GetContext()->surface;
     BufferWritingState state = VKRenderer_AllocateBufferData(
@@ -1171,35 +1137,16 @@ static void VKRenderer_ValidateTransform() {
                 0.0f, 2.0f / (float) surface->image->extent.height, -1.0f
         };
         // Combine it with user transform.
-        VKUtil_ConcatenateTransform(&transform, &context->constants.transform);
+        VKUtil_ConcatenateTransform(&transform, &context->transform);
         // Push the transform into shader.
         surface->device->vkCmdPushConstants(
                 renderPass->commandBuffer,
-                surface->device->renderer->pipelineContext->commonPipelineLayout,
+                surface->device->renderer->pipelineContext->colorPipelineLayout, // TODO what if our pipeline layout differs?
                 VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(VKTransform), &transform
         );
     }
 }
 
-static void VKRenderer_ValidateConstants() {
-    VKRenderingContext* context = VKRenderer_GetContext();
-    assert(context->surface != NULL);
-    VKSDOps* surface = context->surface;
-    VKRenderPass* renderPass = surface->renderPass;
-    // Update constants, ignoring clip and color shaders.
-    if (renderPass->constantsModCount != context->constantsModCount &&
-        renderPass->state.shader != SHADER_CLIP && renderPass->state.shader != SHADER_COLOR) {
-        J2dTraceLn(J2D_TRACE_VERBOSE, "VKRenderer_ValidateConstants: updating constants");
-        VKRenderer_FlushDraw(surface);
-        renderPass->constantsModCount = context->constantsModCount;
-        surface->device->vkCmdPushConstants(
-                renderPass->commandBuffer,
-                surface->device->renderer->pipelineContext->commonPipelineLayout,
-                VK_SHADER_STAGE_FRAGMENT_BIT, PUSH_CONSTANTS_OFFSET, PUSH_CONSTANTS_SIZE, &context->constants.composite
-        );
-    }
-}
-
 /**
  * Setup stencil attachment according to the context clip state.
  * If there is a clip shape, attachment is cleared with "fail" value and then
@@ -1236,7 +1183,6 @@ static void VKRenderer_SetupStencil() {
             .inAlphaType = ALPHA_TYPE_UNKNOWN,
             .composite = NO_COMPOSITE,
             .shader = SHADER_CLIP,
-            .shaderVariant = NO_SHADER_VARIANT,
             .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST
         }).pipeline);
     // Reset vertex buffer binding.
@@ -1245,8 +1191,10 @@ static void VKRenderer_SetupStencil() {
     // Rasterize clip spans.
     uint32_t primitiveCount = ARRAY_SIZE(context->clipSpanVertices) / 3;
     VKIntVertex* vs;
-    for (uint32_t primitivesDrawn = 0; primitivesDrawn < primitiveCount;) {
-        uint32_t currentDraw = VK_DRAW(vs, primitiveCount - primitivesDrawn, 3);
+    for (uint32_t primitivesDrawn = 0;;) {
+        uint32_t currentDraw = primitiveCount - primitivesDrawn;
+        if (currentDraw == 0) break;
+        currentDraw = VK_DRAW(vs, currentDraw, 3);
         memcpy(vs, context->clipSpanVertices + primitivesDrawn * 3, currentDraw * 3 * sizeof(VKIntVertex));
         primitivesDrawn += currentDraw;
     }
@@ -1281,7 +1229,7 @@ void VKRenderer_RecordBarriers(VKRenderer* renderer,
 /**
  * Setup pipeline for drawing. Returns FALSE if surface is not yet ready for drawing.
  */
-VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkPrimitiveTopology topology, AlphaType inAlphaType) {
+VkBool32 VKRenderer_Validate(VKShader shader, VkPrimitiveTopology topology, AlphaType inAlphaType) {
     assert(context.surface != NULL);
     VKSDOps* surface = context.surface;
 
@@ -1323,18 +1271,10 @@ VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkP
             J2dTraceLn(J2D_TRACE_VERBOSE, "VKRenderer_Validate: updating clip");
             surface->device->vkCmdSetScissor(renderPass->commandBuffer, 0, 1, &context.clipRect);
             if (clipChanged) {
-                VKStencilMode stencilMode = STENCIL_MODE_NONE;
                 if (ARRAY_SIZE(context.clipSpanVertices) > 0) {
                     VKRenderer_SetupStencil();
-                    stencilMode = STENCIL_MODE_ON;
-                } else if (surface->stencil != NULL) {
-                    stencilMode = STENCIL_MODE_OFF;
-                }
-                // Reset the pipeline when changing stencil mode.
-                if (renderPass->state.stencilMode != stencilMode) {
-                    renderPass->state.shader = NO_SHADER;
-                }
-                renderPass->state.stencilMode = stencilMode;
+                    renderPass->state.stencilMode = STENCIL_MODE_ON;
+                } else renderPass->state.stencilMode = surface->stencil != NULL ? STENCIL_MODE_OFF : STENCIL_MODE_NONE;
             }
         }
         // Validate current composite.
@@ -1350,7 +1290,6 @@ VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkP
 
     // Validate current pipeline.
     if (renderPass->state.shader != shader ||
-        renderPass->state.shaderVariant != shaderVariant ||
         renderPass->state.topology != topology ||
         renderPass->state.inAlphaType != inAlphaType) {
         J2dTraceLn(J2D_TRACE_VERBOSE, "VKRenderer_Validate: updating pipeline, old=%d, new=%d",
@@ -1358,7 +1297,6 @@ VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkP
         VKRenderer_FlushDraw(surface);
         VkCommandBuffer cb = renderPass->commandBuffer;
         renderPass->state.shader = shader;
-        renderPass->state.shaderVariant = shaderVariant;
         renderPass->state.topology = topology;
         renderPass->state.inAlphaType = inAlphaType;
         VKPipelineInfo pipelineInfo = VKPipelines_GetPipelineInfo(renderPass->context, renderPass->state);
@@ -1366,26 +1304,10 @@ VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkP
         surface->device->vkCmdBindPipeline(cb, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineInfo.pipeline);
         renderPass->vertexBufferWriting.bound = VK_FALSE;
         renderPass->maskFillBufferWriting.bound = VK_FALSE;
-
-        // If pipeline uses mask fill layout, but the shader is not actually a MASK one, that must be a generic-layout pipeline.
-        // In that case, we need to bind a mask buffer, even if we won't ever use it.
-        // We could use VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT or nullDescriptor, but those require
-        // optional features or extensions, so don't bother for now...
-        // TODO this is ugly, do something with it.
-        if (pipelineInfo.layout == surface->device->renderer->pipelineContext->maskFillPipelineLayout && !(shader & SHADER_MASK)) {
-            VKRenderer_AllocateMaskFillBytes(0);
-        }
     }
-
-    VKRenderer_ValidateConstants();
     return VK_TRUE;
 }
 
-static VkBool32 VKRenderer_ValidatePaint(VKShader shaderModifier, VkBool32 fill) {
-    return VKRenderer_Validate(context.shader | shaderModifier, context.shaderVariant,
-        fill ? VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST : VK_PRIMITIVE_TOPOLOGY_LINE_LIST, context.inAlphaType);
-}
-
 // Drawing operations.
 
 void VKRenderer_RenderRect(VkBool32 fill, jint x, jint y, jint w, jint h) {
@@ -1396,9 +1318,12 @@ void VKRenderer_RenderRect(VkBool32 fill, jint x, jint y, jint w, jint h) {
 void VKRenderer_RenderParallelogram(VkBool32 fill,
                                     jfloat x11, jfloat y11,
                                     jfloat dx21, jfloat dy21,
-                                    jfloat dx12, jfloat dy12) {
-    if (!VKRenderer_ValidatePaint(0, fill)) return; // Not ready.
-
+                                    jfloat dx12, jfloat dy12)
+{
+    if (!VKRenderer_Validate(SHADER_COLOR,
+                             fill ? VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST
+                                  : VK_PRIMITIVE_TOPOLOGY_LINE_LIST, ALPHA_TYPE_UNKNOWN)) return; // Not ready.
+    RGBA c = VKRenderer_GetRGBA(context.surface, context.renderColor);
     /*                   dx21
      *    (p1)---------(p2) |          (p1)------
      *     |\            \  |            |  \    dy21
@@ -1409,12 +1334,12 @@ void VKRenderer_RenderParallelogram(VkBool32 fill,
      *                              dy21    \ |
      *                                  -----(p3)
      */
-    VKVertex p1 = {x11, y11, context.vertexData};
-    VKVertex p2 = {x11 + dx21, y11 + dy21, context.vertexData};
-    VKVertex p3 = {x11 + dx21 + dx12, y11 + dy21 + dy12, context.vertexData};
-    VKVertex p4 = {x11 + dx12, y11 + dy12, context.vertexData};
+    VKColorVertex p1 = {x11, y11, c};
+    VKColorVertex p2 = {x11 + dx21, y11 + dy21, c};
+    VKColorVertex p3 = {x11 + dx21 + dx12, y11 + dy21 + dy12, c};
+    VKColorVertex p4 = {x11 + dx12, y11 + dy12, c};
 
-    VKVertex* vs;
+    VKColorVertex* vs;
     VK_DRAW(vs, 1, fill ? 6 : 8);
     uint32_t i = 0;
     vs[i++] = p1;
@@ -1431,18 +1356,19 @@ void VKRenderer_RenderParallelogram(VkBool32 fill,
 
 void VKRenderer_FillSpans(jint spanCount, jint *spans) {
     if (spanCount == 0) return;
-    if (!VKRenderer_ValidatePaint(0, VK_TRUE)) return; // Not ready.
+    if (!VKRenderer_Validate(SHADER_COLOR, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, ALPHA_TYPE_UNKNOWN)) return; // Not ready.
+    RGBA c = VKRenderer_GetRGBA(context.surface, context.renderColor);
 
     jfloat x1 = (float)*(spans++);
     jfloat y1 = (float)*(spans++);
     jfloat x2 = (float)*(spans++);
     jfloat y2 = (float)*(spans++);
-    VKVertex p1 = {x1, y1, context.vertexData};
-    VKVertex p2 = {x2, y1, context.vertexData};
-    VKVertex p3 = {x2, y2, context.vertexData};
-    VKVertex p4 = {x1, y2, context.vertexData};
+    VKColorVertex p1 = {x1, y1, c};
+    VKColorVertex p2 = {x2, y1, c};
+    VKColorVertex p3 = {x2, y2, c};
+    VKColorVertex p4 = {x1, y2, c};
 
-    VKVertex* vs;
+    VKColorVertex* vs;
     VK_DRAW(vs, 1, 6);
     vs[0] = p1; vs[1] = p2; vs[2] = p3; vs[3] = p3; vs[4] = p4; vs[5] = p1;
 
@@ -1459,8 +1385,8 @@ void VKRenderer_FillSpans(jint spanCount, jint *spans) {
 
 void VKRenderer_MaskFill(jint x, jint y, jint w, jint h,
                          jint maskoff, jint maskscan, jint masklen, uint8_t *mask) {
-    if (!VKRenderer_ValidatePaint(SHADER_MASK, VK_TRUE)) return; // Not ready.
-
+    if (!VKRenderer_Validate(SHADER_MASK_FILL_COLOR,
+                             VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, ALPHA_TYPE_UNKNOWN)) return; // Not ready.
     // maskoff is the offset from the beginning of mask,
     // it's the same as x and y offset within a tile (maskoff % maskscan, maskoff / maskscan).
     // maskscan is the number of bytes in a row/
@@ -1478,13 +1404,14 @@ void VKRenderer_MaskFill(jint x, jint y, jint w, jint h,
         *((char *)maskState.data) = (char)0xFF;
     }
 
-    VKMaskFillVertex* vs;
+    VKMaskFillColorVertex* vs;
     VK_DRAW(vs, 1, 6);
+    RGBA c = VKRenderer_GetRGBA(context.surface, context.renderColor);
     int offset = (int) maskState.offset;
-    VKMaskFillVertex p1 = {x, y, offset, maskscan, context.vertexData};
-    VKMaskFillVertex p2 = {x + w, y, offset, maskscan, context.vertexData};
-    VKMaskFillVertex p3 = {x + w, y + h, offset, maskscan, context.vertexData};
-    VKMaskFillVertex p4 = {x, y + h, offset, maskscan, context.vertexData};
+    VKMaskFillColorVertex p1 = {x, y, offset, maskscan, c};
+    VKMaskFillColorVertex p2 = {x + w, y, offset, maskscan, c};
+    VKMaskFillColorVertex p3 = {x + w, y + h, offset, maskscan, c};
+    VKMaskFillColorVertex p4 = {x, y + h, offset, maskscan, c};
     // Always keep p1 as provoking vertex for correct origin calculation in vertex shader.
     vs[0] = p1; vs[1] = p3; vs[2] = p2;
     vs[3] = p1; vs[4] = p3; vs[5] = p4;

src/java.desktop/share/native/common/java2d/vulkan/VKRenderer.h

@@ -29,22 +29,27 @@
 
 #include "VKTypes.h"
 #include "VKPipelines.h"
-#include "VKTexturePool.h"
 
 #define NO_CLIP ((VkRect2D) {{0, 0}, {0x7FFFFFFFU, 0x7FFFFFFFU}})
 
 struct VKRenderingContext {
     VKSDOps*        surface;
 
-    VKCompositeMode composite;
-    AlphaType       inAlphaType;
-    VKShader        shader;
-    VKShaderVariant shaderVariant;
-    unsigned int    vertexData;
-    VKPushConstants constants;
-    uint64_t        constantsModCount;
+    VKTransform     transform;
     uint64_t        transformModCount;
 
+    // We keep this color separately from renderColor,
+    // because we need consistent state when switching between XOR and alpha
+    // composite modes. This variable holds last value set by SET_COLOR, while
+    // renderColor holds color, currently used for drawing, which may have
+    // also been provided by SET_XOR_COMPOSITE.
+    Color           color;
+    Color           renderColor;
+    VKCompositeMode composite;
+
+    // Extra alpha is not used when painting with plain color,
+    // in this case color.a already includes it.
+    float extraAlpha;
     uint64_t           clipModCount; // Used to track changes to the clip.
     VkRect2D           clipRect;
     ARRAY(VKIntVertex) clipSpanVertices;
@@ -57,7 +62,7 @@ VKRenderer* VKRenderer_Create(VKDevice* device);
 /**
  * Setup pipeline for drawing. Returns FALSE if the surface is not yet ready for drawing.
  */
-VkBool32 VKRenderer_Validate(VKShader shader, VKShaderVariant shaderVariant, VkPrimitiveTopology topology, AlphaType inAlphaType);
+VkBool32 VKRenderer_Validate(VKShader shader, VkPrimitiveTopology topology, AlphaType inAlphaType);
 
 /**
  * Record commands into the primary command buffer (outside of a render pass).
@@ -142,6 +147,5 @@ void VKRenderer_DrawImage(VKImage* image, VkFormat format,
                           float dx1, float dy1, float dx2, float dy2);
 
 VKRenderingContext* VKRenderer_GetContext();
-VKTexturePool* VKRenderer_GetTexturePool(VKRenderer* );
 
 #endif //VKRenderer_h_Included

src/java.desktop/share/native/common/java2d/vulkan/VKSurfaceData.c

@@ -292,7 +292,7 @@ VkBool32 VKSD_ConfigureWindowSurface(VKWinSDOps* vkwinsdo) {
 }
 
 static void VKSD_OnDispose(JNIEnv* env, SurfaceDataOps* ops) {
-    JNU_CallStaticMethodByName(env, NULL, "sun/java2d/vulkan/VKSurfaceData", "dispose", "(J)V", ptr_to_jlong(ops));
+    VKSD_ResetSurface((VKSDOps*) ops);
 }
 
 JNIEXPORT VKSDOps* VKSD_CreateSurface(JNIEnv* env, jobject vksd, jint type, jint format, jint backgroundRGB,

src/java.desktop/share/native/common/java2d/vulkan/VKTypes.h

@@ -62,7 +62,7 @@ typedef uint16_t VKPackedSwizzle;
  */
 typedef struct {
     float m00, m01, m02;
-    float m10, m11, m12;
+    float m10 __attribute__((aligned(16))), m11, m12;
 } VKTransform;
 
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VKMemory);

src/java.desktop/unix/classes/sun/awt/wl/DefaultFrameDecoration.java

@@ -40,44 +40,35 @@ import java.awt.RenderingHints;
 import java.awt.geom.Ellipse2D;
 
 public class DefaultFrameDecoration extends FullFrameDecorationHelper {
-    private static final int BORDER_SIZE = 1;
-    private static final int HEIGHT = 28 + BORDER_SIZE;
+    private static final int HEIGHT = 30;
     private static final int BUTTON_ICON_SIZE = 4;
-    private static final int BUTTON_SIZE = 16;
-    private static final int BUTTONS_RIGHT_PADDING = 7;
-    private static final int BUTTONS_PADDING = 8;
+    private static final int BUTTON_CIRCLE_RADIUS = 10;
     private static final Font FONT = new Font(Font.DIALOG, Font.BOLD, 12);
-    private static final Color ACTIVE_BACKGROUND = new Color(0xedeeef);
-    private static final Color ACTIVE_BACKGROUND_DARK = new Color(0x31363b);
-    private static final Color INACTIVE_BACKGROUND = new Color(0xdcddde);
-    private static final Color INACTIVE_BACKGROUND_DARK = new Color(0x292d31);
+    private static final Color ACTIVE_BACKGROUND = new Color(0xebebeb);
+    private static final Color ACTIVE_BACKGROUND_DARK = new Color(0x222222);
+    private static final Color INACTIVE_BACKGROUND = new Color(0xfafafa);
+    private static final Color INACTIVE_BACKGROUND_DARK = new Color(0x2c2c2c);
     private static final Color ICON_BACKGROUND = ACTIVE_BACKGROUND;
     private static final Color ICON_BACKGROUND_DARK = ACTIVE_BACKGROUND_DARK;
-    private static final Color ICON_HOVERED_BACKGROUND = new Color(0x232629);
-    private static final Color ICON_HOVERED_BACKGROUND_DARK = new Color(0xfcfcfc);
-    private static final Color ICON_HOVERED_FOREGROUND = new Color(0xcacdcf);
-    private static final Color ICON_HOVERED_FOREGROUND_DARK = new Color(0x43484c);
-    private static final Color ICON_PRESSED_BACKGROUND = new Color(0xa6a8ab);
-    private static final Color ICON_PRESSED_BACKGROUND_DARK = new Color(0x6e7175);
-    private static final Color CLOSE_ICON_PRESSED_BACKGROUND = new Color(0x6d2229);
-    private static final Color CLOSE_ICON_PRESSED_BACKGROUND_DARK = new Color(0x6d2229);
-    private static final Color CLOSE_ICON_HOVERED_BACKGROUND = new Color(0xff98a2);
-    private static final Color CLOSE_ICON_HOVERED_INACTIVE_BACKGROUND = new Color(0xda4453);
-    private static final Color CLOSE_ICON_HOVERED_INACTIVE_BACKGROUND_DARK = new Color(0xda4453);
-    private static final Color CLOSE_ICON_HOVERED_BACKGROUND_DARK = new Color(0xff98a2);
-    private static final Color ACTIVE_FOREGROUND = new Color(0x2d3033);
-    private static final Color ACTIVE_FOREGROUND_DARK = new Color(0xf1f1f1);
-    private static final Color INACTIVE_FOREGROUND = ACTIVE_FOREGROUND;
-    private static final Color INACTIVE_FOREGROUND_DARK = ACTIVE_FOREGROUND_DARK;
+    private static final Color ICON_HOVERED_BACKGROUND = new Color(0xd1d1d1);
+    private static final Color ICON_HOVERED_BACKGROUND_DARK = new Color(0x373737);
+    private static final Color ICON_PRESSED_BACKGROUND = new Color(0xc0c0c0);
+    private static final Color ICON_PRESSED_BACKGROUND_DARK = new Color(0x565656);
+    private static final Color ACTIVE_FOREGROUND = Color.darkGray;
+    private static final Color ACTIVE_FOREGROUND_DARK = new Color(0xf7f7f7);
+    private static final Color INACTIVE_FOREGROUND = Color.gray;
+    private static final Color INACTIVE_FOREGROUND_DARK = new Color(0xb5b5b5);
 
-    private static final Color ACTIVE_BACKGROUND_TOP = new Color(0xa9abac);
-    private static final Color ACTIVE_BACKGROUND_TOP_DARK = new Color(0x4c565f);
-    private static final Color INACTIVE_BACKGROUND_TOP = new Color(0xb7b8b9);
-    private static final Color INACTIVE_BACKGROUND_TOP_DARK = new Color(0x424952);
-    private static final Color ACTIVE_BORDER = ACTIVE_BACKGROUND_TOP;
-    private static final Color ACTIVE_BORDER_DARK = ACTIVE_BACKGROUND_TOP_DARK;
-    private static final Color INACTIVE_BORDER = INACTIVE_BACKGROUND_TOP;
-    private static final Color INACTIVE_BORDER_DARK = INACTIVE_BACKGROUND_TOP_DARK;
+    private static final Color ACTIVE_BACKGROUND_TOP = new Color(0xfbfbfb);
+    private static final Color ACTIVE_BACKGROUND_TOP_DARK = new Color(0x313131);
+    private static final Color INACTIVE_BACKGROUND_TOP = new Color(0xfefefe);
+    private static final Color INACTIVE_BACKGROUND_TOP_DARK = new Color(0x3a3a3a);
+    private static final Color ACTIVE_BORDER = new Color(0x9e9e9e);
+    private static final Color ACTIVE_BORDER_DARK = new Color(0x080808);
+    private static final Color INACTIVE_BORDER = new Color(0xbcbcbc);
+    private static final Color INACTIVE_BORDER_DARK = new Color(0x121212);
+
+    private static final int BORDER_SIZE = 1;
     private static final int SIGNIFICANT_DRAG_DISTANCE = 4;
 
     public DefaultFrameDecoration(WLDecoratedPeer peer, boolean showMinimize, boolean showMaximize) {
@@ -105,31 +96,64 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
         return new Dimension(getButtonSpaceWidth(), HEIGHT);
     }
 
+    private Point getCloseButtonCenter() {
+        int width = peer.getWidth();
+        return width >= HEIGHT ? new Point(width - HEIGHT / 2, HEIGHT / 2) : null;
+    }
+
+    private Point getMaximizeButtonCenter() {
+        if (!hasMaximizeButton()) return null;
+        int width = peer.getWidth();
+        return width >= 2 * HEIGHT ? new Point(width - HEIGHT * 3 / 2, HEIGHT / 2) : null;
+    }
+
+    private Point getMinimizeButtonCenter() {
+        if (!hasMinimizeButton()) return null;
+        int width = peer.getWidth();
+        int buttonSpaceWidth = getButtonSpaceWidth();
+        return width >= buttonSpaceWidth ? new Point(width - buttonSpaceWidth + HEIGHT / 2, HEIGHT / 2) : null;
+    }
+
     @Override
     protected Rectangle getCloseButtonBounds() {
-        int x = peer.getWidth() - BUTTON_SIZE - BUTTONS_RIGHT_PADDING - BORDER_SIZE;
-        int y = (int) Math.floor((HEIGHT - BUTTON_SIZE + 1f) / 2);
-        return new Rectangle(x, y, BUTTON_SIZE, BUTTON_SIZE);
+        int width = peer.getWidth();
+        if (width >= HEIGHT) {
+            return new Rectangle(width - HEIGHT / 2 - BUTTON_CIRCLE_RADIUS,
+                    HEIGHT / 2 - BUTTON_CIRCLE_RADIUS,
+                    BUTTON_CIRCLE_RADIUS * 2,
+                    BUTTON_CIRCLE_RADIUS * 2);
+        } else {
+            return null;
+        }
     }
 
     @Override
     protected Rectangle getMaximizeButtonBounds() {
         if (!hasMaximizeButton()) return null;
-
-        int x = peer.getWidth() - BUTTON_SIZE * 2 - BUTTONS_RIGHT_PADDING
-                - BUTTONS_PADDING - BORDER_SIZE;
-        int y = (int) Math.floor((HEIGHT - BUTTON_SIZE + 1f) / 2);
-        return x > 0 ? new Rectangle(x, y, BUTTON_SIZE, BUTTON_SIZE) : null;
+        int width = peer.getWidth();
+        if (width >= 2 * HEIGHT) {
+            return new Rectangle(width - HEIGHT * 3 / 2 - BUTTON_CIRCLE_RADIUS,
+                    HEIGHT / 2 - BUTTON_CIRCLE_RADIUS,
+                    BUTTON_CIRCLE_RADIUS * 2,
+                    BUTTON_CIRCLE_RADIUS * 2);
+        } else {
+            return null;
+        }
     }
 
     @Override
     protected Rectangle getMinimizeButtonBounds() {
         if (!hasMinimizeButton()) return null;
-
-        int x = peer.getWidth() - BUTTON_SIZE * 3 - BUTTONS_RIGHT_PADDING
-                - BUTTONS_PADDING * 2 - BORDER_SIZE;
-        int y = (int) Math.floor((HEIGHT - BUTTON_SIZE + 1f) / 2);
-        return x > 0 ? new Rectangle(x, y, BUTTON_SIZE, BUTTON_SIZE) : null;
+        int width = peer.getWidth();
+        int buttonSpaceWidth = getButtonSpaceWidth();
+        if (width >= buttonSpaceWidth) {
+            return new Rectangle(width - buttonSpaceWidth + HEIGHT / 2 - BUTTON_CIRCLE_RADIUS,
+                    HEIGHT / 2 - BUTTON_CIRCLE_RADIUS,
+                    BUTTON_CIRCLE_RADIUS * 2,
+                    BUTTON_CIRCLE_RADIUS * 2);
+        } else {
+            return null;
+        }
     }
 
     @Override
@@ -146,7 +170,7 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
         final int numButtons = 1
                 + (hasMaximizeButton() ? 1 : 0)
                 + (hasMinimizeButton() ? 1 : 0);
-        return numButtons * BUTTON_SIZE + (numButtons - 1) * BUTTONS_PADDING + BUTTONS_RIGHT_PADDING;
+        return numButtons * HEIGHT;
     }
 
     private Color getBackgroundColor(boolean isActive) {
@@ -193,33 +217,13 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
         }
     }
 
-    private Color getButtonForeground(boolean isHovered) {
-        if (isHovered) {
-            return isDarkTheme() ? ICON_HOVERED_FOREGROUND_DARK : ICON_HOVERED_FOREGROUND;
-        } else {
-            return isDarkTheme() ? ACTIVE_FOREGROUND_DARK : ACTIVE_FOREGROUND;
-        }
-    }
-
-    private Color getClosePressedBackground() {
-        return isDarkTheme() ? CLOSE_ICON_PRESSED_BACKGROUND_DARK : CLOSE_ICON_PRESSED_BACKGROUND;
-    }
-
-    private Color getCloseHoveredBackground(boolean isActive) {
-        if (isActive) {
-            return isDarkTheme() ? CLOSE_ICON_HOVERED_BACKGROUND_DARK : CLOSE_ICON_HOVERED_BACKGROUND;
-        } else {
-            return isDarkTheme() ? CLOSE_ICON_HOVERED_INACTIVE_BACKGROUND_DARK : CLOSE_ICON_HOVERED_INACTIVE_BACKGROUND;
-        }
-    }
-
     @Override
     protected void paintBorder(Graphics2D g2d) {
         int width = peer.getWidth();
         int height = peer.getHeight();
         g2d.setColor(getBorderColor(isActive()));
         g2d.setStroke(new BasicStroke(BORDER_SIZE));
-        g2d.drawRect(0, 0, width, height);
+        g2d.drawRect(0, 0, width - BORDER_SIZE, height - BORDER_SIZE);
     }
 
     @Override
@@ -246,11 +250,17 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
             // The title bar
             g.fillRoundRect(0, 0, width, HEIGHT + radius + 1, radius, radius);
 
+            // The top bevel of the title bar
+            g.setColor(getBackgroundTopColor(active));
+            g.drawLine(radius / 2, 1, width - radius / 2, 1);
+            g.drawArc(1, 1, (radius - 1), (radius - 1), 90, 60);
+            g.drawArc(width - radius, 1, (radius - 1), (radius - 1), 45, 45);
+
             // The border
             var oldStroke = g.getStroke();
             g.setColor(getBorderColor(active));
             g.setStroke(new BasicStroke(BORDER_SIZE));
-            g.drawRoundRect(0, 0, width, HEIGHT + radius + 1, radius, radius);
+            g.drawRoundRect(0, 0, width - BORDER_SIZE, HEIGHT + radius + 1, radius, radius);
             g.setStroke(oldStroke);
             g.drawLine(0, HEIGHT - 1, width, HEIGHT - 1);
         } else {
@@ -260,35 +270,32 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
 
             // The top bevel of the title bar
             g.setColor(getBackgroundTopColor(active));
-            g.drawLine(BORDER_SIZE, BORDER_SIZE, width, BORDER_SIZE);
-            g.drawLine(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, HEIGHT);
+            g.drawLine(BORDER_SIZE, BORDER_SIZE, width - BORDER_SIZE, BORDER_SIZE);
+            g.drawLine(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, HEIGHT - BORDER_SIZE);
 
             // The border
             var oldStroke = g.getStroke();
             g.setColor(getBorderColor(active));
             g.setStroke(new BasicStroke(BORDER_SIZE));
-            g.drawRect(0, 0, width, HEIGHT);
+            g.drawRect(0, 0, width - BORDER_SIZE, HEIGHT - BORDER_SIZE);
             g.setStroke(oldStroke);
         }
         paintTitle(g, title, foregroundColor, width);
 
-        Rectangle closeButtonBounds = getCloseButtonBounds();
-        if (closeButtonBounds != null) {
-            paintCloseButtonBackground(g, closeButtonBounds, closeButton);
-            Color buttonColor = getButtonForeground(closeButton.hovered);
-            paintCloseButton(g, closeButtonBounds, buttonColor);
+        Point closeButtonCenter = getCloseButtonCenter();
+        if (closeButtonCenter != null) {
+            paintButtonBackground(g, closeButtonCenter, closeButton);
+            paintCloseButton(g, closeButtonCenter, foregroundColor);
         }
-        Rectangle maximizedButtonBounds = getMaximizeButtonBounds();
-        if (maximizedButtonBounds != null) {
-            paintButtonBackground(g, maximizedButtonBounds, maximizeButton);
-            Color buttonColor = getButtonForeground(maximizeButton.hovered);
-            paintMaximizeButton(g, maximizedButtonBounds, buttonColor);
+        Point maximizedButtonCenter = getMaximizeButtonCenter();
+        if (maximizedButtonCenter != null) {
+            paintButtonBackground(g, maximizedButtonCenter, maximizeButton);
+            paintMaximizeButton(g, maximizedButtonCenter, foregroundColor);
         }
-        Rectangle minimizedButtonBounds = getMinimizeButtonBounds();
-        if (minimizedButtonBounds != null) {
-            paintButtonBackground(g, minimizedButtonBounds, minimizeButton);
-            Color buttonColor = getButtonForeground(minimizeButton.hovered);
-            paintMinimizeButton(g, minimizedButtonBounds, buttonColor);
+        Point minimizedButtonCenter = getMinimizeButtonCenter();
+        if (minimizedButtonCenter != null) {
+            paintButtonBackground(g, minimizedButtonCenter, minimizeButton);
+            paintMinimizeButton(g, minimizedButtonCenter, foregroundColor);
         }
         g.setClip(null);
     }
@@ -297,7 +304,7 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
         g.setColor(foregroundColor);
         g.setFont(FONT);
         FontMetrics fm = g.getFontMetrics();
-        int leftMargin = HEIGHT / 2 - BUTTON_SIZE; // same as space between close button and right window edge
+        int leftMargin = HEIGHT / 2 - BUTTON_CIRCLE_RADIUS; // same as space between close button and right window edge
         int availableWidth = width - getButtonSpaceWidth() - leftMargin;
         String text = SwingUtilities2.clipStringIfNecessary(null, fm, title, availableWidth);
         int textWidth = fm.stringWidth(text);
@@ -306,60 +313,48 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
                 (HEIGHT - fm.getHeight()) / 2 + fm.getAscent());
     }
 
-    private void paintCloseButtonBackground(Graphics2D g, Rectangle bounds, ButtonState state) {
-        if (!isActive() && !state.hovered && !state.pressed) return;
-
-        g.setColor(state.pressed ? getClosePressedBackground() :
-                   state.hovered ? getCloseHoveredBackground(isActive()) : getIconBackground());
-        g.fill(new Ellipse2D.Float(bounds.x, bounds.y, bounds.width, bounds.height));
-    }
-
-    private void paintButtonBackground(Graphics2D g, Rectangle bounds, ButtonState state) {
-        if (state.hovered || state.pressed) {
+    private void paintButtonBackground(Graphics2D g, Point center, ButtonState state) {
+        if (isActive()) {
             g.setColor(state.pressed ? getIconPressedBackground() :
                     state.hovered ? getIconHoveredBackground() : getIconBackground());
-            g.fill(new Ellipse2D.Float(bounds.x, bounds.y, bounds.width, bounds.height));
+            g.fill(new Ellipse2D.Float(center.x - BUTTON_CIRCLE_RADIUS + .5f,
+                    center.y - BUTTON_CIRCLE_RADIUS + .5f,
+                    2 * BUTTON_CIRCLE_RADIUS, 2 * BUTTON_CIRCLE_RADIUS));
         }
     }
 
-    private static Point centerOf(Rectangle rect) {
-        return new Point((int) Math.floor(rect.x + rect.width / 2f),
-                (int) Math.floor(rect.y + rect.height / 2f));
-    }
-
-    private void paintCloseButton(Graphics2D g, Rectangle bounds, Color foregroundColor) {
+    private void paintCloseButton(Graphics2D g, Point center, Color foregroundColor) {
         g.setColor(foregroundColor);
-        Point center = centerOf(bounds);
         g.drawLine(center.x - BUTTON_ICON_SIZE, center.y - BUTTON_ICON_SIZE,
                 center.x + BUTTON_ICON_SIZE, center.y + BUTTON_ICON_SIZE);
         g.drawLine(center.x - BUTTON_ICON_SIZE, center.y + BUTTON_ICON_SIZE,
                 center.x + BUTTON_ICON_SIZE, center.y - BUTTON_ICON_SIZE);
     }
 
-    private void paintMaximizeButton(Graphics2D g, Rectangle bounds, Color foregroundColor) {
+    private void paintMaximizeButton(Graphics2D g, Point center, Color foregroundColor) {
         g.setColor(foregroundColor);
-        Point center = centerOf(bounds);
-        int size = BUTTON_ICON_SIZE + 1;
         if (peer.getState() == Frame.MAXIMIZED_BOTH) {
-            g.drawLine(center.x - size, center.y, center.x, center.y - size);
-            g.drawLine(center.x, center.y - size, center.x + size, center.y);
-            g.drawLine(center.x - size, center.y, center.x, center.y + size);
-            g.drawLine(center.x, center.y + size, center.x + size, center.y);
+            g.drawLine(center.x - BUTTON_ICON_SIZE, center.y,
+                    center.x, center.y - BUTTON_ICON_SIZE);
+            g.drawLine(center.x, center.y - BUTTON_ICON_SIZE,
+                    center.x + BUTTON_ICON_SIZE, center.y);
+            g.drawLine(center.x - BUTTON_ICON_SIZE, center.y,
+                    center.x, center.y + BUTTON_ICON_SIZE);
+            g.drawLine(center.x, center.y + BUTTON_ICON_SIZE,
+                    center.x + BUTTON_ICON_SIZE, center.y);
         } else {
-            g.drawLine(center.x - size, (int) (center.y + size / 2f),
-                    center.x, (int) (center.y - size / 2f));
-            g.drawLine(center.x, (int) (center.y - size / 2f),
-                    center.x + size, (int) (center.y + size / 2f));
+            g.drawLine(center.x - BUTTON_ICON_SIZE, center.y + BUTTON_ICON_SIZE / 2,
+                    center.x, center.y - BUTTON_ICON_SIZE / 2);
+            g.drawLine(center.x, center.y - BUTTON_ICON_SIZE / 2,
+                    center.x + BUTTON_ICON_SIZE, center.y + BUTTON_ICON_SIZE / 2);
         }
     }
 
-    private void paintMinimizeButton(Graphics2D g, Rectangle bounds, Color foregroundColor) {
+    private void paintMinimizeButton(Graphics2D g, Point center, Color foregroundColor) {
         g.setColor(foregroundColor);
-        Point center = centerOf(bounds);
-        int size = BUTTON_ICON_SIZE + 1;
-        g.drawLine(center.x - size, (int) (center.y - size / 2f),
-                center.x, (int) (center.y + size / 2f));
-        g.drawLine(center.x, (int) (center.y + size / 2f),
-                center.x + size, (int) (center.y - size / 2f));
+        g.drawLine(center.x - BUTTON_ICON_SIZE, center.y - BUTTON_ICON_SIZE / 2,
+                center.x, center.y + BUTTON_ICON_SIZE / 2);
+        g.drawLine(center.x, center.y + BUTTON_ICON_SIZE / 2,
+                center.x + BUTTON_ICON_SIZE, center.y -  BUTTON_ICON_SIZE / 2);
     }
 }

src/java.desktop/unix/classes/sun/awt/wl/GtkFrameDecoration.java

@@ -67,7 +67,7 @@ public class GtkFrameDecoration extends FullFrameDecorationHelper {
 
     public GtkFrameDecoration(WLDecoratedPeer peer, boolean showMinimize, boolean showMaximize) {
         super(peer, showMinimize, showMaximize);
-        nativePtr = nativeCreateDecoration(showMinimize, showMaximize, isDarkTheme());
+        nativePtr = nativeCreateDecoration(showMinimize, showMaximize);
         assert nativePtr != 0;
         int t = nativeGetIntProperty(nativePtr, "gtk-dnd-drag-threshold");
         dndThreshold = t > 0 ? t : 4;
@@ -76,10 +76,8 @@ public class GtkFrameDecoration extends FullFrameDecorationHelper {
     @Override
     public void paint(Graphics g) {
         // Determine buttons' bounds, etc.
-        nativePrePaint(nativePtr, peer.getWidth(), peer.getHeight());
-        if (peer.getWidth() >= titleBarMinWidth && peer.getHeight() >= titleBarHeight) {
-            super.paint(g);
-        }
+        nativePrePaint(nativePtr, peer.getWidth());
+        super.paint(g);
     }
 
     @Override
@@ -87,9 +85,6 @@ public class GtkFrameDecoration extends FullFrameDecorationHelper {
         int width = peer.getWidth();
         int height = titleBarHeight;
 
-        assert width >= titleBarMinWidth;
-        assert peer.getHeight() >= titleBarHeight;
-
         double scale = ((WLGraphicsConfig) peer.getGraphicsConfiguration()).getEffectiveScale();
         g2d.setBackground(new Color(0, true));
         g2d.clearRect(0, 0, width, height);
@@ -191,7 +186,7 @@ public class GtkFrameDecoration extends FullFrameDecorationHelper {
 
     @Override
     public void notifyThemeChanged() {
-        nativeSwitchTheme(isDarkTheme());
+        nativeSwitchTheme();
     }
 
     private int getButtonsState() {
@@ -215,12 +210,12 @@ public class GtkFrameDecoration extends FullFrameDecorationHelper {
     private static native void initIDs();
     private static native boolean nativeLoadGTK();
 
-    private native long nativeCreateDecoration(boolean showMinimize, boolean showMaximize, boolean isDarkTheme);
+    private native long nativeCreateDecoration(boolean showMinimize, boolean showMaximize);
     private native void nativeDestroyDecoration(long nativePtr);
-    private native void nativeSwitchTheme(boolean isDarkTheme);
+    private native void nativeSwitchTheme();
     private native void nativePaintTitleBar(long nativePtr, int[] buffer, int width, int height, double scale,
                                             String title, int buttonsState);
     private native int nativeGetIntProperty(long nativePtr, String name);
     private native void nativeNotifyConfigured(long nativePtr, boolean active, boolean maximized, boolean fullscreen);
-    private native void nativePrePaint(long nativePtr, int width, int height);
+    private native void nativePrePaint(long nativePtr, int width);
 }

src/java.desktop/unix/classes/sun/awt/wl/WLButtonPeer.java

@@ -43,11 +43,6 @@ public class WLButtonPeer extends WLComponentPeer implements ButtonPeer {
         label = target.getLabel();
     }
 
-    @Override
-    protected void wlSetVisible(boolean v) {
-        // TODO: unimplemented
-    }
-
     public boolean isFocusable() {
         return true;
     }

src/java.desktop/unix/classes/sun/awt/wl/WLCanvasPeer.java

@@ -42,9 +42,4 @@ class WLCanvasPeer extends WLComponentPeer implements CanvasPeer {
     {
         return gc;
     }
-
-    @Override
-    protected void wlSetVisible(boolean v) {
-        // TODO: unimplemented
-    }
 }

src/java.desktop/unix/classes/sun/awt/wl/WLComponentPeer.java

@@ -88,8 +88,8 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
     private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.wl.focus.WLComponentPeer");
     private static final PlatformLogger popupLog = PlatformLogger.getLogger("sun.awt.wl.popup.WLComponentPeer");
 
-    protected static final int MINIMUM_WIDTH = 1;
-    protected static final int MINIMUM_HEIGHT = 1;
+    private static final int MINIMUM_WIDTH = 1;
+    private static final int MINIMUM_HEIGHT = 1;
 
     private final Object stateLock = new Object();
 
@@ -135,12 +135,7 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
             log.fine("WLComponentPeer: target=" + target + " with size=" + wlSize);
         }
 
-        boolean shadowEnabled = Boolean.parseBoolean(System.getProperty("sun.awt.wl.Shadow", "true"));
-        if (shadowEnabled) {
-            shadow = new ShadowImpl(targetIsWlPopup() ? ShadowImage.POPUP_SHADOW_SIZE : ShadowImage.WINDOW_SHADOW_SIZE);
-        } else {
-            shadow = new NilShadow();
-        }
+        shadow = new Shadow(targetIsWlPopup() ? ShadowImage.POPUP_SHADOW_SIZE : ShadowImage.WINDOW_SHADOW_SIZE);
         // TODO
         // setup parent window for target
     }
@@ -403,13 +398,11 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
             // from notifyConfigured()
         } else {
             performLocked(() -> {
-                if (wlSurface != null) { // may get a "hide" request even though we were never shown
-                    nativeHideFrame(nativePtr);
+                nativeHideFrame(nativePtr);
 
-                    shadow.hide();
-                    wlSurface.dispose();
-                    wlSurface = null;
-                }
+                shadow.hide();
+                wlSurface.dispose();
+                wlSurface = null;
             });
         }
     }
@@ -857,10 +850,8 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
     }
 
     public Dimension getMinimumSize() {
-        int shadowSize = shadow != null ? (int) Math.ceil(shadow.getSize() * 4) : 0;
-        return shadowSize == 0
-                ? new Dimension(MINIMUM_WIDTH, MINIMUM_HEIGHT)
-                : new Dimension(shadowSize, shadowSize);
+        int shadowSize = (int) Math.ceil(shadow.getSize() * 4);
+        return new Dimension(shadowSize, shadowSize);
     }
 
     void showWindowMenu(long serial, int x, int y) {
@@ -1618,14 +1609,6 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
         return new Dimension(javaUnitsToSurfaceSize(d.width), javaUnitsToSurfaceSize(d.height));
     }
 
-    int javaUnitsToBufferUnits(int value) {
-        return (int) Math.floor(value * effectiveScale);
-    }
-
-    int javaSizeToBufferSize(int value) {
-        return (int) Math.ceil(value * effectiveScale);
-    }
-
     /**
      * Converts a point in the device (screen) space into coordinates on this surface
      */
@@ -1756,12 +1739,9 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
 
     private Dimension constrainSize(int width, int height) {
         Dimension maxBounds = getMaxBufferBounds();
-        Dimension minSize = getMinimumSize();
-        minSize.width = Math.max(MINIMUM_WIDTH, minSize.width);
-        minSize.height = Math.max(MINIMUM_HEIGHT, minSize.height);
         return new Dimension(
-                Math.max(Math.min(width, maxBounds.width), minSize.width),
-                Math.max(Math.min(height, maxBounds.height), minSize.height));
+                Math.max(Math.min(width, maxBounds.width), MINIMUM_WIDTH),
+                Math.max(Math.min(height, maxBounds.height), MINIMUM_HEIGHT));
     }
 
     private Dimension constrainSize(Dimension bounds) {
@@ -1830,20 +1810,6 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
         return result;
     }
 
-    private interface Shadow {
-        int getSize();
-        void updateSurfaceSize();
-        void resizeToParentWindow();
-        void createSurface();
-        void commitSurface();
-        void dispose();
-        void hide();
-        void updateSurfaceData();
-        void paint();
-        void commitSurfaceData();
-        void notifyConfigured(boolean active, boolean maximized, boolean fullscreen);
-    }
-
     private static class ShadowImage {
         private static final Color activeColor = new Color(0, 0, 0, 0xA0);
         private static final Color inactiveColor = new Color(0, 0, 0, 0x40);
@@ -1948,7 +1914,7 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
         }
     }
 
-    private class ShadowImpl implements WLSurfaceSizeListener, Shadow {
+    private class Shadow implements WLSurfaceSizeListener {
         private WLSubSurface shadowSurface; // protected by AWT lock
         private SurfaceData shadowSurfaceData;  // protected by AWT lock
         private boolean needsRepaint = true;  // protected by AWT lock
@@ -1956,7 +1922,7 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
         private final WLSize shadowWlSize = new WLSize(); // protected by stateLock
         private boolean isActive;  // protected by AWT lock
 
-        public ShadowImpl(int shadowSize) {
+        public Shadow(int shadowSize) {
             this.shadowSize = shadowSize;
             shadowWlSize.deriveFromJavaSize(wlSize.getJavaWidth() + shadowSize * 2, wlSize.getJavaHeight() + shadowSize * 2);
             shadowSurfaceData = ((WLGraphicsConfig) getGraphicsConfiguration()).createSurfaceData(this, shadowWlSize.getPixelWidth(), shadowWlSize.getPixelHeight());
@@ -2071,20 +2037,6 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
         }
     }
 
-    private static class NilShadow implements Shadow {
-        @Override public int getSize() { return 0; }
-        @Override public void updateSurfaceSize() { }
-        @Override public void resizeToParentWindow() { }
-        @Override public void createSurface() { }
-        @Override public void commitSurface() { }
-        @Override public void dispose() { }
-        @Override public void hide() { }
-        @Override public void updateSurfaceData() { }
-        @Override public void paint() { }
-        @Override public void commitSurfaceData() { }
-        @Override public void notifyConfigured(boolean active, boolean maximized, boolean fullscreen) { }
-    }
-
     private class WLSize {
         /**
          * Represents the full size of the component in "client" units as returned by Component.getSize().

src/java.desktop/unix/classes/sun/awt/wl/WLDataDevice.java

@@ -88,7 +88,7 @@ public class WLDataDevice {
     private static native void dispatchDataSourceQueueImpl(long nativePtr);
     private static native void setSelectionImpl(int protocol, long nativePtr, long dataOfferNativePtr, long serial);
     private static native void startDragImpl(long nativePtr, long dataOfferNativePtr,
-                                             long originSurfaceNativePtr, long serial);
+                                             long originSurfaceNativePtr, long iconNativePtr, long serial);
 
     public boolean isProtocolSupported(int protocol) {
         return isProtocolSupportedImpl(nativePtr, protocol);
@@ -98,8 +98,8 @@ public class WLDataDevice {
         setSelectionImpl(protocol, nativePtr, (source == null) ? 0 : source.getNativePtr(), serial);
     }
 
-    public void startDrag(WLDataSource source, long originSurfaceNativePtr, long serial) {
-        startDragImpl(nativePtr, source.getNativePtr(), originSurfaceNativePtr, serial);
+    public void startDrag(WLDataSource source, long originSurfaceNativePtr, long iconNativePtr, long serial) {
+        startDragImpl(nativePtr, source.getNativePtr(), originSurfaceNativePtr, iconNativePtr, serial);
     }
 
     public WLClipboard getSystemClipboard() {

src/java.desktop/unix/classes/sun/awt/wl/WLDataSource.java

@@ -25,11 +25,7 @@
 
 package sun.awt.wl;
 
-import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.datatransfer.Transferable;
-import java.awt.image.BufferedImage;
-import java.util.HashSet;
 
 public class WLDataSource {
     // nativePtr will be reset to 0 after this object receives a "cancelled" event, and is destroyed.
@@ -47,8 +43,6 @@ public class WLDataSource {
 
     private static native void setDnDActionsImpl(long nativePtr, int actions);
 
-    private static native void setDnDIconImpl(long nativePtr, int scale, int width, int height, int offsetX, int offsetY, int[] pixels);
-
     WLDataSource(WLDataDevice dataDevice, int protocol, Transferable data) {
         var wlDataTransferer = (WLDataTransferer) WLDataTransferer.getInstance();
 
@@ -58,20 +52,9 @@ public class WLDataSource {
 
         try {
             if (data != null) {
-                var mimes = new HashSet<String>();
-
                 long[] formats = wlDataTransferer.getFormatsForTransferableAsArray(data, wlDataTransferer.getFlavorTable());
                 for (long format : formats) {
                     String mime = wlDataTransferer.getNativeForFormat(format);
-                    mimes.add(mime);
-
-                    if (mime.contains("/") && !mime.startsWith("JAVA_DATAFLAVOR")) {
-                        // Qt apps require lowercase spelling of mime types, like text/plain;charset=utf-8
-                        mimes.add(mime.toLowerCase());
-                    }
-                }
-
-                for (var mime : mimes) {
                     offerMimeImpl(nativePtr, mime);
                 }
             }
@@ -96,31 +79,6 @@ public class WLDataSource {
         setDnDActionsImpl(nativePtr, actions);
     }
 
-    public void setDnDIcon(Image image, int scale, int offsetX, int offsetY) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Native pointer is null");
-        }
-
-        int width = image.getWidth(null);
-        int height = image.getHeight(null);
-        int[] pixels = new int[width * height];
-
-        if (image instanceof BufferedImage) {
-            // NOTE: no need to ensure that the BufferedImage is TYPE_INT_ARGB,
-            // getRGB() does pixel format conversion automatically
-            ((BufferedImage) image).getRGB(0, 0, width, height, pixels, 0, width);
-        } else {
-            BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D g = bufferedImage.createGraphics();
-            g.drawImage(image, 0, 0, null);
-            g.dispose();
-
-            bufferedImage.getRGB(0, 0, width, height, pixels, 0, width);
-        }
-
-        setDnDIconImpl(nativePtr, scale, width, height, offsetX, offsetY, pixels);
-    }
-
     public synchronized void destroy() {
         if (nativePtr != 0) {
             destroyImpl(nativePtr);

src/java.desktop/unix/classes/sun/awt/wl/WLDecoratedPeer.java

@@ -63,7 +63,7 @@ public abstract class WLDecoratedPeer extends WLWindowPeer {
                 d = new DefaultFrameDecoration(this, showMinimize, showMaximize);
             }
         } else {
-            if (!WLToolkit.isKDE() && isGTKAvailable()) {
+            if (isGTKAvailable()) {
                 d = new GtkFrameDecoration(this, showMinimize, showMaximize);
             } else {
                 d = new DefaultFrameDecoration(this, showMinimize, showMaximize);
@@ -134,11 +134,10 @@ public abstract class WLDecoratedPeer extends WLWindowPeer {
     @Override
     public Dimension getMinimumSize() {
         final Dimension parentMinimumSize = super.getMinimumSize();
-        var d = getDecoration();
-        final Dimension decorMinimumSize = d != null ? d.getMinimumSize() : new Dimension(0, 0);
+        final Dimension decorMinimumSize = getDecoration().getMinimumSize();
         final Dimension frameMinimumSize
                 = (decorMinimumSize.getWidth() == 0 && decorMinimumSize.getHeight() == 0)
-                ? new Dimension(MINIMUM_WIDTH, MINIMUM_HEIGHT)
+                ? new Dimension(1, 1)
                 : decorMinimumSize;
         return new Rectangle(parentMinimumSize)
                 .union(new Rectangle(frameMinimumSize))

src/java.desktop/unix/classes/sun/awt/wl/WLDialogPeer.java

@@ -38,7 +38,7 @@ public class WLDialogPeer extends WLDecoratedPeer implements DialogPeer {
     public void setVisible(boolean vis) {
         super.setVisible(vis);
     }
-
+    
     @Override
     public void blockWindows(List<Window> windows) {
 

src/java.desktop/unix/classes/sun/awt/wl/WLDragSourceContextPeer.java

@@ -92,33 +92,21 @@ public class WLDragSourceContextPeer extends SunDragSourceContextPeer {
         this.dataDevice = dataDevice;
     }
 
-    private WLComponentPeer getPeer() {
+    private long getComponentWlSurfacePtr() {
         var comp = getComponent();
         while (comp != null) {
             var peer = AWTAccessor.getComponentAccessor().getPeer(comp);
             if (peer instanceof WLComponentPeer wlPeer) {
-                return wlPeer;
+                return wlPeer.getSurface().getWlSurfacePtr();
             }
             comp = comp.getParent();
         }
-        return null;
-    }
 
-    private WLMainSurface getSurface() {
-        WLComponentPeer peer = getPeer();
-        if (peer != null) {
-            return peer.getSurface();
-        }
-        return null;
+        return 0;
     }
 
     @Override
     protected void startDrag(Transferable trans, long[] formats, Map<Long, DataFlavor> formatMap) {
-        var mainSurface = getSurface();
-        if (mainSurface == null) {
-            return;
-        }
-
         // formats and formatMap are unused, because WLDataSource already references the same DataTransferer singleton
         var source = new WLDragSource(trans);
 
@@ -127,17 +115,10 @@ public class WLDragSourceContextPeer extends SunDragSourceContextPeer {
 
         source.setDnDActions(waylandActions);
 
-        var dragImage = getDragImage();
-        if (dragImage != null) {
-            var dragImageOffset = getDragImageOffset();
-            source.setDnDIcon(dragImage,
-                    mainSurface.getGraphicsDevice().getDisplayScale(),
-                    dragImageOffset.x, dragImageOffset.y);
-        }
-
         long eventSerial = WLToolkit.getInputState().pointerButtonSerial();
 
-        dataDevice.startDrag(source, mainSurface.getWlSurfacePtr(), eventSerial);
+        var wlSurface = getComponentWlSurfacePtr();
+        dataDevice.startDrag(source, wlSurface, 0, eventSerial);
     }
 
     @Override

src/java.desktop/unix/classes/sun/awt/wl/WLFramePeer.java

@@ -26,7 +26,6 @@
 package sun.awt.wl;
 
 import java.awt.*;
-import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.peer.FramePeer;
 import sun.awt.AWTAccessor;
@@ -43,12 +42,6 @@ public class WLFramePeer extends WLDecoratedPeer implements FramePeer {
         super(target, target.isUndecorated(),
                 Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.ICONIFIED),
                 Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH));
-        AWTAccessor.getWindowAccessor().addWindowListener(target, new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                getFrame().removeNotify();
-            }
-        });
     }
 
     @Override

src/java.desktop/unix/classes/sun/awt/wl/WLGraphicsConfig.java

@@ -38,9 +38,35 @@ import sun.java2d.wl.WLSurfaceSizeListener;
 
 public abstract class WLGraphicsConfig extends GraphicsConfiguration {
     private final WLGraphicsDevice device;
+    private final int x;
+    private final int y;
+    private final int xLogical; // logical (scaled) horizontal location; optional, could be zero
+    private final int yLogical; // logical (scaled) vertical location; optional, could be zero
+    private final int width;
+    private final int height;
+    private final int widthLogical; // logical (scaled) width; optional, could be zero
+    private final int heightLogical;// logical (scaled) height; optional, could be zero
+    private final int displayScale; // as reported by Wayland
+    private final double effectiveScale; // as enforced by Java
 
-    protected WLGraphicsConfig(WLGraphicsDevice device) {
+    protected WLGraphicsConfig(WLGraphicsDevice device, int x, int y, int xLogical, int yLogical,
+                               int width, int height, int widthLogical, int heightLogical,
+                               int displayScale) {
         this.device = device;
+        this.x = x;
+        this.y = y;
+        this.xLogical = xLogical;
+        this.yLogical = yLogical;
+        this.width = width;
+        this.height = height;
+        this.widthLogical = widthLogical;
+        this.heightLogical = heightLogical;
+        this.displayScale = displayScale;
+        this.effectiveScale = WLGraphicsEnvironment.effectiveScaleFrom(displayScale);
+    }
+
+    boolean differsFrom(int width, int height, int scale) {
+        return width != this.width || height != this.height || scale != this.displayScale;
     }
 
     @Override
@@ -58,7 +84,7 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
 
     @Override
     public AffineTransform getDefaultTransform() {
-        double scale = device.getEffectiveScale();
+        double scale = effectiveScale;
         return AffineTransform.getScaleInstance(scale, scale);
     }
 
@@ -71,18 +97,20 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
 
     @Override
     public Rectangle getBounds() {
-        return device.getBounds();
+        return (widthLogical > 0 && heightLogical > 0)
+                ? new Rectangle(xLogical, yLogical, widthLogical, heightLogical)
+                : new Rectangle(x, y, width, height);
     }
 
     public Rectangle getRealBounds() {
-        return device.getRealBounds();
+        return new Rectangle(x, y, width, height);
     }
 
     /**
      * Returns the preferred Wayland buffer scale for this display configuration.
      */
     public int getDisplayScale() {
-        return device.getDisplayScale();
+        return displayScale;
     }
 
     /**
@@ -90,7 +118,7 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
      * if overridden with the sun.java2d.uiScale system property.
      */
     public double getEffectiveScale() {
-       return device.getEffectiveScale();
+       return effectiveScale;
     }
 
     public abstract SurfaceType getSurfaceType();
@@ -99,7 +127,6 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
 
     @Override
     public String toString() {
-        Rectangle bounds = getBounds();
-        return String.format("%dx%d@(%d, %d) %dx scale", bounds.width, bounds.height, bounds.x, bounds.y, getDisplayScale());
+        return String.format("%dx%d@(%d, %d) %dx scale", width, height, x, y, displayScale);
     }
 }

src/java.desktop/unix/classes/sun/awt/wl/WLGraphicsDevice.java

@@ -39,21 +39,15 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * Corresponds to a Wayland output and is identified by its wlID.
- * Owns all graphics configurations associated with this device.
- * Encapsulates all the other properties of the output, such as its size
- * and location in a multi-monitor configuration.
- * Whenever any of these properties change, they are updated and
- * the GraphicsConfiguration objects get re-created to let referents know of the change.
+ * Corresponds to Wayland's output and is identified by its wlID and x, y coordinates
+ * in the multi-monitor setup. Whenever those change, this device is re-created.
  */
 public class WLGraphicsDevice extends GraphicsDevice {
     private static final double MM_IN_INCH = 25.4;
-
     /**
      *  ID of the corresponding wl_output object received from Wayland.
-     *  Only changes when the device gets invalidated.
      */
-    private volatile int wlID;
+    private volatile int wlID; // only changes when the device gets invalidated
 
     /**
      * Some human-readable name of the device that came from Wayland.
@@ -64,142 +58,75 @@ public class WLGraphicsDevice extends GraphicsDevice {
     /**
      * The horizontal location of this device in the multi-monitor configuration.
      */
-    private volatile int x;
+    private volatile int x; // only changes when the device gets invalidated
 
     /**
      * The vertical location of this device in the multi-monitor configuration.
      */
-    private volatile int y;
+    private volatile int y; // only changes when the device gets invalidated
 
-    /**
-     * Pixel width, mostly for accounting and reporting.
-     */
-    private volatile int width;
+    private volatile int xLogical; // logical (scaled) horizontal location; optional, could be zero
+    private volatile int yLogical; // logical (scaled) vertical location; optional, could be zero
 
-    /**
-     * Pixel height, mostly for accounting and reporting.
-     */
-    private volatile int height;
+    private final int widthMm;
+    private final int heightMm;
 
-    /**
-     * Logical (scaled) width in Java units.
-     */
-    private volatile int widthLogical;
+    // Configs are always the same in size and scale
+    private volatile GraphicsConfiguration[] configs = null;
 
-    /**
-     * Logical (scaled) height in Java units.
-     */
-    private volatile int heightLogical;
+    // The default config is an object from the configs array
+    private volatile WLGraphicsConfig defaultConfig = null;
 
-    /**
-     * Width in millimeters.
-     */
-    private volatile int widthMm;
-
-    /**
-     * Height in millimeters.
-     */
-    private volatile int heightMm;
-
-    /**
-     * The device's scale factor as reported by Wayland.
-     * Since it is an integer, it's usually higher than the real fraction scale.
-     */
-    private volatile int displayScale;
-
-    /**
-     * The effective scale factor as determined by Java.
-     */
-    private volatile double effectiveScale;
-
-    private volatile GraphicsConfiguration[] configs;
-    private volatile WLGraphicsConfig defaultConfig; // A reference to the configs array
-
-    /**
-     * Top-level window peers that consider this device as their primary one
-     * and get their graphics configuration from it
-     */
+    // Top-level window peers that consider this device as their primary one
+    // and get their graphics configuration from it
     private final Set<WLComponentPeer> toplevels = new HashSet<>(); // guarded by 'this'
 
-    private WLGraphicsDevice(int id,
-                             String name,
-                             int x, int y,
-                             int width, int height,
-                             int widthLogical, int heightLogical,
-                             int widthMm, int heightMm,
-                             int displayScale) {
-        assert width > 0 && height > 0;
-        assert widthLogical > 0 && heightLogical > 0;
-        assert widthMm > 0 && heightMm > 0;
-        assert displayScale > 0;
-
+    private WLGraphicsDevice(int id, int x, int y, int xLogical, int yLogical, int widthMm, int heightMm) {
         this.wlID = id;
-        this.name = name;
         this.x = x;
         this.y = y;
-        this.width = width;
-        this.height = height;
-        this.widthLogical = widthLogical;
-        this.heightLogical = heightLogical;
+        this.xLogical = xLogical;
+        this.yLogical = yLogical;
         this.widthMm = widthMm;
         this.heightMm = heightMm;
-        this.displayScale = displayScale;
-        this.effectiveScale = WLGraphicsEnvironment.effectiveScaleFrom(displayScale);
-
-        makeGC();
     }
 
-    private void makeGC() {
-        GraphicsConfiguration[] newConfigs;
-        WLGraphicsConfig newDefaultConfig;
-        if (VKEnv.isPresentationEnabled()) {
-            newConfigs = VKEnv.getDevices().flatMap(d -> d.getPresentableGraphicsConfigs().map(
-                            gc -> WLVKGraphicsConfig.getConfig(gc, this)))
-                    .toArray(WLGraphicsConfig[]::new);
-            newDefaultConfig = (WLGraphicsConfig) newConfigs[0];
-        } else {
-            // TODO: Actually, Wayland may support a lot more shared memory buffer configurations, need to
-            //   subscribe to the wl_shm:format event and get the list from there.
-            newDefaultConfig = WLSMGraphicsConfig.getConfig(this, true);
-            newConfigs = new GraphicsConfiguration[2];
-            newConfigs[0] = newDefaultConfig;
-            newConfigs[1] = WLSMGraphicsConfig.getConfig(this, false);
+    int getID() {
+        return wlID;
+    }
+
+    void updateConfiguration(String name, int width, int height, int widthLogical, int heightLogical, int scale) {
+        this.name = name;
+
+        WLGraphicsConfig config = defaultConfig;
+        // Note that all configs are of equal size and scale
+        if (config == null || config.differsFrom(width, height, scale)) {
+            GraphicsConfiguration[] newConfigs;
+            WLGraphicsConfig newDefaultConfig;
+            // It is necessary to create a new object whenever config changes as its
+            // identity is used to detect changes in scale, among other things.
+            if (VKEnv.isPresentationEnabled()) {
+                newConfigs = VKEnv.getDevices().flatMap(d -> d.getPresentableGraphicsConfigs().map(
+                        gc -> WLVKGraphicsConfig.getConfig(
+                                gc, this, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale)))
+                        .toArray(WLGraphicsConfig[]::new);
+                newDefaultConfig = (WLGraphicsConfig) newConfigs[0];
+            } else {
+                // TODO: Actually, Wayland may support a lot more shared memory buffer configurations, need to
+                //   subscribe to the wl_shm:format event and get the list from there.
+                newDefaultConfig = WLSMGraphicsConfig.getConfig(this, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale, true);
+                newConfigs = new GraphicsConfiguration[2];
+                newConfigs[0] = newDefaultConfig;
+                newConfigs[1] = WLSMGraphicsConfig.getConfig(this, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale, false);
+            }
+
+            configs = newConfigs;
+            defaultConfig = newDefaultConfig;
         }
 
-        configs = newConfigs;
-        defaultConfig = newDefaultConfig;
-    }
-
-    void updateConfiguration(String name,
-                             int x, int y,
-                             int width, int height,
-                             int widthLogical, int heightLogical,
-                             int widthMm, int heightMm,
-                             int scale) {
-        assert width > 0 && height > 0;
-        assert widthLogical > 0 && heightLogical > 0;
-        assert widthMm > 0 && heightMm > 0;
-        assert scale > 0;
-
-        this.name = name;
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-        this.widthLogical = widthLogical;
-        this.heightLogical = heightLogical;
-        this.widthMm = widthMm;
-        this.heightMm = heightMm;
-        this.displayScale = scale;
-        this.effectiveScale =  WLGraphicsEnvironment.effectiveScaleFrom(scale);
-
-        // It is necessary to create new config objects whenever this device changes
-        // as GraphicsConfiguration identity is used to detect changes in scale, among other things.
-        makeGC();
-
         // It is important that by the time displayChanged() events are delivered,
         // all the peers on this device had their graphics configuration updated
-        // to refer to the new ones with, perhaps, a different scale or resolution.
+        // to refer to the new ones with, perhaps, different scale or resolution.
         // This affects various BufferStrategy that use volatile images as their buffers.
         notifyToplevels();
     }
@@ -209,36 +136,47 @@ public class WLGraphicsDevice extends GraphicsDevice {
         synchronized (this) {
             toplevelsCopy.addAll(toplevels);
         }
-        toplevelsCopy.forEach(WLComponentPeer::checkIfOnNewScreen);
+        int wlOutputID = this.wlID;
+        // NB: each of those peers will likely receive another such notification
+        // from Wayland when it gets the wl_surface::enter event, but the second one
+        // will effectively be a no-op.
+        toplevelsCopy.forEach((peer) -> peer.notifyEnteredOutput(wlOutputID));
     }
 
     /**
-     * Changes all aspects of this device, including its identity to be that of the given
+     * Changes all aspects of this device including its identity to be that of the given
      * device. Only used for devices that are no longer physically present, but references
      * to which may still exist in the program.
      */
     void invalidate(WLGraphicsDevice similarDevice) {
-        // Note: It is expected that all the surface this device used to host have already received
-        // the 'leave' event and updated their device/graphics configurations accordingly.
         this.wlID = similarDevice.wlID;
-        updateConfiguration(similarDevice.name,
-                similarDevice.x,
-                similarDevice.y,
-                similarDevice.width,
-                similarDevice.height,
-                similarDevice.widthLogical,
-                similarDevice.heightLogical,
-                similarDevice.widthMm,
-                similarDevice.heightMm,
-                similarDevice.displayScale);
+        this.x = similarDevice.x;
+        this.y = similarDevice.y;
+        this.xLogical = similarDevice.xLogical;
+        this.yLogical = similarDevice.yLogical;
+
+        int newScale = similarDevice.getDisplayScale();
+        Rectangle newBounds = similarDevice.defaultConfig.getBounds();
+        Rectangle newRealBounds = similarDevice.defaultConfig.getRealBounds();
+        updateConfiguration(similarDevice.name, newRealBounds.width, newRealBounds.height, newBounds.width, newBounds.height, newScale);
     }
 
     public static WLGraphicsDevice createWithConfiguration(int id, String name,
-                                                           int x, int y,
+                                                           int x, int y, int xLogical, int yLogical,
                                                            int width, int height, int widthLogical, int heightLogical,
                                                            int widthMm, int heightMm,
                                                            int scale) {
-        return new WLGraphicsDevice(id, name, x, y, width, height, widthLogical, heightLogical, widthMm, heightMm, scale);
+        WLGraphicsDevice device = new WLGraphicsDevice(id, x, y, xLogical, yLogical, widthMm, heightMm);
+        device.updateConfiguration(name, width, height, widthLogical, heightLogical, scale);
+        return device;
+    }
+
+    /**
+     * Compares the identity of this device with the given attributes
+     * and returns true iff the attributes identify the same device.
+     */
+    boolean isSameDeviceAs(int wlID, int x, int y, int xLogical, int yLogical) {
+        return this.wlID == wlID && this.x == x && this.y == y && this.xLogical == xLogical && this.yLogical == yLogical;
     }
 
     boolean hasSameNameAs(WLGraphicsDevice otherDevice) {
@@ -269,8 +207,8 @@ public class WLGraphicsDevice extends GraphicsDevice {
     public GraphicsConfiguration[] getConfigurations() {
         // From wayland.xml, wl_output.mode event:
         // "Non-current modes are deprecated. A compositor can decide to only
-        // advertise the current mode and never send other modes. Clients
-        // should not rely on non-current modes."
+        //	advertise the current mode and never send other modes. Clients
+        //	should not rely on non-current modes."
         // So there's always the same set of configs.
         return configs.clone();
     }
@@ -280,24 +218,8 @@ public class WLGraphicsDevice extends GraphicsDevice {
         return defaultConfig;
     }
 
-    int getID() {
-        return wlID;
-    }
-
-    Rectangle getBounds() {
-        return new Rectangle(x, y, widthLogical, heightLogical);
-    }
-
-    Rectangle getRealBounds() {
-        return new Rectangle(x, y, width, height);
-    }
-
     int getDisplayScale() {
-        return displayScale;
-    }
-
-    double getEffectiveScale() {
-        return effectiveScale;
+        return defaultConfig.getDisplayScale();
     }
 
     int getResolution() {
@@ -305,6 +227,13 @@ public class WLGraphicsDevice extends GraphicsDevice {
         return getResolutionX(defaultConfig);
     }
 
+    double getPhysicalResolution() {
+        Rectangle bounds = defaultConfig.getRealBounds();
+        double daigInPixels = Math.sqrt(bounds.width * bounds.width + bounds.height * bounds.height);
+        double diagInMm = Math.sqrt(widthMm * widthMm + heightMm * heightMm);
+        return daigInPixels * MM_IN_INCH / diagInMm;
+    }
+
     double getPhysicalScale() {
         Rectangle bounds = defaultConfig.getRealBounds();
         double daigInPixels = Math.sqrt(bounds.width * bounds.width + bounds.height * bounds.height);
@@ -338,7 +267,7 @@ public class WLGraphicsDevice extends GraphicsDevice {
 
         boolean fsSupported = isFullScreenSupported();
         if (fsSupported && old != null) {
-            // enter windowed mode and restore the original display mode
+            // enter windowed mode and restore original display mode
             exitFullScreenExclusive(old);
         }
 
@@ -382,8 +311,9 @@ public class WLGraphicsDevice extends GraphicsDevice {
     @Override
     public String toString() {
         var config = defaultConfig;
-        return String.format("WLGraphicsDevice: '%s' id=%d at (%d, %d) with %s",
-                name, wlID, x, y, config != null ? config : "<no configs>");
+        return String.format("WLGraphicsDevice: '%s' id=%d at (%d, %d) ((%d, %d) logical) with %s",
+                name, wlID, x, y, xLogical, yLogical,
+                config != null ? config : "<no configs>");
     }
 
     public Insets getInsets() {

src/java.desktop/unix/classes/sun/awt/wl/WLGraphicsEnvironment.java

@@ -26,7 +26,6 @@
 
 package sun.awt.wl;
 
-import java.awt.AWTError;
 import java.awt.Dimension;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
@@ -55,8 +54,6 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
     private static final boolean debugScaleEnabled;
     private final Dimension totalDisplayBounds = new Dimension();
 
-    private final List<WLGraphicsDevice> devices = new ArrayList<>(5);
-
     @SuppressWarnings("restricted")
     private static void loadAwt() {
         System.loadLibrary("awt");
@@ -97,30 +94,15 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
         }
     }
 
-    @Override
-    public GraphicsDevice getDefaultScreenDevice() {
-        synchronized (devices) {
-            if (devices.isEmpty()) {
-                throw new AWTError("no screen devices");
-            }
-            return devices.getFirst();
-        }
-    }
-
-    @Override
-    public synchronized GraphicsDevice[] getScreenDevices() {
-        synchronized (devices) {
-            return devices.toArray(new GraphicsDevice[0]);
-        }
-    }
-
     @Override
     public boolean isDisplayLocal() {
         return true;
     }
 
+    private final List<WLGraphicsDevice> devices = new ArrayList<>(5);
+
     private void notifyOutputConfigured(String name, String make, String model, int wlID,
-                                        int x, int y,
+                                        int x, int y, int xLogical, int yLogical,
                                         int width, int height,
                                         int widthLogical, int heightLogical,
                                         int widthMm, int heightMm,
@@ -128,33 +110,44 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
         // Called from native code whenever a new output appears or an existing one changes its properties
         // NB: initially called during WLToolkit.initIDs() on the main thread; later on EDT.
         if (log.isLoggable(Level.FINE)) {
-            log.fine(String.format("Output configured id=%d at (%d, %d) %dx%d (%dx%d logical) %dx scale",
-                    wlID, x, y, width, height, widthLogical, heightLogical, scale));
+            log.fine(String.format("Output configured id=%d at (%d, %d) (%d, %d logical) %dx%d (%dx%d logical) %dx scale",
+                    wlID, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale));
         }
 
-        // Logical size comes from an optional protocol, so take the data from the main one, if absent
-        if (widthLogical == 0) widthLogical = width;
-        if (heightLogical == 0) heightLogical = height;
-        String humanID = deviceNameFrom(name, make, model);
-
-        WLGraphicsDevice gd = deviceWithID(wlID);
-        if (gd != null) {
-            // Some properties of an existing device have changed; update the existing device and
-            // let all the windows it hosts know about the change.
-            gd.updateConfiguration(humanID, x, y, width, height, widthLogical, heightLogical, widthMm, heightMm, scale);
-        } else {
-            WLGraphicsDevice newGD = WLGraphicsDevice.createWithConfiguration(wlID, humanID,
-                    x, y, width, height, widthLogical, heightLogical,
-                    widthMm, heightMm, scale);
-            synchronized (devices) {
-                devices.add(newGD);
+        String humanID =
+                (name != null ? name + " " : "")
+                + (make != null ? make + " " : "")
+                + (model != null ? model : "");
+        synchronized (devices) {
+            boolean newOutput = true;
+            for (int i = 0; i < devices.size(); i++) {
+                final WLGraphicsDevice gd = devices.get(i);
+                if (gd.getID() == wlID) {
+                    newOutput = false;
+                    if (gd.isSameDeviceAs(wlID, x, y, xLogical, yLogical)) {
+                        // These coordinates and the size are not scaled.
+                        gd.updateConfiguration(humanID, width, height, widthLogical, heightLogical, scale);
+                    } else {
+                        final WLGraphicsDevice updatedDevice = WLGraphicsDevice.createWithConfiguration(wlID, humanID,
+                                x, y, xLogical, yLogical, width, height, widthLogical, heightLogical,
+                                widthMm, heightMm, scale);
+                        devices.set(i, updatedDevice);
+                        gd.invalidate(updatedDevice);
+                    }
+                    break;
+                }
+            }
+            if (newOutput) {
+                final WLGraphicsDevice gd = WLGraphicsDevice.createWithConfiguration(wlID, humanID,
+                        x, y, xLogical, yLogical, width, height, widthLogical, heightLogical,
+                        widthMm, heightMm, scale);
+                devices.add(gd);
+            }
+            if (LogDisplay.ENABLED) {
+                double effectiveScale = effectiveScaleFrom(scale);
+                LogDisplay log = newOutput ? LogDisplay.ADDED : LogDisplay.CHANGED;
+                log.log(wlID, (int) (width / effectiveScale) + "x" +  (int) (height / effectiveScale), effectiveScale);
             }
-        }
-
-        if (LogDisplay.ENABLED) {
-            double effectiveScale = effectiveScaleFrom(scale);
-            LogDisplay log = (gd == null) ? LogDisplay.ADDED : LogDisplay.CHANGED;
-            log.log(wlID, (int) (width / effectiveScale) + "x" + (int) (height / effectiveScale), effectiveScale);
         }
 
         updateTotalDisplayBounds();
@@ -165,12 +158,6 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
         }
     }
 
-    private static String deviceNameFrom(String name, String make, String model) {
-        return (name != null ? name + " " : "")
-                + (make != null ? make + " " : "")
-                + (model != null ? model : "");
-    }
-
     private WLGraphicsDevice getSimilarDevice(WLGraphicsDevice modelDevice) {
         WLGraphicsDevice similarDevice = devices.isEmpty() ? null : devices.getFirst();
         for (WLGraphicsDevice device : devices) {
@@ -194,33 +181,47 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
             log.fine(String.format("Output destroyed id=%d", wlID));
         }
         // NB: id may *not* be that of any output; if so, just ignore this event.
-        WLGraphicsDevice gd = deviceWithID(wlID);
-        if (gd != null) {
-            if (LogDisplay.ENABLED) {
-                WLGraphicsConfig config = (WLGraphicsConfig) gd.getDefaultConfiguration();
-                Rectangle bounds = config.getBounds();
-                LogDisplay.REMOVED.log(wlID, bounds.width + "x" + bounds.height, config.getEffectiveScale());
+        synchronized (devices) {
+            final Optional<WLGraphicsDevice> deviceOptional = devices.stream()
+                    .filter(device -> device.getID() == wlID)
+                    .findFirst();
+            if (deviceOptional.isPresent()) {
+                final WLGraphicsDevice destroyedDevice = deviceOptional.get();
+                if (LogDisplay.ENABLED) {
+                    WLGraphicsConfig config = (WLGraphicsConfig) destroyedDevice.getDefaultConfiguration();
+                    Rectangle bounds = config.getBounds();
+                    LogDisplay.REMOVED.log(wlID, bounds.width + "x" +  bounds.height, config.getEffectiveScale());
+                }
+                devices.remove(destroyedDevice);
+                final WLGraphicsDevice similarDevice = getSimilarDevice(destroyedDevice);
+                if (similarDevice != null) destroyedDevice.invalidate(similarDevice);
             }
-            synchronized (devices) {
-                devices.remove(gd);
-            }
-            final WLGraphicsDevice similarDevice = getSimilarDevice(gd);
-            if (similarDevice != null) gd.invalidate(similarDevice);
         }
 
         updateTotalDisplayBounds();
         displayChanged();
     }
 
-    WLGraphicsDevice deviceWithID(int wlOutputID) {
+    WLGraphicsDevice notifySurfaceEnteredOutput(WLComponentPeer wlComponentPeer, int wlOutputID) {
         synchronized (devices) {
             for (WLGraphicsDevice gd : devices) {
                 if (gd.getID() == wlOutputID) {
                     return gd;
                 }
             }
+            return null;
+        }
+    }
+
+    WLGraphicsDevice notifySurfaceLeftOutput(WLComponentPeer wlComponentPeer, int wlOutputID) {
+        synchronized (devices) {
+            for (WLGraphicsDevice gd : devices) {
+                if (gd.getID() == wlOutputID) {
+                    return gd;
+                }
+            }
+            return null;
         }
-        return null;
     }
 
     public Dimension getTotalDisplayBounds() {
@@ -230,14 +231,16 @@ public class WLGraphicsEnvironment extends SunGraphicsEnvironment implements HiD
     }
 
     private void updateTotalDisplayBounds() {
-        Rectangle virtualBounds = new Rectangle();
         synchronized (devices) {
-            for (var gd : devices) {
-                virtualBounds = virtualBounds.union(gd.getBounds());
+            Rectangle virtualBounds = new Rectangle();
+            for (GraphicsDevice gd : devices) {
+                for (GraphicsConfiguration gc : gd.getConfigurations()) {
+                    virtualBounds = virtualBounds.union(gc.getBounds());
+                }
+            }
+            synchronized (totalDisplayBounds) {
+                totalDisplayBounds.setSize(virtualBounds.getSize());
             }
-        }
-        synchronized (totalDisplayBounds) {
-            totalDisplayBounds.setSize(virtualBounds.getSize());
         }
     }
 

src/java.desktop/unix/classes/sun/awt/wl/WLMainSurface.java

@@ -67,7 +67,7 @@ public class WLMainSurface extends WLSurface {
         // Called from native code whenever the corresponding wl_surface enters an output (monitor)
         synchronized (devices) {
             final WLGraphicsEnvironment ge = (WLGraphicsEnvironment)WLGraphicsEnvironment.getLocalGraphicsEnvironment();
-            final WLGraphicsDevice gd = ge.deviceWithID(wlOutputID);
+            final WLGraphicsDevice gd = ge.notifySurfaceEnteredOutput(peer, wlOutputID);
             if (gd != null) {
                 devices.add(gd);
             }
@@ -81,7 +81,7 @@ public class WLMainSurface extends WLSurface {
         // Called from native code whenever the corresponding wl_surface leaves an output (monitor)
         synchronized (devices) {
             final WLGraphicsEnvironment ge = (WLGraphicsEnvironment)WLGraphicsEnvironment.getLocalGraphicsEnvironment();
-            final WLGraphicsDevice gd = ge.deviceWithID(wlOutputID);
+            final WLGraphicsDevice gd = ge.notifySurfaceLeftOutput(peer, wlOutputID);
             if (gd != null) {
                 devices.remove(gd);
             }

src/java.desktop/unix/classes/sun/awt/wl/WLMouseInfoPeer.java

@@ -24,16 +24,11 @@
  */
 package sun.awt.wl;
 
-import sun.awt.SunToolkit;
-
 import java.awt.Point;
 import java.awt.Window;
 import java.awt.peer.MouseInfoPeer;
 
-public class WLMouseInfoPeer implements MouseInfoPeer, SunToolkit.RelativePointerMovementInfoProvider {
-    private final Object mouseDeltaLock = new Object();
-    private double mouseDeltaX = 0.0;
-    private double mouseDeltaY = 0.0;
+public class WLMouseInfoPeer implements MouseInfoPeer  {
 
     @Override
     public int fillPointWithCoords(Point point) {
@@ -60,23 +55,4 @@ public class WLMouseInfoPeer implements MouseInfoPeer, SunToolkit.RelativePointe
         return HOLDER.instance;
     }
 
-    void accumulatePointerDelta(double dx, double dy) {
-        synchronized (mouseDeltaLock) {
-            mouseDeltaX += dx;
-            mouseDeltaY += dy;
-        }
-    }
-
-    @Override
-    public Point getAccumulatedMouseDeltaAndReset() {
-        var p = new Point();
-        synchronized (mouseDeltaLock) {
-            int idx = (int) mouseDeltaX;
-            int idy = (int) mouseDeltaY;
-            p.setLocation(idx, idy);
-            mouseDeltaX = mouseDeltaX - idx;
-            mouseDeltaY = mouseDeltaY - idy;
-        }
-        return p;
-    }
 }

src/java.desktop/unix/classes/sun/awt/wl/WLRoundedCornersManager.java

@@ -52,8 +52,7 @@ public class WLRoundedCornersManager implements RoundedCornersManager {
 
     public static int roundCornerRadiusFor(RoundedCornerKind kind) {
         return switch (kind) {
-            case DEFAULT -> 12;
-            case FULL -> 24;
+            case DEFAULT, FULL -> 24;
             case NONE -> 0;
             case SMALL -> 8;
         };

src/java.desktop/unix/classes/sun/awt/wl/WLSMGraphicsConfig.java

@@ -58,16 +58,36 @@ public class WLSMGraphicsConfig extends WLGraphicsConfig
     private final ColorModel colorModel;
     private final SurfaceType surfaceType;
 
-    private WLSMGraphicsConfig(WLGraphicsDevice device, boolean translucencyCapable) {
-        super(device);
+    private WLSMGraphicsConfig(WLGraphicsDevice device,
+                               int x,
+                               int y,
+                               int xLogical,
+                               int yLogical,
+                               int width,
+                               int height,
+                               int widthLogical,
+                               int heightLogical,
+                               int scale,
+                               boolean translucencyCapable) {
+        super(device, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale);
         this.translucencyCapable = translucencyCapable;
         this.colorModel = colorModelFor(translucencyCapable ? Transparency.TRANSLUCENT : Transparency.OPAQUE);
         // Note: GNOME Shell definitely expects alpha values to be pre-multiplied
         this.surfaceType = translucencyCapable ? SurfaceType.IntArgbPre : SurfaceType.IntRgb;
     }
 
-    public static WLSMGraphicsConfig getConfig(WLGraphicsDevice device, boolean translucencyCapable) {
-        var newConfig = new WLSMGraphicsConfig(device, translucencyCapable);
+    public static WLSMGraphicsConfig getConfig(WLGraphicsDevice device,
+                                               int x,
+                                               int y,
+                                               int xLogical,
+                                               int yLogical,
+                                               int width,
+                                               int height,
+                                               int widthLogical,
+                                               int heightLogical,
+                                               int scale,
+                                               boolean translucencyCapable) {
+        var newConfig = new WLSMGraphicsConfig(device, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale, translucencyCapable);
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("New shared memory config " + newConfig);
         }

src/java.desktop/unix/classes/sun/awt/wl/WLToolkit.java

@@ -86,7 +86,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Semaphore;
 
@@ -139,8 +138,6 @@ public class WLToolkit extends UNIXToolkit implements Runnable {
 
     private static Boolean sunAwtDisableGtkFileDialogs = null;
 
-    private static final boolean isKDE;
-
     private static native void initIDs(long displayPtr);
 
     static {
@@ -150,8 +147,6 @@ public class WLToolkit extends UNIXToolkit implements Runnable {
             VKEnv.init(display);
             initIDs(display);
         }
-        String desktop = System.getenv("XDG_CURRENT_DESKTOP");
-        isKDE = desktop != null && desktop.toLowerCase().contains("kde");
         initialized = true;
     }
 
@@ -295,10 +290,6 @@ public class WLToolkit extends UNIXToolkit implements Runnable {
     private static WLInputState inputState = WLInputState.initialState();
     private static WLKeyboard keyboard;
 
-    private static void dispatchRelativePointerEvent(double dx, double dy) {
-        WLMouseInfoPeer.getInstance().accumulatePointerDelta(dx, dy);
-    }
-
     private static void dispatchPointerEvent(WLPointerEvent e) {
         // Invoked from the native code
         assert EventQueue.isDispatchThread();
@@ -954,28 +945,17 @@ public class WLToolkit extends UNIXToolkit implements Runnable {
 
     @Override
     public void grab(Window w) {
-        // There is no input grab in Wayland for client applications, only
-        // the compositor can control grabs. But we need UngrabEvent
-        // for popup/tooltip management, so we do input grab accounting here
-        // and in ungrab() below.
-        Objects.requireNonNull(w);
-
-        var peer = AWTAccessor.getComponentAccessor().getPeer(w);
-        if (peer instanceof WLWindowPeer windowPeer) {
-            windowPeer.grab();
+        if (log.isLoggable(PlatformLogger.Level.FINE)) {
+            log.fine("Not implemented: WLToolkit.grab()");
         }
     }
 
     @Override
     public void ungrab(Window w) {
-        Objects.requireNonNull(w);
-
-        var peer = AWTAccessor.getComponentAccessor().getPeer(w);
-        if (peer instanceof WLWindowPeer windowPeer) {
-            windowPeer.ungrab(false);
+        if (log.isLoggable(PlatformLogger.Level.FINE)) {
+            log.fine("Not implemented: WLToolkit.ungrab()");
         }
     }
-
     /**
      * Returns if the java.awt.Desktop class is supported on the current
      * desktop.
@@ -1096,7 +1076,4 @@ public class WLToolkit extends UNIXToolkit implements Runnable {
         return WLCursorManager.getInstance();
     }
 
-    public static boolean isKDE() {
-        return isKDE;
-    }
 }

src/java.desktop/unix/classes/sun/awt/wl/WLWindowPeer.java

@@ -25,15 +25,10 @@
 package sun.awt.wl;
 
 import sun.awt.AWTAccessor;
-import sun.awt.SurfacePixelGrabber;
-import sun.awt.UngrabEvent;
 import sun.java2d.SunGraphics2D;
-import sun.java2d.vulkan.VKSurfaceData;
-import sun.java2d.wl.WLSMSurfaceData;
 
 import javax.swing.JRootPane;
 import javax.swing.RootPaneContainer;
-import java.awt.AWTEvent;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
@@ -41,21 +36,18 @@ import java.awt.Dialog;
 import java.awt.Font;
 import java.awt.GraphicsConfiguration;
 import java.awt.Insets;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.SystemColor;
 import java.awt.Window;
 import java.awt.event.WindowEvent;
 import java.awt.geom.Path2D;
-import java.awt.image.BufferedImage;
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.WindowPeer;
 import java.lang.ref.WeakReference;
 
-public class WLWindowPeer extends WLComponentPeer implements WindowPeer, SurfacePixelGrabber {
+public class WLWindowPeer extends WLComponentPeer implements WindowPeer {
     private static Font defaultFont;
     private Dialog blocker;
-    private static WLWindowPeer grabbingWindow; // fake, kept for UngrabEvent only
 
     // If this window gets focus from Wayland, we need to transfer focus synthFocusOwner, if any
     private WeakReference<Component> synthFocusOwner = new WeakReference<>(null);
@@ -102,8 +94,6 @@ public class WLWindowPeer extends WLComponentPeer implements WindowPeer, Surface
 
     @Override
     protected void wlSetVisible(boolean v) {
-        if (!v) ungrab(true);
-
         if (v && targetIsWlPopup() && shouldBeFocusedOnShowing()) {
             requestWindowFocus();
         }
@@ -207,7 +197,6 @@ public class WLWindowPeer extends WLComponentPeer implements WindowPeer, Surface
 
     @Override
     public void dispose() {
-        ungrab(true);
         resetCornerMasks();
         super.dispose();
     }
@@ -247,91 +236,6 @@ public class WLWindowPeer extends WLComponentPeer implements WindowPeer, Surface
         synthFocusOwner = new WeakReference<>(c);
     }
 
-    public void grab() {
-        if (grabbingWindow != null && !isGrabbing()) {
-            grabbingWindow.ungrab(false);
-        }
-        grabbingWindow = this;
-    }
-
-    public void ungrab(boolean externalUngrab) {
-        if (isGrabbing()) {
-            grabbingWindow = null;
-            if (externalUngrab) {
-                WLToolkit.postEvent(new UngrabEvent(getTarget()));
-            }
-        }
-    }
-
-    private boolean isGrabbing() {
-        return this == grabbingWindow;
-    }
-
-    @Override
-    void handleJavaWindowFocusEvent(AWTEvent e) {
-        if (e.getID() == WindowEvent.WINDOW_LOST_FOCUS) {
-            ungrab(true);
-        }
-    }
-
-    @Override
-    public BufferedImage getClientAreaSnapshot(int x, int y, int width, int height) {
-        // Move the coordinate system to the client area
-        Insets insets = getInsets();
-        x += insets.left;
-        y += insets.top;
-
-        if (width <= 0 || height <= 0) {
-            return null;
-        }
-        if (x < 0 || y < 0) {
-            // Shouldn't happen, but better avoid accessing surface data outside the range
-            throw new IllegalArgumentException("Negative coordinates are not allowed");
-        }
-        if (x >= getWidth()) {
-            throw new IllegalArgumentException(String.format("x coordinate (%d) is out of bounds (%d)", x, getWidth()));
-        }
-        if (y >= getHeight()) {
-            throw new IllegalArgumentException(String.format("y coordinate (%d) is out of bounds (%d)", y, getHeight()));
-        }
-        if ((long) x + width > getWidth()) {
-            width = getWidth() - x;
-        }
-        if ((long) y + height > getHeight()) {
-            height = getHeight() - y;
-        }
-
-        // At this point the coordinates and size are in Java units;
-        // need to convert them into pixels.
-        Rectangle bounds = new Rectangle(
-                javaUnitsToBufferUnits(x),
-                javaUnitsToBufferUnits(y),
-                javaSizeToBufferSize(width),
-                javaSizeToBufferSize(height)
-        );
-        Rectangle bufferBounds = getBufferBounds();
-        if (bounds.x >= bufferBounds.width) {
-            bounds.x = bufferBounds.width - 1;
-        }
-        if (bounds.y >= bufferBounds.height) {
-            bounds.y = bufferBounds.height - 1;
-        }
-        if (bounds.x + bounds.width > bufferBounds.width) {
-            bounds.width = bufferBounds.width - bounds.x;
-        }
-        if (bounds.y + bounds.height > bufferBounds.height) {
-            bounds.height = bufferBounds.height - bounds.y;
-        }
-
-        if (surfaceData instanceof VKSurfaceData vksd) {
-            return vksd.getSnapshot(bounds.x, bounds.y, bounds.width, bounds.height);
-        } else if (surfaceData instanceof WLSMSurfaceData smsd) {
-            return smsd.getSnapshot(bounds.x, bounds.y, bounds.width, bounds.height);
-        }
-
-        return null;
-    }
-
     private boolean canPaintRoundedCorners() {
         int roundedCornerSize = WLRoundedCornersManager.roundCornerRadiusFor(roundedCornerKind);
         // Note: You would normally get a transparency-capable color model when using

src/java.desktop/unix/classes/sun/java2d/vulkan/WLVKGraphicsConfig.java

@@ -47,8 +47,11 @@ public final class WLVKGraphicsConfig extends WLGraphicsConfig
 
     private final VKGraphicsConfig offscreenConfig;
 
-    public WLVKGraphicsConfig(VKGraphicsConfig offscreenConfig, WLGraphicsDevice device) {
-        super(device);
+    public WLVKGraphicsConfig(VKGraphicsConfig offscreenConfig, WLGraphicsDevice device,
+                              int x, int y, int xLogical, int yLogical,
+                              int width, int height, int widthLogical, int heightLogical,
+                              int scale) {
+        super(device, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale);
         this.offscreenConfig = offscreenConfig;
     }
 
@@ -62,8 +65,11 @@ public final class WLVKGraphicsConfig extends WLGraphicsConfig
         return getEffectiveScale();
     }
 
-    public static WLVKGraphicsConfig getConfig(VKGraphicsConfig offscreenConfig, WLGraphicsDevice device) {
-        return new WLVKGraphicsConfig(offscreenConfig, device);
+    public static WLVKGraphicsConfig getConfig(VKGraphicsConfig offscreenConfig, WLGraphicsDevice device,
+                                               int x, int y, int xLogical, int yLogical,
+                                               int width, int height, int widthLogical, int heightLogical,
+                                               int scale) {
+        return new WLVKGraphicsConfig(offscreenConfig, device, x, y, xLogical, yLogical, width, height, widthLogical, heightLogical, scale);
     }
 
     @Override

src/java.desktop/unix/classes/sun/java2d/wl/WLSMSurfaceData.java

@@ -26,25 +26,19 @@
 
 package sun.java2d.wl;
 
-import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Window;
 import java.awt.GraphicsConfiguration;
 import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
 import java.awt.image.Raster;
-import java.awt.image.SampleModel;
-import java.awt.image.WritableRaster;
 import java.util.Objects;
 
 import sun.awt.AWTAccessor;
 import sun.awt.wl.WLComponentPeer;
+import sun.awt.wl.WLGraphicsConfig;
 import sun.awt.wl.WLSMGraphicsConfig;
 import sun.java2d.SurfaceData;
-import sun.java2d.loops.Blit;
-import sun.java2d.loops.CompositeType;
 import sun.java2d.loops.SurfaceType;
 import sun.util.logging.PlatformLogger;
 
@@ -130,20 +124,16 @@ public class WLSMSurfaceData extends SurfaceData implements WLSurfaceDataExt, WL
         return gc;
     }
 
-    public BufferedImage getSnapshot(int x, int y, int width, int height) {
-        ColorModel colorModel = getColorModel();
-        SampleModel sampleModel = colorModel.createCompatibleSampleModel(width, height);
-        WritableRaster raster = Raster.createWritableRaster(sampleModel, null);
-        BufferedImage image = new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
-        SurfaceData sd = SurfaceData.getPrimarySurfaceData(image);
-        Blit blit = Blit.getFromCache(getSurfaceType(), CompositeType.SrcNoEa, sd.getSurfaceType());
-        blit.Blit(this, sd, AlphaComposite.Src, null, x, y, 0, 0, width, height);
-        return image;
-    }
-
     @Override
     public Raster getRaster(int x, int y, int w, int h) {
-        return getSnapshot(x, y, w, h).getRaster().createTranslatedChild(x, y);
+        // Can do something like the following:
+        // Raster r = getColorModel().createCompatibleWritableRaster(w, h);
+        // copy surface data to this raster
+        // save a reference to this raster
+        // return r;
+        // then in flush() check if raster was modified and take pixels from there
+        // This is obviously suboptimal and shouldn't be used in performance-critical situations.
+        throw new UnsupportedOperationException("Not implemented yet");
     }
 
     @Override
@@ -199,7 +189,7 @@ public class WLSMSurfaceData extends SurfaceData implements WLSurfaceDataExt, WL
     private void countNewFrame() {
         // Called from the native code when this surface data has been sent to the Wayland server
         if (target instanceof Window window) {
-            AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.frames");
+            AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.frames");
         }
     }
 
@@ -208,7 +198,7 @@ public class WLSMSurfaceData extends SurfaceData implements WLSurfaceDataExt, WL
         // the Wayland server, but that attempt was not successful. This can happen, for example,
         // when those attempts are too frequent.
         if (target instanceof Window window) {
-            AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.framesDropped");
+            AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.framesDropped");
         }
     }
 

src/java.desktop/unix/native/libawt_wlawt/GtkFrameDecoration.c

@@ -137,7 +137,6 @@ typedef gboolean (*gtk_icon_size_lookup_t)(GtkIconSize, gint*, gint*);
 typedef GdkPixbuf* (*gtk_icon_info_load_symbolic_for_context_t)(GtkIconInfo*, GtkStyleContext*, gboolean*, GError**);
 typedef GtkIconInfo* (*gtk_icon_theme_lookup_icon_for_scale_t)(GtkIconTheme*, const gchar*, gint, gint, GtkIconLookupFlags);
 typedef GtkIconTheme* (*gtk_icon_theme_get_default_t)(void);
-typedef GtkSettings* (*gtk_settings_get_default_t)(void);
 typedef GtkSettings* (*gtk_widget_get_settings_t)(GtkWidget*);
 typedef GtkStateFlags (*gtk_style_context_get_state_t)(GtkStyleContext *context);
 typedef GtkStyleContext* (*gtk_widget_get_style_context_t)(GtkWidget*);
@@ -192,6 +191,7 @@ typedef void (*g_object_get_t)(gpointer, const gchar*, ...);
 typedef void (*g_object_set_t)(gpointer, const gchar*, ...);
 typedef void (*g_object_get_property_t)(GObject*, const gchar*, GValue*);
 typedef gboolean (*g_type_check_instance_is_a_t)(void**, GType);
+typedef gboolean (*g_main_context_iteration_t)(GMainContext *context, gboolean);
 
 typedef struct GtkFrameDecorationDescr {
     GtkWidget *window;
@@ -227,7 +227,6 @@ static gtk_offscreen_window_new_t p_gtk_offscreen_window_new;
 static gtk_render_background_t p_gtk_render_background;
 static gtk_render_frame_t p_gtk_render_frame;
 static gtk_render_icon_surface_t p_gtk_render_icon_surface;
-static gtk_settings_get_default_t p_gtk_settings_get_default;
 static gtk_style_context_add_class_t p_gtk_style_context_add_class;
 static gtk_style_context_get_border_t p_gtk_style_context_get_border;
 static gtk_style_context_get_padding_t p_gtk_style_context_get_padding;
@@ -273,6 +272,7 @@ static g_object_get_t p_g_object_get;
 static g_object_set_t p_g_object_set;
 static g_object_get_property_t p_g_object_get_property;
 static g_type_check_instance_is_a_t p_g_type_check_instance_is_a;
+static g_main_context_iteration_t p_g_main_context_iteration;
 
 static void* gtk_handle;
 static void* gdk_handle;
@@ -328,7 +328,6 @@ static jboolean load_gtk(JNIEnv *env) {
     p_gtk_render_background = find_func(env, gtk_handle, "gtk_render_background");
     p_gtk_render_frame = find_func(env, gtk_handle, "gtk_render_frame");
     p_gtk_render_icon_surface = find_func(env, gtk_handle, "gtk_render_icon_surface");
-    p_gtk_settings_get_default = find_func(env, gtk_handle, "gtk_settings_get_default");
     p_gtk_style_context_add_class = find_func(env, gtk_handle, "gtk_style_context_add_class");
     p_gtk_style_context_get_border = find_func(env, gtk_handle, "gtk_style_context_get_border");
     p_gtk_style_context_get = find_func(env, gtk_handle, "gtk_style_context_get");
@@ -373,6 +372,7 @@ static jboolean load_gtk(JNIEnv *env) {
     p_g_object_set = find_func(env, gtk_handle, "g_object_set");
     p_g_object_get_property = find_func(env, gtk_handle, "g_object_get_property");
     p_g_type_check_instance_is_a = find_func(env, gtk_handle, "g_type_check_instance_is_a");
+    p_g_main_context_iteration = find_func(env, gtk_handle, "g_main_context_iteration");
 
     // NB: An error had been thrown in case some function was missing
     return JNI_TRUE;
@@ -561,13 +561,6 @@ static void draw_title_bar(GtkFrameDecorationDescr* decor, cairo_surface_t * sur
     draw_titlebar_buttons(decor, surface, cr, scale, buttonsState);
 }
 
-static void set_theme(jboolean is_dark_theme) {
-    p_g_object_set(p_gtk_settings_get_default(),
-                   "gtk-application-prefer-dark-theme",
-                   is_dark_theme,
-                   NULL);
-}
-
 JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_initIDs(JNIEnv *env, jclass clazz) {
     CHECK_NULL_THROW_IE(env,
                         CloseButtonBoundsFID = (*env)->GetFieldID(env, clazz, "closeButtonBounds", "Ljava/awt/Rectangle;"),
@@ -591,14 +584,12 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativeLoadGTK(JNIE
 }
 
 JNIEXPORT jlong JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativeCreateDecoration
-(JNIEnv *env, jobject obj, jboolean show_minimize, jboolean show_maximize, jboolean is_dark_theme) {
+(JNIEnv *env, jobject obj, jboolean show_minimize, jboolean show_maximize) {
     GtkFrameDecorationDescr *d = calloc(1, sizeof(GtkFrameDecorationDescr));
     CHECK_NULL_THROW_OOME_RETURN(env, d, "Failed to allocate GtkFrameDeocration", 0);
 
     p_gdk_threads_enter();
 
-    set_theme(is_dark_theme);
-
     d->show_minimize = show_minimize;
     d->show_maximize = show_maximize;
     d->window = p_gtk_offscreen_window_new();
@@ -643,19 +634,8 @@ JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativePaintTitleBar
     jint pixel_width = ceil(width * scale);
     jint pixel_height = ceil(height * scale);
 
-    jboolean is_copy = JNI_FALSE;
-    const char *title_c_str = "";
-    if (title) {
-        title_c_str = JNU_GetStringPlatformChars(env, title, &is_copy);
-        if (!title_c_str)
-            return;
-    }
-
     unsigned char *buffer = (*env)->GetPrimitiveArrayCritical(env, dest, 0);
     if (!buffer) {
-        if (is_copy) {
-            JNU_ReleaseStringPlatformChars(env, title, title_c_str);
-        }
         JNU_ThrowOutOfMemoryError(env, "Could not get image buffer");
         return;
     }
@@ -671,25 +651,31 @@ JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativePaintTitleBar
 
     cairo_t *cr = p_cairo_create(surface);
 
+    jboolean is_copy = JNI_FALSE;
+    const char *title_c_str = "";
+    if (title) {
+        title_c_str = JNU_GetStringPlatformChars(env, title, &is_copy);
+        if (!title_c_str)
+            return;
+    }
     draw_title_bar(decor, surface, cr, width, height, scale, title_c_str, buttonsState);
 
+    if (is_copy) {
+        JNU_ReleaseStringPlatformChars(env, title, title_c_str);
+    }
+
     // Make sure pixels have been flush into the underlying buffer
     p_cairo_surface_flush(surface);
 
     p_gdk_threads_leave();
 
     (*env)->ReleasePrimitiveArrayCritical(env, dest, buffer, 0);
-
-    if (is_copy) {
-        JNU_ReleaseStringPlatformChars(env, title, title_c_str);
-    }
-
     p_cairo_destroy(cr);
     p_cairo_surface_destroy(surface);
 }
 
 JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativePrePaint(JNIEnv *env, jobject obj,
-                                                                         jlong ptr, jint width, jint height) {
+                                                                         jlong ptr, jint width) {
     assert (ptr != 0);
     GtkFrameDecorationDescr* decor = jlong_to_ptr(ptr);
 
@@ -719,12 +705,6 @@ JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativePrePaint(JNIEnv
     (*env)->SetIntField(env, obj, TitleBarHeightFID, pref_height);
     (*env)->SetIntField(env, obj, TitleBarMinWidthFID, min_width);
 
-    if (width < min_width || height < pref_height) {
-        // Avoid gtk warnings in case of insufficient space
-        p_gdk_threads_leave();
-        return;
-    }
-
     GtkAllocation ha = {0, 0, width, pref_height};
     p_gtk_widget_size_allocate(decor->titlebar, &ha);
 
@@ -756,10 +736,8 @@ JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativePrePaint(JNIEnv
     p_gdk_threads_leave();
 }
 
-JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativeSwitchTheme(JNIEnv *env, jobject obj, jboolean is_dark_theme) {
-    p_gdk_threads_enter();
-    set_theme(is_dark_theme);
-    p_gdk_threads_leave();
+JNIEXPORT void JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativeSwitchTheme(JNIEnv *env, jobject obj) {
+    while ((*p_g_main_context_iteration)(NULL, false));
 }
 
 JNIEXPORT jint JNICALL Java_sun_awt_wl_GtkFrameDecoration_nativeGetIntProperty

src/java.desktop/unix/native/libawt_wlawt/WLDataDevice.c

@@ -72,9 +72,6 @@ struct DataSource
         struct wl_data_source *wlDataSource;
         struct zwp_primary_selection_source_v1 *zwpPrimarySelectionSource;
     };
-
-    struct wl_surface* dragIcon;
-    struct wl_buffer* dragIconBuffer;
 };
 
 // native part of WLDataOffer, remains alive until WLDataOffer.destroy() is called
@@ -345,18 +342,22 @@ DataOffer_create(struct DataDevice *dataDevice, enum DataTransferProtocol protoc
     }
 
     offer->javaObject = globalRef;
-    offer->protocol = protocol;
 
     if (protocol == DATA_TRANSFER_PROTOCOL_WAYLAND) {
         struct wl_data_offer *wlDataOffer = waylandObject;
-        offer->wlDataOffer = wlDataOffer;
+
         wl_data_offer_add_listener(wlDataOffer, &wlDataOfferListener, offer);
+
+        offer->wlDataOffer = wlDataOffer;
+        offer->protocol = DATA_TRANSFER_PROTOCOL_WAYLAND;
     }
 
     if (protocol == DATA_TRANSFER_PROTOCOL_PRIMARY_SELECTION) {
         struct zwp_primary_selection_offer_v1 *zwpPrimarySelectionOffer = waylandObject;
-        offer->zwpPrimarySelectionOffer = zwpPrimarySelectionOffer;
+
         zwp_primary_selection_offer_v1_add_listener(zwpPrimarySelectionOffer, &zwpPrimarySelectionOfferListener, offer);
+        offer->zwpPrimarySelectionOffer = zwpPrimarySelectionOffer;
+        offer->protocol = DATA_TRANSFER_PROTOCOL_PRIMARY_SELECTION;
     }
 
     return offer;
@@ -936,7 +937,7 @@ Java_sun_awt_wl_WLDataDevice_setSelectionImpl(JNIEnv *env,
 JNIEXPORT void JNICALL
 Java_sun_awt_wl_WLDataDevice_startDragImpl(JNIEnv *env, jclass clazz, jlong dataDeviceNativePtr,
                                            jlong dataSourceNativePtr, jlong wlSurfacePtr,
-                                           jlong serial)
+                                           jlong iconPtr, jlong serial)
 {
     struct DataDevice *dataDevice = jlong_to_ptr(dataDeviceNativePtr);
     assert(dataDevice != NULL);
@@ -945,10 +946,7 @@ Java_sun_awt_wl_WLDataDevice_startDragImpl(JNIEnv *env, jclass clazz, jlong data
     assert(source != NULL);
 
     wl_data_device_start_drag(dataDevice->wlDataDevice, source->wlDataSource, jlong_to_ptr(wlSurfacePtr),
-                              source->dragIcon, serial);
-    if (source->dragIcon != NULL) {
-        wl_surface_commit(source->dragIcon);
-    }
+                              jlong_to_ptr(iconPtr), serial);
 }
 
 JNIEXPORT jlong JNICALL
@@ -980,53 +978,36 @@ Java_sun_awt_wl_WLDataSource_initNative(JNIEnv *env, jobject javaObject, jlong d
         protocol = DATA_TRANSFER_PROTOCOL_WAYLAND;
     }
 
-    dataSource->protocol = protocol;
-
     if (protocol == DATA_TRANSFER_PROTOCOL_WAYLAND) {
-        // To avoid race conditions when setting the dispatch queue,
-        // it's necessary to do this dance with wl_proxy_create_wrapper.
-        // See the docs for wl_proxy_create_wrapper for more details
-
-        struct wl_data_device_manager* dmWrapper = wl_proxy_create_wrapper(wl_ddm);
-        struct wl_data_source *wlDataSource = NULL;
-
-        if (dmWrapper != NULL) {
-            wl_proxy_set_queue((struct wl_proxy *) dmWrapper, dataDevice->dataSourceQueue);
-            wlDataSource = wl_data_device_manager_create_data_source(dmWrapper);
-            wl_proxy_wrapper_destroy(dmWrapper);
-        }
-
+        struct wl_data_source *wlDataSource = wl_data_device_manager_create_data_source(wl_ddm);
         if (wlDataSource == NULL) {
             free(dataSource);
             JNU_ThrowByName(env, "java/awt/AWTError", "Wayland error creating wl_data_source proxy");
             return 0;
         }
 
-        dataSource->wlDataSource = wlDataSource;
-
+        wl_proxy_set_queue((struct wl_proxy *) wlDataSource, dataDevice->dataSourceQueue);
         wl_data_source_add_listener(wlDataSource, &wl_data_source_listener, dataSource);
+
+        dataSource->protocol = DATA_TRANSFER_PROTOCOL_WAYLAND;
+        dataSource->wlDataSource = wlDataSource;
     }
 
     if (protocol == DATA_TRANSFER_PROTOCOL_PRIMARY_SELECTION) {
-        struct zwp_primary_selection_device_manager_v1 *dmWrapper = wl_proxy_create_wrapper(zwp_selection_dm);
-        struct zwp_primary_selection_source_v1 *zwpPrimarySelectionSource = NULL;
-
-        if (dmWrapper != NULL) {
-            wl_proxy_set_queue((struct wl_proxy *) dmWrapper, dataDevice->dataSourceQueue);
-            zwpPrimarySelectionSource = zwp_primary_selection_device_manager_v1_create_source(dmWrapper);
-            wl_proxy_wrapper_destroy(dmWrapper);
-        }
-
+        struct zwp_primary_selection_source_v1 *zwpPrimarySelectionSource =
+                zwp_primary_selection_device_manager_v1_create_source(zwp_selection_dm);
         if (zwpPrimarySelectionSource == NULL) {
             free(dataSource);
             JNU_ThrowByName(env, "java/awt/AWTError", "Wayland error creating zwp_primary_selection_source_v1 proxy");
             return 0;
         }
 
-        dataSource->zwpPrimarySelectionSource = zwpPrimarySelectionSource;
-
+        wl_proxy_set_queue((struct wl_proxy *) zwpPrimarySelectionSource, dataDevice->dataSourceQueue);
         zwp_primary_selection_source_v1_add_listener(zwpPrimarySelectionSource,
                                                      &zwp_primary_selection_source_v1_listener, dataSource);
+
+        dataSource->protocol = DATA_TRANSFER_PROTOCOL_PRIMARY_SELECTION;
+        dataSource->zwpPrimarySelectionSource = zwpPrimarySelectionSource;
     }
 
     return ptr_to_jlong(dataSource);
@@ -1064,14 +1045,6 @@ Java_sun_awt_wl_WLDataSource_destroyImpl(JNIEnv *env, jclass clazz, jlong native
         zwp_primary_selection_source_v1_destroy(source->zwpPrimarySelectionSource);
     }
 
-    if (source->dragIconBuffer) {
-        wl_buffer_destroy(source->dragIconBuffer);
-    }
-
-    if (source->dragIcon) {
-        wl_surface_destroy(source->dragIcon);
-    }
-
     free(source);
 }
 
@@ -1085,70 +1058,6 @@ Java_sun_awt_wl_WLDataSource_setDnDActionsImpl(JNIEnv *env,
     DataSource_setDnDActions(source, actions);
 }
 
-JNIEXPORT void JNICALL Java_sun_awt_wl_WLDataSource_setDnDIconImpl
-  (JNIEnv * env, jclass clazz, jlong nativePtr, jint scale,
-   jint width, jint height, jint offsetX, jint offsetY, jintArray pixels)
-{
-    struct DataSource *source = jlong_to_ptr(nativePtr);
-
-    size_t pixelCount = (size_t)((*env)->GetArrayLength(env, pixels));
-    size_t byteSize = pixelCount * 4U;
-    if (byteSize >= INT32_MAX) {
-        return;
-    }
-
-    jint *shmPixels = NULL;
-    struct wl_shm_pool *pool = CreateShmPool(byteSize, "WLDataSource_DragIcon", (void**)&shmPixels, NULL);
-    if (!pool) {
-        return;
-    }
-
-    (*env)->GetIntArrayRegion(env, pixels, 0, pixelCount, shmPixels);
-#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-    // Wayland requires little-endian data
-    for (size_t i = 0; i < pixelCount; i++) {
-        uint32_t value = (uint32_t)shmPixels[i];
-        shmPixels[i] = (jint)((value & 0xFFU) << 24 |
-                              (value & 0xFF00U) << 8 |
-                              (value & 0xFF0000U) >> 8 |
-                              (value & 0xFF000000U) >> 24 & 0xFFU);
-    }
-#endif
-
-    source->dragIconBuffer = wl_shm_pool_create_buffer(pool, 0, width, height, width * 4, WL_SHM_FORMAT_ARGB8888);
-    wl_shm_pool_destroy(pool);
-    if (!source->dragIconBuffer) {
-        return;
-    }
-
-    source->dragIcon = wl_compositor_create_surface(wl_compositor);
-    if (!source->dragIcon) {
-        wl_buffer_destroy(source->dragIconBuffer);
-        source->dragIconBuffer = NULL;
-        return;
-    }
-
-#if WL_SURFACE_OFFSET_SINCE_VERSION >= 5
-    int wl_compositor_version = wl_compositor_get_version(wl_compositor);
-    if (wl_compositor_version >= 5) {
-        wl_surface_attach(source->dragIcon, source->dragIconBuffer, 0, 0);
-        wl_surface_offset(source->dragIcon, offsetX, offsetY);
-    } else {
-        wl_surface_attach(source->dragIcon, source->dragIconBuffer, offsetX, offsetY);
-    }
-#else
-    wl_surface_attach(source->dragIcon, source->dragIconBuffer, offsetX, offsetY);
-#endif
-
-    if (scale >= 1) {
-        wl_surface_set_buffer_scale(source->dragIcon, scale);
-    }
-
-    wl_surface_damage_buffer(source->dragIcon, 0, 0, width, height);
-
-    // NOTE: we still need to commit the surface, this is done immediately after start_drag
-}
-
 JNIEXPORT void JNICALL
 Java_sun_awt_wl_WLDataOffer_destroyImpl(JNIEnv *env, jclass clazz, jlong nativePtr)
 {

src/java.desktop/unix/native/libawt_wlawt/WLGraphicsEnvironment.c

@@ -43,6 +43,8 @@ typedef struct WLOutput {
 
     int32_t x;
     int32_t y;
+    int32_t x_logical;
+    int32_t y_logical;
     int32_t width;
     int32_t height;
     int32_t width_logical;
@@ -57,8 +59,6 @@ typedef struct WLOutput {
     char *   make;
     char *   model;
     char *   name;
-
-    bool     offset_known; // whether x and y were set by xdg_output
 } WLOutput;
 
 static jclass geClass;
@@ -83,13 +83,10 @@ wl_output_geometry(
 {
     WLOutput *output = data;
 
-    if (!output->offset_known) {
-        // Ubuntu 22.04 has a bug that prevent Mutter from sending out updates to (x, y) in this
-        // geometry event. So we prefer to learn offset from xdg_output that will override
-        // (x, y) from this event.
-        output->x = x;
-        output->y = y;
-    }
+    // TODO: there's also a recommended, but unstable interface xdg_output;
+    //  we may want to switch to that one day.
+    output->x = x;
+    output->y = y;
     output->subpixel = subpixel;
     output->transform = transform;
     output->width_mm = physical_width;
@@ -164,6 +161,8 @@ NotifyOutputConfigured(WLOutput* output)
                            output->id,
                            output->x,
                            output->y,
+                           output->x_logical,
+                           output->y_logical,
                            output->width,
                            output->height,
                            output->width_logical,
@@ -174,8 +173,6 @@ NotifyOutputConfigured(WLOutput* output)
                            (jint)output->transform,
                            (jint)output->scale);
     JNU_CHECK_EXCEPTION(env);
-
-    output->offset_known = false;
 }
 
 static void
@@ -221,12 +218,8 @@ static void
 zxdg_output_logical_position(void *data, struct zxdg_output_v1 *zxdg_output_v1, int32_t x, int32_t y)
 {
     WLOutput * output = data;
-    output->x = x;
-    output->y = y;
-
-    // Prevent the geometry event from overriding these values with potentially incorrect ones;
-    // see wl_output_geometry().
-    output->offset_known = true;
+    output->x_logical = x;
+    output->y_logical = y;
 }
 
 static void
@@ -264,7 +257,7 @@ WLGraphicsEnvironment_initIDs
     CHECK_NULL_RETURN(
                     notifyOutputConfiguredMID = (*env)->GetMethodID(env, clazz,
                                                                     "notifyOutputConfigured",
-                                                                    "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIIIIIIII)V"),
+                                                                    "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIIIIIIIIII)V"),
                     JNI_FALSE);
     CHECK_NULL_RETURN(
                     notifyOutputDestroyedMID = (*env)->GetMethodID(env, clazz,

src/java.desktop/unix/native/libawt_wlawt/WLKeyboard.c

@@ -1161,8 +1161,6 @@ postKeyTypedJavaChar(long serial, long timestamp, uint16_t javaChar) {
     fprintf(stderr, "postKeyTypedJavaChar(0x%04x)\n", (int) javaChar);
 #endif
 
-    int javaModifiers = convertXKBModifiersToJavaModifiers(getXKBModifiers());
-
     struct WLKeyEvent event = {
             .serial = serial,
             .timestamp = timestamp,
@@ -1171,8 +1169,7 @@ postKeyTypedJavaChar(long serial, long timestamp, uint16_t javaChar) {
             .keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN,
             .rawCode = 0,
             .extendedKeyCode = 0,
-            .keyChar = javaChar,
-            .modifiers = javaModifiers,
+            .keyChar = javaChar
     };
 
     wlPostKeyEvent(&event);

src/java.desktop/unix/native/libawt_wlawt/WLToolkit.c

@@ -24,7 +24,6 @@
  * questions.
  */
 
-#include "relative-pointer-unstable-v1.h"
 #ifdef HEADLESS
     #error This file should not be included in headless library
 #endif
@@ -81,7 +80,6 @@ struct gtk_shell1* gtk_shell1 = NULL;
 #endif
 struct wl_keyboard *wl_keyboard; // optional, check for NULL before use
 struct wl_pointer  *wl_pointer; // optional, check for NULL before use
-struct zwp_relative_pointer_manager_v1* relative_pointer_manager; // optional, check for NULL before use
 
 #define MAX_CURSOR_SCALE 100
 struct wl_cursor_theme *cursor_themes[MAX_CURSOR_SCALE] = {NULL};
@@ -130,7 +128,6 @@ static jmethodID dispatchKeyboardKeyEventMID;
 static jmethodID dispatchKeyboardModifiersEventMID;
 static jmethodID dispatchKeyboardEnterEventMID;
 static jmethodID dispatchKeyboardLeaveEventMID;
-static jmethodID dispatchRelativePointerEventMID;
 
 JNIEnv *getEnv() {
     JNIEnv *env;
@@ -467,31 +464,6 @@ static const struct wl_keyboard_listener wl_keyboard_listener = {
         .key         = wl_keyboard_key
 };
 
-static void
-wl_relative_motion(void *data,
-                   struct zwp_relative_pointer_v1 *zwp_relative_pointer_v1,
-                   uint32_t utime_hi,
-                   uint32_t utime_lo,
-                   wl_fixed_t dx,
-                   wl_fixed_t dy,
-                   wl_fixed_t dx_unaccel,
-                   wl_fixed_t dy_unaccel)
-{
-    double ddx = wl_fixed_to_double(dx);
-    double ddy = wl_fixed_to_double(dy);
-    JNIEnv* env = getEnv();
-
-    (*env)->CallStaticVoidMethod(env,
-                                 tkClass,
-                                 dispatchRelativePointerEventMID,
-                                 ddx, ddy);
-    JNU_CHECK_EXCEPTION(env);
-}
-
-static const struct zwp_relative_pointer_v1_listener relative_pointer_listener = {
-    .relative_motion = wl_relative_motion
-};
-
 static void
 wl_seat_capabilities(void *data, struct wl_seat *wl_seat, uint32_t capabilities)
 {
@@ -502,14 +474,6 @@ wl_seat_capabilities(void *data, struct wl_seat *wl_seat, uint32_t capabilities)
         wl_pointer = wl_seat_get_pointer(wl_seat);
         if (wl_pointer != NULL) {
             wl_pointer_add_listener(wl_pointer, &wl_pointer_listener, NULL);
-            if (relative_pointer_manager != NULL) {
-                struct zwp_relative_pointer_v1* rptr
-                    = zwp_relative_pointer_manager_v1_get_relative_pointer(relative_pointer_manager,
-                                                                           wl_pointer);
-                if (rptr != NULL) {
-                    zwp_relative_pointer_v1_add_listener(rptr, &relative_pointer_listener, NULL);
-                }
-            }
         }
     } else if (!has_pointer && wl_pointer != NULL) {
         wl_pointer_release(wl_pointer);
@@ -572,12 +536,7 @@ registry_global(void *data, struct wl_registry *wl_registry,
     if (strcmp(interface, wl_shm_interface.name) == 0) {
         wl_shm = wl_registry_bind( wl_registry, name, &wl_shm_interface, 1);
     } else if (strcmp(interface, wl_compositor_interface.name) == 0) {
-#if WL_SURFACE_OFFSET_SINCE_VERSION >= 5
-        uint32_t chosen_version = (version >= 5) ? 5 : 4;
-#else
-        uint32_t chosen_version = 4;
-#endif
-        wl_compositor = wl_registry_bind(wl_registry, name, &wl_compositor_interface, chosen_version);
+        wl_compositor = wl_registry_bind(wl_registry, name, &wl_compositor_interface, 4);
     } else if (strcmp(interface, wl_subcompositor_interface.name) == 0) {
         wl_subcompositor = wl_registry_bind(wl_registry, name, &wl_subcompositor_interface, 1);
     } else if (strcmp(interface, xdg_wm_base_interface.name) == 0) {
@@ -601,9 +560,6 @@ registry_global(void *data, struct wl_registry *wl_registry,
     } else if (strcmp(interface, xdg_activation_v1_interface.name) == 0) {
         xdg_activation_v1 = wl_registry_bind(wl_registry, name, &xdg_activation_v1_interface, 1);
     }
-    else if (strcmp(interface, zwp_relative_pointer_manager_v1_interface.name) == 0) {
-        relative_pointer_manager = wl_registry_bind(wl_registry, name, &zwp_relative_pointer_manager_v1_interface, 1);
-    }
 #ifdef HAVE_GTK_SHELL1
     else if (strcmp(interface, gtk_shell1_interface.name) == 0) {
         gtk_shell1 = wl_registry_bind(wl_registry, name, &gtk_shell1_interface, 1);
@@ -754,10 +710,6 @@ initJavaRefs(JNIEnv *env, jclass clazz)
                                                                                     "dispatchKeyboardModifiersEvent",
                                                                                     "(J)V"),
                       JNI_FALSE);
-    CHECK_NULL_RETURN(dispatchRelativePointerEventMID = (*env)->GetStaticMethodID(env, tkClass,
-                                                                          "dispatchRelativePointerEvent",
-                                                                          "(DD)V"),
-                      JNI_FALSE);
 
     jclass wlgeClass = (*env)->FindClass(env, "sun/awt/wl/WLGraphicsEnvironment");
     CHECK_NULL_RETURN(wlgeClass, JNI_FALSE);

src/java.desktop/unix/native/libawt_wlawt/WLToolkit.h

@@ -30,8 +30,6 @@
 #include "xdg-output-unstable-v1.h"
 #include "primary-selection-unstable-v1.h"
 #include "viewporter.h"
-#include "relative-pointer-unstable-v1.h"
-
 #include "jvm_md.h"
 #include "jni_util.h"
 
@@ -68,7 +66,7 @@ extern struct wl_cursor_theme *wl_cursor_theme;
 extern struct wl_data_device_manager *wl_ddm;
 extern struct zwp_primary_selection_device_manager_v1 *zwp_selection_dm; // optional, check for NULL before use
 extern struct zxdg_output_manager_v1 *zxdg_output_manager_v1; // optional, check for NULL before use
-extern struct zwp_relative_pointer_manager_v1* relative_pointer_manager;
+
 JNIEnv *getEnv();
 
 int wlFlushToServer(JNIEnv* env);

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import java.awt.Graphics;
 import java.awt.Rectangle;
 
 import javax.swing.ButtonModel;
-import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.plaf.ComponentUI;
@@ -74,24 +73,6 @@ public final class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI {
         }
         super.paintBackground(g, menuItem, bgColor);
     }
-
-    /**
-     * Paint MenuItem.
-     */
-    protected void paintMenuItem(Graphics g, JComponent c,
-                                 Icon checkIcon, Icon arrowIcon,
-                                 Color background, Color foreground,
-                                 int defaultTextIconGap) {
-        if (WindowsMenuItemUI.isVistaPainting()) {
-            WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
-                    arrowIcon, background, foreground, defaultTextIconGap,
-                    menuItem, getPropertyPrefix());
-            return;
-        }
-        super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
-                foreground, defaultTextIconGap);
-    }
-
     /**
      * Method which renders the text of the current menu item.
      *

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -880,7 +880,6 @@ public final class WindowsIconFactory implements Serializable
                 }
                 assert menuItem == null || c == menuItem;
                 Icon icon = getIcon();
-
                 if (type == JCheckBoxMenuItem.class
                       || type == JRadioButtonMenuItem.class) {
                     AbstractButton b = (AbstractButton) c;
@@ -904,18 +903,19 @@ public final class WindowsIconFactory implements Serializable
                         }
                         XPStyle xp = XPStyle.getXP();
                         if (xp != null) {
-                            Skin skin = xp.getSkin(c, part);
-                            if (icon == null || icon.getIconHeight() <= 16) {
+                            Skin skin;
+                            skin =  xp.getSkin(c, backgroundPart);
+                            skin.paintSkin(g, x, y,
+                                getIconWidth(), getIconHeight(), backgroundState);
+                            if (icon == null) {
+                                skin = xp.getSkin(c, part);
                                 skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
-                            } else {
-                                skin.paintSkin(g, x + OFFSET, y + icon.getIconHeight() / 2, state);
                             }
                         }
                     }
                 }
                 if (icon != null) {
-                    icon.paintIcon(c, g, x + VistaMenuItemCheckIconFactory.getIconWidth(),
-                                   y + OFFSET);
+                    icon.paintIcon(c, g, x + OFFSET, y + OFFSET);
                 }
             }
             private static WindowsMenuItemUIAccessor getAccessor(

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,13 @@
 package com.sun.java.swing.plaf.windows;
 
 import java.awt.Color;
-import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
-import java.awt.Insets;
 import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.Enumeration;
 
-import javax.swing.AbstractButton;
-import javax.swing.ButtonGroup;
 import javax.swing.ButtonModel;
-import javax.swing.DefaultButtonModel;
-import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -48,7 +41,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicMenuItemUI;
 
-import com.sun.java.swing.SwingUtilities3;
 import com.sun.java.swing.plaf.windows.TMSchema.Part;
 import com.sun.java.swing.plaf.windows.TMSchema.State;
 import com.sun.java.swing.plaf.windows.XPStyle.Skin;
@@ -67,9 +59,6 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
      * The instance of {@code PropertyChangeListener}.
      */
     private PropertyChangeListener changeListener;
-    private static Color disabledForeground;
-    private static Color acceleratorSelectionForeground;
-    private static Color acceleratorForeground;
 
     final WindowsMenuItemUIAccessor accessor =
         new  WindowsMenuItemUIAccessor() {
@@ -134,27 +123,6 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
         menuItem.addPropertyChangeListener(changeListener);
     }
 
-    protected void installDefaults() {
-        super.installDefaults();
-        String prefix = getPropertyPrefix();
-
-        if (acceleratorSelectionForeground == null ||
-                acceleratorSelectionForeground instanceof UIResource) {
-            acceleratorSelectionForeground =
-                    UIManager.getColor(prefix + ".acceleratorSelectionForeground");
-        }
-        if (acceleratorForeground == null ||
-                acceleratorForeground instanceof UIResource) {
-            acceleratorForeground =
-                    UIManager.getColor(prefix + ".acceleratorForeground");
-        }
-        if (disabledForeground == null ||
-                disabledForeground instanceof UIResource) {
-            disabledForeground =
-                    UIManager.getColor(prefix + ".disabledForeground");
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -167,114 +135,6 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
         changeListener = null;
     }
 
-    private static void applyInsets(Rectangle rect, Insets insets) {
-        SwingUtilities3.applyInsets(rect, insets);
-    }
-
-    private static void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,
-                                MenuItemLayoutHelper.LayoutResult lr,
-                                Color holdc, Color foreground) {
-        SwingUtilities3.paintCheckIcon(g, lh, lr, holdc, foreground);
-    }
-
-    private static void paintIcon(Graphics g, MenuItemLayoutHelper lh,
-                           MenuItemLayoutHelper.LayoutResult lr, Color holdc) {
-        SwingUtilities3.paintIcon(g, lh, lr, holdc);
-    }
-
-    private static void paintAccText(Graphics g, MenuItemLayoutHelper lh,
-                              MenuItemLayoutHelper.LayoutResult lr) {
-        SwingUtilities3.setDisabledForeground(disabledForeground);
-        SwingUtilities3.setAcceleratorSelectionForeground(
-                        acceleratorSelectionForeground);
-        SwingUtilities3.setAcceleratorForeground(acceleratorForeground);
-        SwingUtilities3.paintAccText(g, lh, lr);
-    }
-
-    private static void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
-                                MenuItemLayoutHelper.LayoutResult lr,
-                                Color foreground) {
-        SwingUtilities3.paintArrowIcon(g, lh, lr, foreground);
-    }
-
-    protected void paintMenuItem(Graphics g, JComponent c,
-                                 Icon checkIcon, Icon arrowIcon,
-                                 Color background, Color foreground,
-                                 int defaultTextIconGap) {
-        if (WindowsMenuItemUI.isVistaPainting()) {
-            WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
-                                            arrowIcon, background, foreground,
-                                            defaultTextIconGap, menuItem,
-                                            getPropertyPrefix());
-            return;
-        }
-        super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
-                foreground, defaultTextIconGap);
-    }
-
-    static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
-                              JComponent c, Icon checkIcon, Icon arrowIcon,
-                              Color background, Color foreground,
-                              int defaultTextIconGap, JMenuItem menuItem, String prefix) {
-        // Save original graphics font and color
-        Font holdf = g.getFont();
-        Color holdc = g.getColor();
-
-        JMenuItem mi = (JMenuItem) c;
-        g.setFont(mi.getFont());
-
-        Rectangle viewRect = new Rectangle(0, 0, mi.getWidth(), mi.getHeight());
-        applyInsets(viewRect, mi.getInsets());
-
-        String acceleratorDelimiter =
-                UIManager.getString("MenuItem.acceleratorDelimiter");
-        if (acceleratorDelimiter == null) { acceleratorDelimiter = "+"; }
-        Font acceleratorFont = UIManager.getFont("MenuItem.acceleratorFont");
-        if (acceleratorFont == null) {
-            acceleratorFont = UIManager.getFont("MenuItem.font");
-        }
-
-        MenuItemLayoutHelper lh = new MenuItemLayoutHelper(mi, checkIcon,
-                arrowIcon, viewRect, defaultTextIconGap, acceleratorDelimiter,
-                mi.getComponentOrientation().isLeftToRight(), mi.getFont(),
-                acceleratorFont, MenuItemLayoutHelper.useCheckAndArrow(menuItem),
-                prefix);
-        MenuItemLayoutHelper.LayoutResult lr = lh.layoutMenuItem();
-
-        paintBackground(accessor, g, mi, background);
-        paintCheckIcon(g, lh, lr, holdc, foreground);
-        paintIcon(g, lh, lr, holdc);
-
-        if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
-            Rectangle rect = lr.getTextRect();
-
-            rect.x += lh.getAfterCheckIconGap();
-
-            lr.setTextRect(rect);
-        }
-        if (!lh.getText().isEmpty()) {
-            if (lh.getHtmlView() != null) {
-                // Text is HTML
-                lh.getHtmlView().paint(g, lr.getTextRect());
-            } else {
-                // Text isn't HTML
-                paintText(accessor, g, lh.getMenuItem(),
-                          lr.getTextRect(), lh.getText());
-            }
-        }
-        if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
-            Rectangle rect = lr.getAccRect();
-            rect.x += lh.getAfterCheckIconGap();
-            lr.setAccRect(rect);
-        }
-        paintAccText(g, lh, lr);
-        paintArrowIcon(g, lh, lr, foreground);
-
-        // Restore original graphics font and color
-        g.setColor(holdc);
-        g.setFont(holdf);
-    }
-
     /**
      * Method which renders the text of the current menu item.
      *

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,25 +130,6 @@ public final class WindowsMenuUI extends BasicMenuUI {
         hotTrackingOn = (obj instanceof Boolean) ? (Boolean)obj : true;
     }
 
-    /**
-     * Paint MenuItem.
-     */
-    protected void paintMenuItem(Graphics g, JComponent c,
-                              Icon checkIcon, Icon arrowIcon,
-                              Color background, Color foreground,
-                              int defaultTextIconGap) {
-        if (WindowsMenuItemUI.isVistaPainting()) {
-            WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon, arrowIcon,
-                                            background, foreground,
-                                            defaultTextIconGap, menuItem,
-                                            getPropertyPrefix());
-            return;
-        }
-        super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
-                                   foreground, defaultTextIconGap);
-    }
-
-
     /**
      * Draws the background of the menu.
      * @since 1.4

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import java.awt.Graphics;
 import java.awt.Rectangle;
 
 import javax.swing.ButtonModel;
-import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.plaf.ComponentUI;
@@ -75,23 +74,6 @@ public final class WindowsRadioButtonMenuItemUI extends BasicRadioButtonMenuItem
         super.paintBackground(g, menuItem, bgColor);
     }
 
-    /**
-     * Paint MenuItem.
-     */
-    protected void paintMenuItem(Graphics g, JComponent c,
-                                 Icon checkIcon, Icon arrowIcon,
-                                 Color background, Color foreground,
-                                 int defaultTextIconGap) {
-        if (WindowsMenuItemUI.isVistaPainting()) {
-            WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
-                    arrowIcon, background, foreground, defaultTextIconGap,
-                    menuItem, getPropertyPrefix());
-            return;
-        }
-        super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
-                foreground, defaultTextIconGap);
-    }
-
     /**
      * Method which renders the text of the current menu item.
      *

src/java.desktop/windows/classes/sun/awt/windows/AccessibleCaretLocationNotifier.java

@@ -1,173 +0,0 @@
-/*
- * Copyright 2024 JetBrains s.r.o.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.windows;
-
-import sun.awt.AWTAccessor;
-import sun.java2d.SunGraphicsEnvironment;
-
-import javax.swing.*;
-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
-import javax.swing.text.JTextComponent;
-import java.awt.*;
-import java.awt.im.InputMethodRequests;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.lang.ref.WeakReference;
-
-/**
- * Provides caret tracking support for assistive tools that don't work with Java Access Bridge.
- * Specifically, it's targeted for the built-in Windows Magnifier.
- * This class listens to caret change events of the currently focused JTextComponent
- * and forwards them to the native code, which then sends them as Win32 IAccessible events.
- * <p>
- * A typical high-level scenario of the interaction with the magnifier:
- * <ol>
- * <li>Magnifier sends a WM_GETOBJECT window message to get accessible content of the window.</li>
- * <li>The message is handled in AwtComponent native class (awt_Component.cpp),
- *     which calls {@link #startCaretNotifier}.</li>
- * <li>We start listening for keyboard focus change events.</li>
- * <li>If at some point focus gets to a {@link JTextComponent}, we subscribe to its caret events.</li>
- * <li>When the caret changes, we need to move the magnifier viewport to the new caret location.
- *     To achieve this, we create a Win32 IAccessible object for the caret (see AccessibleCaret.cpp)
- *     and send an event that its location was changed (EVENT_OBJECT_LOCATIONCHANGE).</li>
- * <li>Magnifier receives this event and sends the WM_GETOBJECT message with the OBJID_CARET argument
- *     to get the caret object and its location property. After that, it moves the viewport to the returned location.
- * </li>
- * <li>When the {@link JTextComponent} loses focus, we stop listening to caret events
- *     and release the IAccessible caret object.</li>
- * </ol>
- * </p>
- * <p>
- * The feature is enabled by default
- * and can be toggled by setting the sun.awt.windows.use.native.caret.accessibility.events property.
- * </p>
- */
-@SuppressWarnings("unused") // Used from the native side through JNI.
-class AccessibleCaretLocationNotifier implements PropertyChangeListener, CaretListener {
-    private volatile static AccessibleCaretLocationNotifier caretNotifier;
-    private static final boolean nativeCaretEventsEnabled =
-            Boolean.parseBoolean(System.getProperty("sun.awt.windows.use.native.caret.accessibility.events", "true"));
-
-    private WeakReference<JTextComponent> currentFocusedComponent;
-    private long currentHwnd;
-
-    @SuppressWarnings("unused") // Called from the native through JNI.
-    public static void startCaretNotifier(long hwnd) {
-        if (nativeCaretEventsEnabled && caretNotifier == null) {
-            SwingUtilities.invokeLater(() -> {
-                if (caretNotifier == null) {
-                    caretNotifier = new AccessibleCaretLocationNotifier(hwnd);
-                    KeyboardFocusManager cfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
-                    cfm.addPropertyChangeListener("focusOwner", caretNotifier);
-                    if (cfm.getFocusOwner() instanceof JTextComponent textComponent) {
-                        caretNotifier.propertyChange(new PropertyChangeEvent(caretNotifier, "focusOwner", null, textComponent));
-                    }
-                }
-            });
-        }
-    }
-
-    public AccessibleCaretLocationNotifier(long hwnd) {
-        currentHwnd = hwnd;
-    }
-
-    private static native void updateNativeCaretLocation(long hwnd, int x, int y, int width, int height);
-    private static native void releaseNativeCaret(long hwnd);
-
-    @Override
-    public void propertyChange(PropertyChangeEvent e) {
-        Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow();
-        if (w != null) {
-            WWindowPeer wp = AWTAccessor.getComponentAccessor().getPeer(w);
-            if (wp != null) {
-                long hwnd = wp.getHWnd();
-                if (currentHwnd != hwnd) {
-                    currentHwnd = hwnd;
-                }
-            }
-        }
-
-        Object newFocusedComponent = e.getNewValue();
-        if (currentFocusedComponent != null) {
-            JTextComponent currentComponentStrong = currentFocusedComponent.get();
-            if (currentComponentStrong != null && newFocusedComponent != currentComponentStrong) {
-                currentComponentStrong.removeCaretListener(this);
-                currentFocusedComponent.clear();
-                currentFocusedComponent = null;
-                releaseNativeCaret(currentHwnd);
-            }
-        }
-
-        if (newFocusedComponent instanceof JTextComponent textComponent) {
-            currentFocusedComponent = new WeakReference<>(textComponent);
-            textComponent.addCaretListener(this);
-            // Trigger the caret event when the text component receives focus to notify about the initial caret location
-            caretUpdate(new CaretEvent(textComponent) {
-                // Dot and mark won't be used, so we can set any values.
-                @Override
-                public int getDot() { return 0; }
-
-                @Override
-                public int getMark() { return 0; }
-            });
-        }
-    }
-
-    @Override
-    public void caretUpdate(CaretEvent e) {
-        if (!(e.getSource() instanceof JTextComponent textComponent)) {
-            return;
-        }
-
-        SwingUtilities.invokeLater(() -> {
-            if (!textComponent.isShowing()) return;
-            InputMethodRequests imr = textComponent.getInputMethodRequests();
-            if (imr == null) return;
-            Rectangle caretRectangle = imr.getTextLocation(null);
-            if (caretRectangle == null) return;
-            caretRectangle.width = 1;
-
-            Container parent = textComponent.getParent();
-            if (parent != null && parent.isShowing()) {
-                // Make sure we don't go outside of parent bounds, which can happen in the case of scrollable components.
-                Rectangle parentBounds = parent.getBounds();
-                parentBounds.setLocation(parent.getLocationOnScreen());
-
-                if (!parentBounds.contains(caretRectangle)) {
-                    caretRectangle = parentBounds.intersection(caretRectangle);
-                    if (caretRectangle.isEmpty()) return;
-                }
-            }
-
-            caretRectangle = SunGraphicsEnvironment.toDeviceSpaceAbs(caretRectangle);
-
-            updateNativeCaretLocation(AccessibleCaretLocationNotifier.this.currentHwnd,
-                    (int) caretRectangle.getX(), (int) caretRectangle.getY(),
-                    (int) caretRectangle.getWidth(), (int) caretRectangle.getHeight());
-        });
-    }
-}

src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java

@@ -831,11 +831,11 @@ public class D3DSurfaceData extends SurfaceData implements AccelSurface {
             if (sd.getPeer().getTarget() instanceof Window window) {
                 switch (D3DRenderQueue.getFramePresentedStatus()) {
                     case 1:
-                        AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.framesPresentRequested");
+                        AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.framesPresentRequested");
                         break;
                     case 0:
                     default:
-                        AWTAccessor.getWindowAccessor().incrementCounter(window, "java2d.native.framesPresentFailed");
+                        AWTAccessor.getWindowAccessor().bumpCounter(window, "java2d.native.framesPresentFailed");
                 }
             }
         }

src/java.desktop/windows/native/libawt/windows/AccessibleCaret.cpp

@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2024, JetBrains s.r.o.. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "AccessibleCaret.h"
-#include "debug_assert.h"       // DASSERT
-#include "sun_awt_windows_AccessibleCaretLocationNotifier.h"
-
-#include <atomic>               // std::atomic
-
-
-/**
- * This class implements Win32 IAccessible interface in a similar way to the system text caret.
- */
-
-static std::atomic<AccessibleCaret *> GLOBAL_INSTANCE{nullptr};
-
-AccessibleCaret* AccessibleCaret::getInstanceIfPresent() noexcept {
-    return GLOBAL_INSTANCE.load();
-}
-
-AccessibleCaret* AccessibleCaret::getOrCreateInstance() {
-    bool unused;
-    return AccessibleCaret::getOrCreateInstance(unused);
-}
-
-AccessibleCaret* AccessibleCaret::getOrCreateInstance(bool& instanceIsNew) {
-    instanceIsNew = false;
-
-    AccessibleCaret* result = GLOBAL_INSTANCE.load();
-
-    if (result == nullptr) {
-        AccessibleCaret* newInstance = new AccessibleCaret();
-
-        if (GLOBAL_INSTANCE.compare_exchange_strong(result, newInstance)) {
-            result = newInstance;
-            instanceIsNew = true;
-        } else {
-            DASSERT(result != nullptr);
-            delete newInstance;
-        }
-    }
-
-    DASSERT(result != nullptr);
-    return result;
-}
-
-bool AccessibleCaret::releaseInstanceIfPresent() {
-    AccessibleCaret* instance = GLOBAL_INSTANCE.exchange(nullptr);
-    if (instance != nullptr) {
-        instance->Release();
-        return true;
-    }
-    return false;
-}
-
-
-AccessibleCaret::AccessibleCaret()
-    : m_refCount(1), m_x(0), m_y(0), m_width(0), m_height(0) {
-    InitializeCriticalSection(&m_caretLocationLock);
-}
-
-AccessibleCaret::~AccessibleCaret() {
-    DeleteCriticalSection(&m_caretLocationLock);
-
-    // If the destroyed object is being referred by the singleton variable, the latter should be cleared.
-    // This case should never happen, but if it does, it's better not to leave a dangling pointer.
-    AccessibleCaret* self = this;
-    (void)GLOBAL_INSTANCE.compare_exchange_strong(self, nullptr);
-}
-
-
-// IUnknown methods
-IFACEMETHODIMP_(ULONG) AccessibleCaret::AddRef() {
-    return InterlockedIncrement(&m_refCount);
-}
-
-IFACEMETHODIMP_(ULONG) AccessibleCaret::Release() {
-    ULONG count = InterlockedDecrement(&m_refCount);
-    if (count == 0) {
-        delete this;
-    }
-    return count;
-}
-
-IFACEMETHODIMP AccessibleCaret::QueryInterface(REFIID riid, void **ppInterface) {
-    if (ppInterface == nullptr) {
-        return E_POINTER;
-    }
-
-    if (riid == IID_IUnknown || riid == IID_IDispatch || riid == IID_IAccessible) {
-        *ppInterface = static_cast<IAccessible *>(this);
-        AddRef();
-        return S_OK;
-    }
-
-    *ppInterface = nullptr;
-    return E_NOINTERFACE;
-}
-
-// IDispatch methods
-IFACEMETHODIMP AccessibleCaret::GetTypeInfoCount(UINT *pctinfo) {
-    return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibleCaret::GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo **pptinfo) {
-    return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibleCaret::GetIDsOfNames(REFIID riid, OLECHAR **rgszNames, UINT cNames, LCID lcid,
-                                              DISPID *rgdispid) {
-    return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibleCaret::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags,
-                                       DISPPARAMS *pdispparams, VARIANT *pvarResult, EXCEPINFO *pexcepinfo,
-                                       UINT *puArgErr) {
-    return E_NOTIMPL;
-}
-
-// IAccessible methods
-IFACEMETHODIMP AccessibleCaret::get_accParent(IDispatch **ppdispParent) {
-    if (ppdispParent == nullptr) {
-        return E_POINTER;
-    }
-    *ppdispParent = nullptr;
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accChildCount(long *pcountChildren) {
-    if (pcountChildren == nullptr) {
-        return E_POINTER;
-    }
-    *pcountChildren = 0;
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accChild(VARIANT varChild, IDispatch **ppdispChild) {
-    if (ppdispChild == nullptr) {
-        return E_POINTER;
-    }
-    *ppdispChild = nullptr;
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accName(VARIANT varChild, BSTR *pszName) {
-    if (pszName == nullptr) {
-        return E_POINTER;
-    }
-    *pszName = SysAllocString(L"Edit"); // Same name as the system caret.
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accValue(VARIANT varChild, BSTR *pszValue) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accDescription(VARIANT varChild, BSTR *pszDescription) {
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accRole(VARIANT varChild, VARIANT *pvarRole) {
-    if (pvarRole == nullptr) {
-        return E_POINTER;
-    }
-
-    pvarRole->vt = VT_I4;
-    pvarRole->lVal = ROLE_SYSTEM_CARET;
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accState(VARIANT varChild, VARIANT *pvarState) {
-    if (pvarState == nullptr) {
-        return E_POINTER;
-    }
-
-    pvarState->vt = VT_I4;
-    pvarState->lVal = 0; // The state without any flags, corresponds to "normal".
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accHelp(VARIANT varChild, BSTR *pszHelp) {
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accHelpTopic(BSTR *pszHelpFile, VARIANT varChild, long *pidTopic) {
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKeyboardShortcut) {
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accFocus(VARIANT *pvarChild) {
-    if (pvarChild == nullptr) {
-        return E_POINTER;
-    }
-
-    pvarChild->vt = VT_EMPTY;
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accSelection(VARIANT *pvarChildren) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::get_accDefaultAction(VARIANT varChild, BSTR *pszDefaultAction) {
-    return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibleCaret::accSelect(long flagsSelect, VARIANT varChild) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::accLocation(long *pxLeft, long *pyTop, long *pcxWidth, long *pcyHeight,
-                                            VARIANT varChild) {
-    if (pxLeft == nullptr || pyTop == nullptr || pcxWidth == nullptr || pcyHeight == nullptr) {
-        return E_POINTER;
-    }
-
-    EnterCriticalSection(&m_caretLocationLock);
-    *pxLeft = m_x;
-    *pyTop = m_y;
-    *pcxWidth = m_width;
-    *pcyHeight = m_height;
-    LeaveCriticalSection(&m_caretLocationLock);
-
-    return S_OK;
-}
-
-IFACEMETHODIMP AccessibleCaret::accNavigate(long navDir, VARIANT varStart, VARIANT *pvarEndUpAt) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::accHitTest(long xLeft, long yTop, VARIANT *pvarChild) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::accDoDefaultAction(VARIANT varChild) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-IFACEMETHODIMP AccessibleCaret::put_accName(VARIANT varChild, BSTR szName) {
-    return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibleCaret::put_accValue(VARIANT varChild, BSTR szValue) {
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-void AccessibleCaret::setLocation(long x, long y, long width, long height) {
-    EnterCriticalSection(&m_caretLocationLock);
-    m_x = x;
-    m_y = y;
-    m_width = width;
-    m_height = height;
-    LeaveCriticalSection(&m_caretLocationLock);
-}
-
-
-extern "C" {
-/*
- * Class:     sun_awt_windows_AccessibleCaretLocationNotifier
- * Method:    updateNativeCaretLocation
- * Signature: (JIIII)V
- */
-JNIEXPORT void JNICALL Java_sun_awt_windows_AccessibleCaretLocationNotifier_updateNativeCaretLocation(
-    JNIEnv *env, jclass jClass,
-    jlong jHwnd, jint x, jint y, jint width, jint height) {
-    HWND hwnd = reinterpret_cast<HWND>(jHwnd);
-
-    bool caretIsNew = false;
-    AccessibleCaret* caret = AccessibleCaret::getOrCreateInstance(caretIsNew);
-    if (caretIsNew) {
-        // Notify with Object ID "OBJID_CARET".
-        // After that, an assistive tool will send a WM_GETOBJECT message with this ID,
-        // and we can return the caret instance.
-        NotifyWinEvent(EVENT_OBJECT_CREATE, hwnd, OBJID_CARET, CHILDID_SELF);
-        NotifyWinEvent(EVENT_OBJECT_SHOW, hwnd, OBJID_CARET, CHILDID_SELF);
-    }
-    caret->setLocation(x, y, width, height);
-    NotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, hwnd, OBJID_CARET, CHILDID_SELF);
-}
-
-/*
- * Class:     sun_awt_windows_AccessibleCaretLocationNotifier
- * Method:    releaseNativeCaret
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_sun_awt_windows_AccessibleCaretLocationNotifier_releaseNativeCaret(
-    JNIEnv *env, jclass jClass, jlong jHwnd) {
-    if (AccessibleCaret::releaseInstanceIfPresent()) {
-        HWND hwnd = reinterpret_cast<HWND>(jHwnd);
-        NotifyWinEvent(EVENT_OBJECT_HIDE, hwnd, OBJID_CARET, CHILDID_SELF);
-        NotifyWinEvent(EVENT_OBJECT_DESTROY, hwnd, OBJID_CARET, CHILDID_SELF);
-    }
-}
-} /* extern "C" */

src/java.desktop/windows/native/libawt/windows/AccessibleCaret.h

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2024, JetBrains s.r.o.. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef ACCESSIBLECARET_H
-#define ACCESSIBLECARET_H
-
-#include <oleacc.h>
-#include <windows.h> // ULONG, CRITICAL_SECTION
-
-class AccessibleCaret : public IAccessible {
-public:
-    static AccessibleCaret* getInstanceIfPresent() noexcept;
-    static AccessibleCaret* getOrCreateInstance();
-    static AccessibleCaret* getOrCreateInstance(bool& instanceIsNew);
-    static bool releaseInstanceIfPresent();
-
-    // IUnknown methods.
-    IFACEMETHODIMP_(ULONG) AddRef();
-    IFACEMETHODIMP_(ULONG) Release();
-    IFACEMETHODIMP QueryInterface(REFIID riid, void **ppInterface);
-
-    // IDispatch methods.
-    IFACEMETHODIMP GetTypeInfoCount(UINT *pctinfo);
-    IFACEMETHODIMP GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo **pptinfo);
-    IFACEMETHODIMP GetIDsOfNames(REFIID riid, __in_ecount(cNames)
-                                 OLECHAR **rgszNames, UINT cNames, LCID lcid, DISPID *rgdispid);
-    IFACEMETHODIMP Invoke(DISPID dispidMember, REFIID riid, LCID lcid,
-                          WORD wFlags, DISPPARAMS *pdispparams, VARIANT *pvarResult,
-                          EXCEPINFO *pexcepinfo, UINT *puArgErr);
-
-    // IAccessible methods
-    IFACEMETHODIMP get_accParent(IDispatch **ppdispParent);
-    IFACEMETHODIMP get_accChildCount(long *pcountChildren);
-    IFACEMETHODIMP get_accChild(VARIANT varChild, IDispatch **ppdispChild);
-    IFACEMETHODIMP get_accName(VARIANT varChild, BSTR *pszName);
-    IFACEMETHODIMP get_accValue(VARIANT varChild, BSTR *pszValue);
-    IFACEMETHODIMP get_accDescription(VARIANT varChild, BSTR *pszDescription);
-    IFACEMETHODIMP get_accRole(VARIANT varChild, VARIANT *pvarRole);
-    IFACEMETHODIMP get_accState(VARIANT varChild, VARIANT *pvarState);
-    IFACEMETHODIMP get_accHelp(VARIANT varChild, BSTR *pszHelp);
-    IFACEMETHODIMP get_accHelpTopic(BSTR *pszHelpFile, VARIANT varChild, long *pidTopic);
-    IFACEMETHODIMP get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKeyboardShortcut);
-    IFACEMETHODIMP get_accFocus(VARIANT *pvarChild);
-    IFACEMETHODIMP get_accSelection(VARIANT *pvarChildren);
-    IFACEMETHODIMP get_accDefaultAction(VARIANT varChild, BSTR *pszDefaultAction);
-    IFACEMETHODIMP accSelect(long flagsSelect, VARIANT varChild);
-    IFACEMETHODIMP accLocation(long *pxLeft, long *pyTop, long *pcxWidth, long *pcyHeight, VARIANT varChild);
-    IFACEMETHODIMP accNavigate(long navDir, VARIANT varStart, VARIANT *pvarEndUpAt);
-    IFACEMETHODIMP accHitTest(long xLeft, long yTop, VARIANT *pvarChild);
-    IFACEMETHODIMP accDoDefaultAction(VARIANT varChild);
-    IFACEMETHODIMP put_accName(VARIANT varChild, BSTR szName);
-    IFACEMETHODIMP put_accValue(VARIANT varChild, BSTR szValue);
-
-    void setLocation(long x, long y, long width, long height);
-
-private:
-    AccessibleCaret();
-    ~AccessibleCaret();
-
-    ULONG m_refCount;
-    int m_x, m_y, m_width, m_height;
-    CRITICAL_SECTION m_caretLocationLock;
-};
-
-#endif //ACCESSIBLECARET_H

src/java.desktop/windows/native/libawt/windows/awt_Component.cpp

@@ -50,7 +50,6 @@
 #include "awt_Win32GraphicsDevice.h"
 #include "Hashtable.h"
 #include "ComCtl32Util.h"
-#include "AccessibleCaret.h"
 
 #include <Region.h>
 
@@ -2038,32 +2037,6 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
           if (::IsWindow(AwtWindow::GetModalBlocker(GetHWnd()))) {
               mr = mrConsume;
           }
-          break;
-      }
-      case WM_GETOBJECT:
-      {
-          // We've got a WM_GETOBJECT message which was likely sent by an assistive tool.
-          // Therefore, we can start generating native caret accessibility events.
-          DWORD objId = static_cast<DWORD>(static_cast<DWORD_PTR>(lParam));
-          if (objId == OBJID_CLIENT) {
-              JNIEnv *env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
-              if (env != nullptr) {
-                  jclass cls = env->FindClass("sun/awt/windows/AccessibleCaretLocationNotifier");
-                  if (cls != nullptr) {
-                      jmethodID mid = env->GetStaticMethodID(cls, "startCaretNotifier", "(J)V");
-                      if (mid != nullptr) {
-                          env->CallStaticVoidMethod(cls, mid, reinterpret_cast<jlong>(GetHWnd()));
-                      }
-                  }
-              }
-          } else if (objId == OBJID_CARET) {
-              AccessibleCaret *caret = AccessibleCaret::getInstanceIfPresent();
-              if (caret != nullptr) {
-                  retValue = LresultFromObject(IID_IAccessible, wParam, caret);
-                  mr = mrConsume;
-              }
-          }
-          break;
       }
     }
 
@@ -2477,7 +2450,7 @@ void AwtComponent::WmTouchHandler(const TOUCHINPUT& touchInput)
             const jint scrollModifiers = modifiers & ~java_awt_event_InputEvent_SHIFT_DOWN_MASK;
             SendMouseWheelEventFromTouch(p, scrollModifiers, sun_awt_event_TouchEvent_TOUCH_UPDATE, deltaY);
         }
-
+        
         const jint deltaX = ScaleDownX(static_cast<int>(m_lastTouchPoint.x - p.x));
         if (deltaX != 0) {
             const jint scrollModifiers = modifiers | java_awt_event_InputEvent_SHIFT_DOWN_MASK;

src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java

@@ -63,10 +63,8 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
     static {
         String s = VM.getSavedProperty("jdk.attach.allowAttachSelf");
         ALLOW_ATTACH_SELF = "".equals(s) || Boolean.parseBoolean(s);
-        // For now the default is false because it makes jstack hang with
-        // buffer overflow on lengthy outputs, which occur often in automatic tests.
         String s2 = VM.getSavedProperty("jdk.attach.allowStreamingOutput");
-        ALLOW_STREAMING_OUTPUT = "".equals(s2) || Boolean.parseBoolean(s2);
+        ALLOW_STREAMING_OUTPUT = !("false".equals(s2));
     }
 
     private final boolean selfAttach;

test/hotspot/jtreg/jbFdProblemList.txt

@@ -58,7 +58,7 @@ gc/stress/gcold/TestGCOldWithShenandoah.java#aggressive JBR-8563 windows-aarch64
 
 # :hotspot_runtime
 
-runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java#coh_no_cds JBR-6616,JBR-9488 windows-aarch64,macosx-26.0
+runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java#coh_no_cds JBR-6616 windows-aarch64
 runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java#no_coh_cds JBR-6616 windows-aarch64
 runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java#no_coh_no_cds JBR-6616 windows-aarch64
 runtime/ErrorHandling/ErrorFileOverwriteTest.java JBR-8524 windows-aarch64
@@ -89,12 +89,9 @@ vmTestbase/jit/misctests/JitBug1/JitBug1.java JBR-8801 linux-aarch64,windows-all
 vmTestbase/jit/misctests/Pi/Pi.java JBR-8854 linux-aarch64
 vmTestbase/jit/misctests/t5/t5.java JBR-8854 linux-aarch64
 vmTestbase/jit/misctests/putfield00802/putfield00802.java JBR-8801 linux-aarch64,windows-all
-
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi001/Multi001.java JBR-8545 windows-aarch64,windows-x64
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi002/TestDescription.java JBR-8927,JBR-8545 windows-aarch64,windows-x64
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi003/TestDescription.java JBR-8927,JBR-8545 windows-aarch64,windows-x64
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi004/TestDescription.java JBR-8927,JBR-8545 windows-aarch64,windows-x64
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription.java JBR-8927,JBR-8545 windows-aarch64,windows-x64
+vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi002/TestDescription.java JBR-8743 windows-all
+vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi003/TestDescription.java JBR-8743 windows-all
+vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi004/TestDescription.java JBR-8743,JBR-8744 windows-all
 
 #############################################################################