update exclude list on results of 21_b195.1 test runs

jb/generate-wakefield.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$1" ]]; then
-	SCANNER=wayland-scanner
-else
-	SCANNER="$1"
-fi
-
-set -ex
-
-"$SCANNER" client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
-"$SCANNER" private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c

make/autoconf/lib-wayland.m4

@@ -99,9 +99,6 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
     AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
       [specify directory for the vulkan include files])])
 
-    AC_ARG_WITH(vulkan-shader-compiler, [AS_HELP_STRING([--with-vulkan-shader-compiler],
-      [specify which shader compiler to use: glslc/glslangValidator])])
-
     if test "x$SUPPORTS_LIB_VULKAN" = xfalse; then
 
       if (test "x${with_vulkan}" != x && test "x${with_vulkan}" != xno) || \
@@ -123,6 +120,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
           AC_CHECK_HEADERS([${with_vulkan_include}/include/vulkan/vulkan.h],
             [ VULKAN_FOUND=yes
               VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${with_vulkan_include}/include -DVULKAN_ENABLED"
+              VULKAN_ENABLED=true
             ],
             [ AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}']) ]
           )
@@ -133,6 +131,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
           AC_CHECK_HEADERS([$VULKAN_SDK/include/vulkan/vulkan.h],
             [ VULKAN_FOUND=yes
               VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${VULKAN_SDK}/include -DVULKAN_ENABLED"
+              VULKAN_ENABLED=true
             ],
             [ VULKAN_FOUND=no; break ]
           )
@@ -143,6 +142,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
           AC_CHECK_HEADERS([vulkan/vulkan.h],
             [ VULKAN_FOUND=yes
               VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -DVULKAN_ENABLED"
+              VULKAN_ENABLED=true
             ],
             [ VULKAN_FOUND=no; break ]
           )
@@ -151,32 +151,11 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
         if test "x$VULKAN_FOUND" = xno; then
           HELP_MSG_MISSING_DEPENDENCY([vulkan])
           AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
-        else
-          # Find shader compiler - glslc or glslangValidator
-          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 -o"
-          fi
-
-          if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslangValidator) && \
-              test "x$SHADER_COMPILER" = x; then
-            UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
-            SHADER_COMPILER="$GLSLANG"
-            VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
-          fi
-
-          if test "x$SHADER_COMPILER" != x; then
-            VULKAN_ENABLED=true
-          else
-            AC_MSG_ERROR([Can't find shader compiler])
-          fi
         fi
       fi
     fi
   fi
   AC_SUBST(VULKAN_FLAGS)
-  AC_SUBST(VULKAN_SHADER_COMPILER)
   AC_SUBST(VULKAN_ENABLED)
   AC_SUBST(WAYLAND_CFLAGS)
   AC_SUBST(WAYLAND_LIBS)

make/autoconf/spec.gmk.in

@@ -482,7 +482,6 @@ A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
 WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
 WAYLAND_LIBS:=@WAYLAND_LIBS@
 VULKAN_FLAGS:=@VULKAN_FLAGS@
-VULKAN_SHADER_COMPILER:=@VULKAN_SHADER_COMPILER@
 VULKAN_ENABLED:=@VULKAN_ENABLED@
 
 # The lowest required version of macosx

make/conf/version-numbers.conf

@@ -39,4 +39,4 @@ DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=21
-DEFAULT_PROMOTED_VERSION_PRE=
+DEFAULT_PROMOTED_VERSION_PRE=ea

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

@@ -219,34 +219,6 @@ ifeq ($(call isTargetOs, windows)+$(ENABLE_HEADLESS_ONLY)+$(A11Y_NVDA_ANNOUNCING
   TARGETS += $(COPY_NVDA_DEPENDENCIES)
 endif
 
-# Compile Vulkan shaders
-define compile-spirv
-  $(call MakeTargetDir)
-  $(VULKAN_SHADER_COMPILER) '$(call DecodeSpace, $@)' '$(call DecodeSpace, $<)'
-endef
-spirv-name = $(strip $1).h
-
-ifeq ($(VULKAN_ENABLED), true)
-  $(eval $(call SetupCopyFiles, COMPILE_VULKAN_SHADERS, \
-      SRC := $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan, \
-      FILES := $(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan), \
-      DEST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop/vulkan/spirv, \
-      MACRO := compile-spirv, \
-      NAME_MACRO := spirv-name, \
-  ))
-  VULKAN_SHADER_LIST = $(SUPPORT_OUTPUTDIR)/headers/java.desktop/vulkan/shader_list.h
-  $(VULKAN_SHADER_LIST): $(COMPILE_VULKAN_SHADERS)
-	> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	$(foreach f, $(patsubst $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan/%,%,$(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan)), \
-	  $(ECHO) SHADER_ENTRY\($(subst .,$(COMMA),$(subst /,_,$f))\) >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	  $(ECHO) '#ifdef INCLUDE_BYTECODE' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	  $(ECHO) '#include "spirv/$f.h"' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	  $(ECHO) BYTECODE_END >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	  $(ECHO) '#endif' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
-	)
-  $(BUILD_LIBAWT): $(VULKAN_SHADER_LIST)
-endif
-
 TARGETS += $(BUILD_LIBAWT)
 
 ################################################################################
@@ -382,7 +354,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
         common/font \
         common/java2d/wl \
         common/java2d/vulkan \
-        libvmahpp \
         #
 
     # Enable 'wakefield' extension for java.awt.Robot support
@@ -430,8 +401,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
         DISABLED_WARNINGS_CXX_gcc := undef, \
         DISABLED_WARNINGS_clang := parentheses format undef \
             logical-op-parentheses format-nonliteral int-conversion, \
-        DISABLED_WARNINGS_gcc_VKMemory.cpp := missing-field-initializers implicit-fallthrough parentheses, \
-        DISABLED_WARNINGS_clang_VKMemory.cpp := missing-field-initializers implicit-fallthrough parentheses, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN) \
             -L$(INSTALL_LIBRARIES_HERE), \
@@ -691,10 +660,12 @@ ifeq ($(call isTargetOs, windows), true)
 else ifeq ($(call isTargetOs, macosx), true)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c \
+      fontpath.c \
       lcdglyph.c \
       lcdglyphDW.cpp
 else
-  LIBFONTMANAGER_EXCLUDE_FILES += lcdglyph.c \
+  LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
+      lcdglyph.c \
       lcdglyphDW.cpp
 endif
 

src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp

@@ -168,7 +168,7 @@ void DowncallStubGenerator::generate() {
   assert(_abi._shadow_space_bytes == 0, "not expecting shadow space on AArch64");
   allocated_frame_size += arg_shuffle.out_arg_bytes();
 
-  bool should_save_return_value = !_needs_return_buffer;
+  bool should_save_return_value = !_needs_return_buffer && _needs_transition;
   RegSpiller out_reg_spiller(_output_registers);
   int spill_offset = -1;
 

src/hotspot/cpu/ppc/downcallLinker_ppc.cpp

@@ -165,7 +165,7 @@ void DowncallStubGenerator::generate() {
   int parameter_save_area_slots = MAX2(_input_registers.length(), 8);
   int allocated_frame_size = frame::native_abi_minframe_size + parameter_save_area_slots * BytesPerWord;
 
-  bool should_save_return_value = !_needs_return_buffer;
+  bool should_save_return_value = !_needs_return_buffer && _needs_transition;
   RegSpiller out_reg_spiller(_output_registers);
   int spill_offset = -1;
 

src/hotspot/cpu/riscv/downcallLinker_riscv.cpp

@@ -165,7 +165,7 @@ void DowncallStubGenerator::generate() {
   assert(_abi._shadow_space_bytes == 0, "not expecting shadow space on RISCV64");
   allocated_frame_size += arg_shuffle.out_arg_bytes();
 
-  bool should_save_return_value = !_needs_return_buffer;
+  bool should_save_return_value = !_needs_return_buffer && _needs_transition;
   RegSpiller out_reg_spiller(_output_registers);
   int spill_offset = -1;
 

src/hotspot/cpu/x86/downcallLinker_x86_64.cpp

@@ -166,7 +166,7 @@ void DowncallStubGenerator::generate() {
   allocated_frame_size += arg_shuffle.out_arg_bytes();
 
   // when we don't use a return buffer we need to spill the return value around our slow path calls
-  bool should_save_return_value = !_needs_return_buffer;
+  bool should_save_return_value = !_needs_return_buffer && _needs_transition;
   RegSpiller out_reg_spiller(_output_registers);
   int spill_rsp_offset = -1;
 

src/hotspot/share/gc/z/zPhysicalMemory.cpp

@@ -309,9 +309,7 @@ bool ZPhysicalMemoryManager::commit(ZPhysicalMemory& pmem) {
     const size_t committed = _backing.commit(segment.start(), segment.size());
 
     // Register with NMT
-    if (committed > 0) {
-      ZNMT::commit(segment.start(), committed);
-    }
+    ZNMT::commit(segment.start(), committed);
 
     // Register committed segment
     if (!pmem.commit_segment(i, committed)) {
@@ -337,9 +335,7 @@ bool ZPhysicalMemoryManager::uncommit(ZPhysicalMemory& pmem) {
     const size_t uncommitted = _backing.uncommit(segment.start(), segment.size());
 
     // Unregister with NMT
-    if (uncommitted > 0) {
-      ZNMT::uncommit(segment.start(), uncommitted);
-    }
+    ZNMT::uncommit(segment.start(), uncommitted);
 
     // Deregister uncommitted segment
     if (!pmem.uncommit_segment(i, uncommitted)) {

src/hotspot/share/jfr/support/jfrIntrinsics.cpp

@@ -71,7 +71,7 @@ void* JfrIntrinsicSupport::write_checkpoint(JavaThread* jt) {
   return JfrJavaEventWriter::event_writer(jt);
 }
 
-void* JfrIntrinsicSupport::return_lease(JavaThread* jt) {
+void JfrIntrinsicSupport::return_lease(JavaThread* jt) {
   DEBUG_ONLY(assert_precondition(jt);)
   ThreadStateTransition::transition_from_java(jt, _thread_in_native);
   assert(jt->jfr_thread_local()->has_java_event_writer(), "invariant");
@@ -79,7 +79,6 @@ void* JfrIntrinsicSupport::return_lease(JavaThread* jt) {
   JfrJavaEventWriter::flush(jt->jfr_thread_local()->java_event_writer(), 0, 0, jt);
   assert(jt->jfr_thread_local()->shelved_buffer() == nullptr, "invariant");
   ThreadStateTransition::transition_from_native(jt, _thread_in_Java);
-  return nullptr;
 }
 
 void JfrIntrinsicSupport::load_barrier(const Klass* klass) {

src/hotspot/share/jfr/support/jfrIntrinsics.hpp

@@ -37,7 +37,7 @@
 class JfrIntrinsicSupport : AllStatic {
  public:
   static void* write_checkpoint(JavaThread* jt);
-  static void* return_lease(JavaThread* jt);
+  static void return_lease(JavaThread* jt);
   static void load_barrier(const Klass* klass);
   static address epoch_address();
   static address signal_address();

src/hotspot/share/opto/compile.cpp

@@ -3992,6 +3992,8 @@ bool Compile::final_graph_reshaping() {
 
       // Recheck with a better notion of 'required_outcnt'
       if (n->outcnt() != required_outcnt) {
+        DEBUG_ONLY( n->dump_bfs(1, 0, "-"); );
+        assert(false, "malformed control flow");
         record_method_not_compilable("malformed control flow");
         return true;            // Not all targets reachable!
       }

src/hotspot/share/opto/superword.cpp

@@ -2196,18 +2196,6 @@ bool SuperWord::profitable(Node_List* p) {
       }
     }
   }
-  if (p0->is_CMove()) {
-    // Verify that CMove has a matching Bool pack
-    BoolNode* bol = p0->in(1)->as_Bool();
-    if (bol == nullptr || my_pack(bol) == nullptr) {
-      return false;
-    }
-    // Verify that Bool has a matching Cmp pack
-    CmpNode* cmp = bol->in(1)->as_Cmp();
-    if (cmp == nullptr || my_pack(cmp) == nullptr) {
-      return false;
-    }
-  }
   return true;
 }
 

src/hotspot/share/prims/jvmtiExport.cpp

@@ -378,6 +378,17 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
         return JNI_EVERSION;  // unsupported major version number
       }
   }
+  if (Continuations::enabled()) {
+    // Virtual threads support. There is a performance impact when VTMS transitions are enabled.
+    if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) {
+      if (!JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+        ThreadInVMfromNative __tiv(JavaThread::current());
+        JvmtiEnvBase::enable_virtual_threads_notify_jvmti();
+      }
+    } else {
+      JvmtiVTMSTransitionDisabler::set_VTMS_notify_jvmti_events(true);
+    }
+  }
 
   if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) {
     JavaThread* current_thread = JavaThread::current();
@@ -388,26 +399,12 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
 
     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
     *penv = jvmti_env->jvmti_external();  // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
-
-    if (Continuations::enabled()) {
-      // Virtual threads support for agents loaded into running VM.
-      // There is a performance impact when VTMS transitions are enabled.
-      if (!JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-        JvmtiEnvBase::enable_virtual_threads_notify_jvmti();
-      }
-    }
     return JNI_OK;
 
   } else if (JvmtiEnv::get_phase() == JVMTI_PHASE_ONLOAD) {
     // not live, no thread to transition
     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
     *penv = jvmti_env->jvmti_external();  // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
-
-    if (Continuations::enabled()) {
-      // Virtual threads support for agents loaded at startup.
-      // There is a performance impact when VTMS transitions are enabled.
-      JvmtiVTMSTransitionDisabler::set_VTMS_notify_jvmti_events(true);
-    }
     return JNI_OK;
 
   } else {

src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java

@@ -1107,9 +1107,10 @@ public final class StringConcatFactory {
         MethodHandle mh = MethodHandles.dropArguments(newString(), 2, ttypes);
 
         long initialLengthCoder = INITIAL_CODER;
+        String lastFragment = "";
         pos = 0;
         for (String fragment : fragments) {
-            initialLengthCoder = JLA.stringConcatMix(initialLengthCoder, fragment);
+            lastFragment = fragment;
 
             if (ttypes.length <= pos) {
                 break;
@@ -1117,15 +1118,14 @@ public final class StringConcatFactory {
 
             Class<?> ttype = ttypes[pos];
             // (long,byte[],ttype) -> long
-            MethodHandle prepender = prepender(fragment.isEmpty() ? null : fragment, ttype);
+            MethodHandle prepender = prepender(lastFragment.isEmpty() ? null : fragment, ttype);
+            initialLengthCoder = JLA.stringConcatMix(initialLengthCoder, fragment);
             // (byte[],long,ttypes...) -> String (unchanged)
             mh = MethodHandles.filterArgumentsWithCombiner(mh, 1, prepender,1, 0, 2 + pos);
 
             pos++;
         }
 
-        String lastFragment = fragments.getLast();
-        initialLengthCoder -= lastFragment.length();
         MethodHandle newArrayCombinator = lastFragment.isEmpty() ? newArray() :
                 newArrayWithSuffix(lastFragment);
         // (long,ttypes...) -> String

src/java.base/share/classes/java/text/MessageFormat.java

@@ -390,19 +390,11 @@ public class MessageFormat extends Format {
      * Patterns and their interpretation are specified in the
      * <a href="#patterns">class description</a>.
      *
-     * @implSpec The default implementation throws a
-     * {@code NullPointerException} if {@code locale} is {@code null}
-     * either during the creation of the {@code MessageFormat} object or later
-     * when {@code format()} is called by a {@code MessageFormat}
-     * instance with a null locale and the implementation utilizes a
-     * locale-dependent subformat.
-     *
      * @param pattern the pattern for this message format
      * @param locale the locale for this message format
      * @throws    IllegalArgumentException if the pattern is invalid
      * @throws    NullPointerException if {@code pattern} is
-     *            {@code null} or {@code locale} is {@code null} and the
-     *            implementation uses a locale-dependent subformat.
+     *            {@code null}
      * @since 1.4
      */
     public MessageFormat(String pattern, Locale locale) {
@@ -851,10 +843,7 @@ public class MessageFormat extends Format {
      * @throws    IllegalArgumentException if an argument in the
      *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
-     * @throws    NullPointerException if {@code result} is {@code null} or
-     *            if the {@code MessageFormat} instance that calls this method
-     *            has locale set to null, and the implementation
-     *            uses a locale-dependent subformat.
+     * @throws    NullPointerException if {@code result} is {@code null}
      */
     public final StringBuffer format(Object[] arguments, StringBuffer result,
                                      FieldPosition pos)
@@ -900,10 +889,7 @@ public class MessageFormat extends Format {
      * @throws    IllegalArgumentException if an argument in the
      *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
-     * @throws    NullPointerException if {@code result} is {@code null} or
-     *            if the {@code MessageFormat} instance that calls this method
-     *            has locale set to null, and the implementation
-     *            uses a locale-dependent subformat.
+     * @throws    NullPointerException if {@code result} is {@code null}
      */
     public final StringBuffer format(Object arguments, StringBuffer result,
                                      FieldPosition pos)

src/java.base/share/classes/java/time/Duration.java

@@ -1419,8 +1419,7 @@ public final class Duration
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param otherDuration the other duration to compare to, not null
-     * @return the comparator value, that is less than zero if this duration is less than {@code otherDuration},
-     *          zero if they are equal, greater than zero if this duration is greater than {@code otherDuration}
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(Duration otherDuration) {

src/java.base/share/classes/java/time/Instant.java

@@ -1272,11 +1272,8 @@ public final class Instant
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param otherInstant  the other instant to compare to, not null
-     * @return the comparator value, that is less than zero if this instant is before {@code otherInstant},
-     *          zero if they are equal, or greater than zero if this instant is after {@code otherInstant}
+     * @return the comparator value, negative if less, positive if greater
      * @throws NullPointerException if otherInstant is null
-     * @see #isBefore
-     * @see #isAfter
      */
     @Override
     public int compareTo(Instant otherInstant) {

src/java.base/share/classes/java/time/LocalDate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1988,11 +1988,7 @@ public final class LocalDate
      * chronology is also considered, see {@link java.time.chrono.ChronoLocalDate#compareTo}.
      *
      * @param other  the other date to compare to, not null
-     * @return the comparator value, that is the comparison of this local date with
-     *          the {@code other} local date and this chronology with the {@code other} chronology,
-     *          in order, returning the first non-zero result, and otherwise returning zero
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override  // override for Javadoc and performance
     public int compareTo(ChronoLocalDate other) {

src/java.base/share/classes/java/time/LocalDateTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -1807,11 +1807,7 @@ public final class LocalDateTime
      * chronology is also considered, see {@link ChronoLocalDateTime#compareTo}.
      *
      * @param other  the other date-time to compare to, not null
-     * @return the comparator value, that is the comparison of this local date-time with
-     *          the {@code other} local date-time and this chronology with the {@code other} chronology,
-     *          in order, returning the first non-zero result, and otherwise returning zero
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override  // override for Javadoc and performance
     public int compareTo(ChronoLocalDateTime<?> other) {

src/java.base/share/classes/java/time/LocalTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1531,10 +1531,7 @@ public final class LocalTime
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other time to compare to, not null
-     * @return the comparator value, that is less than zero if this is before {@code other},
-     *          zero if they are equal, or greater than zero if this is after {@code other}
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(LocalTime other) {

src/java.base/share/classes/java/time/MonthDay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -675,10 +675,7 @@ public final class MonthDay
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other month-day to compare to, not null
-     * @return the comparator value, that is less than zero if this is before {@code other},
-     *          zero if they are equal, greater than zero if this is after {@code other}
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(MonthDay other) {

src/java.base/share/classes/java/time/OffsetDateTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -169,8 +169,7 @@ public final class OffsetDateTime
      *
      * @param datetime1  the first date-time to compare, not null
      * @param datetime2  the other date-time to compare to, not null
-     * @return the comparator value, that is less than zero if {@code datetime1} is before {@code datetime2},
-     *          zero if they are equal, greater than zero if {@code datetime1} is after {@code datetime2}
+     * @return the comparator value, negative if less, positive if greater
      */
     private static int compareInstant(OffsetDateTime datetime1, OffsetDateTime datetime2) {
         if (datetime1.getOffset().equals(datetime2.getOffset())) {
@@ -1802,10 +1801,7 @@ public final class OffsetDateTime
      * consistent with {@code equals()}.
      *
      * @param other  the other date-time to compare to, not null
-     * @return the comparator value, that is the comparison with the {@code other}'s instant, if they are not equal;
-     *          and if equal to the {@code other}'s instant, the comparison of the {@code other}'s local date-time
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(OffsetDateTime other) {

src/java.base/share/classes/java/time/OffsetTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -1281,11 +1281,7 @@ public final class OffsetTime
      * use {@link ChronoField#NANO_OF_DAY} as a comparator.
      *
      * @param other  the other time to compare to, not null
-     * @return the comparator value, that is the comparison of the UTC equivalent {@code other} instant,
-     *          if they are not equal, and if the UTC equivalent {@code other} instant is equal,
-     *          the comparison of this local time with {@code other} local time
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(OffsetTime other) {

src/java.base/share/classes/java/time/Year.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1018,10 +1018,7 @@ public final class Year
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other year to compare to, not null
-     * @return the comparator value, that is less than zero if this is before {@code other},
-     *          zero if they are equal, or greater than zero if this is after {@code other}
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(Year other) {

src/java.base/share/classes/java/time/YearMonth.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -1122,10 +1122,7 @@ public final class YearMonth
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other year-month to compare to, not null
-     * @return the comparator value, that is less than zero if this is before {@code other},
-     *          zero if they are equal, greater than zero if this is after {@code other}
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(YearMonth other) {

src/java.base/share/classes/java/time/ZoneOffset.java

@@ -714,9 +714,7 @@ public final class ZoneOffset
      * The comparison is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other date to compare to, not null
-     * @return the comparator value, that is less than zero if this totalSeconds is
-     *          less than {@code other} totalSeconds, zero if they are equal,
-     *          greater than zero if this totalSeconds is greater than {@code other} totalSeconds
+     * @return the comparator value, negative if less, positive if greater
      * @throws NullPointerException if {@code other} is null
      */
     @Override

src/java.base/share/classes/java/time/chrono/AbstractChronology.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -656,7 +656,7 @@ public abstract class AbstractChronology implements Chronology {
      * Subclasses must compare any additional state that they store.
      *
      * @param other  the other chronology to compare to, not null
-     * @return the comparator value, that is this ID string compared with the {@code other}'s ID string
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     public int compareTo(Chronology other) {

src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -700,11 +700,7 @@ public interface ChronoLocalDate
      * This default implementation performs the comparison defined above.
      *
      * @param other  the other date to compare to, not null
-     * @return the comparator value, that is the comparison of this local date with
-     *          the {@code other} local date and this chronology with the {@code other} chronology,
-     *          in order, returning the first non-zero result, and otherwise returning zero
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     default int compareTo(ChronoLocalDate other) {

src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -500,11 +500,7 @@ public interface ChronoLocalDateTime<D extends ChronoLocalDate>
      * This default implementation performs the comparison defined above.
      *
      * @param other  the other date-time to compare to, not null
-     * @return the comparator value, that is the comparison of this local date-time with
-     *          the {@code other} local date-time and this chronology with the {@code other} chronology,
-     *          in order, returning the first non-zero result, and otherwise returning zero
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     default int compareTo(ChronoLocalDateTime<?> other) {

src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -569,11 +569,7 @@ public interface ChronoZonedDateTime<D extends ChronoLocalDate>
      * This default implementation performs the comparison defined above.
      *
      * @param other  the other date-time to compare to, not null
-     * @return the comparator value, that is the comparison of this with the {@code other} values for the instant,
-     *          the local date-time, the zone ID, and the chronology, in order, returning the first non-zero result,
-     *          and otherwise returning zero
-     * @see #isBefore
-     * @see #isAfter
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     default int compareTo(ChronoZonedDateTime<?> other) {

src/java.base/share/classes/java/time/chrono/Chronology.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -807,9 +807,7 @@ public interface Chronology extends Comparable<Chronology> {
      * It is "consistent with equals", as defined by {@link Comparable}.
      *
      * @param other  the other chronology to compare to, not null
-     * @return the comparator value, that is this ID string compared with the {@code other}'s ID string
-     *          unless the ID strings are equal and
-     *          the chronology distinguishes instances using additional information
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
     int compareTo(Chronology other);

src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -399,13 +399,12 @@ public final class ZoneOffsetTransition
      * This compares the instants of each transition.
      * The offsets are ignored, making this order inconsistent with equals.
      *
-     * @param otherTransition  the transition to compare to, not null
-     * @return the comparator value, that is the comparison of this transition instant
-     *          with {@code otherTransition} instant
+     * @param transition  the transition to compare to, not null
+     * @return the comparator value, negative if less, positive if greater
      */
     @Override
-    public int compareTo(ZoneOffsetTransition otherTransition) {
-        return Long.compare(epochSecond, otherTransition.epochSecond);
+    public int compareTo(ZoneOffsetTransition transition) {
+        return Long.compare(epochSecond, transition.epochSecond);
     }
 
     //-----------------------------------------------------------------------

src/java.base/share/classes/sun/launcher/resources/launcher_de.properties

@@ -30,12 +30,12 @@ java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym f\u00FCr die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist,\n                  um upgradef\u00E4hige Module im Laufzeitimage zu ersetzen. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. \
-Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  \
+L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           F\u00FChrt keine Aktion aus. Ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:security\n                      Zeigt alle Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:all\n                      Zeigt alle Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:properties\n                      Zeigt Sicherheitseigenschaften an und f\u00E4hrt fort\n    -XshowSettings:security:providers\n                      Zeigt statische Sicherheitsprovidereinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:tls\n                      Zeigt TLS-bezogene Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n                      Die tats\u00E4chliche Gr\u00F6\u00DFe \
-kann auf ein Vielfaches der\n                      Systemseitengr\u00F6\u00DFe aufgerundet werden, wenn f\u00FCr das Betriebssystem erforderlich.\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug            F\u00FChrt nichts aus. Wird aus Gr\u00FCnden der Abw\u00E4rtskompatibilit\u00E4t bereitgestellt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n                      Die tats\u00E4chliche Gr\u00F6\u00DFe kann auf ein Vielfaches der\n                      Systemseitengr\u00F6\u00DFe aufgerundet werden, wenn f\u00FCr das Betriebssystem erforderlich.\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> \
+kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr macOS spezifisch:\n    -XstartOnFirstThread\n                      F\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen au\u00DFer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol au\u00DFer Kraft\n\n

src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties

@@ -30,14 +30,14 @@ java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B
 java.launcher.opt.hotspot    =\    {0}\t  \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059  [\u975E\u63A8\u5968]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u8981\u7D20\u3092{0}\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3001\u5404\u8981\u7D20\u306F\u6B21\u3078\u306E\u30D5\u30A1\u30A4\u30EB\u30FB\u30D1\u30B9\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u6B21\u306E\u3044\u305A\u308C\u304B\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30E9JAR\u307E\u305F\u306F\u5C55\u958B\u5F62\u5F0F\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n    --upgrade-module-path <module path>...\n                  \u8981\u7D20\u3092{0}\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3001\u5404\u8981\u7D20\u306F\u6B21\u3078\u306E\u30D5\u30A1\u30A4\u30EB\u30FB\u30D1\u30B9\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3001\u6B21\u306E\u3082\u306E\u3092\u7F6E\u304D\u63DB\u3048\u307E\u3059:\n                  \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u6B21\u306E\u3044\u305A\u308C\u304B\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30E9JAR\u307E\u305F\u306F\u5C55\u958B\u5F62\u5F0F\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \
-\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \
-\u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    --disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \
+\u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  \
+(\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    --disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093\u3002\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u305F\u3081\u3001\u975E\u63A8\u5968\u306B\u306A\u308A\u307E\u3057\u305F\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
-\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security\n                      \u3059\u3079\u3066\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:all\n                      \u3059\u3079\u3066\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:properties\n                      \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:providers\n                      \u9759\u7684\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:tls\n                      TLS\u95A2\u9023\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u5B9F\u969B\u306E\u30B5\u30A4\u30BA\u306F\u3001\u6B21\u306E\u500D\u6570\u306B\u5207\u308A\u4E0A\u3052\u3089\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059: \n                      \u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u306E\u8981\u4EF6\u306B\u5FDC\u3058\u305F\u30B7\u30B9\u30C6\u30E0\u30FB\u30DA\u30FC\u30B8\u30FB\u30B5\u30A4\u30BA\u3002\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \
-\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u884C\u3044\u307E\u305B\u3093\u3002\u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
+\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u5B9F\u969B\u306E\u30B5\u30A4\u30BA\u306F\u3001\u6B21\u306E\u500D\u6570\u306B\u5207\u308A\u4E0A\u3052\u3089\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059: \n                      \u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u306E\u8981\u4EF6\u306B\u5FDC\u3058\u305F\u30B7\u30B9\u30C6\u30E0\u30FB\u30DA\u30FC\u30B8\u30FB\u30B5\u30A4\u30BA\u3002\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n        \
+              \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n

src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties

@@ -30,12 +30,12 @@ java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  {0} \u5206\u9694\u7684\u5143\u7D20\u5217\u8868\uFF0C\u6BCF\u4E2A\u5143\u7D20\u90FD\u662F\n                  \u6A21\u5757\u6216\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u7684\u6587\u4EF6\u8DEF\u5F84\u3002\u6BCF\u4E2A\u6A21\u5757\u90FD\u662F\n                  \u6A21\u5757\u5316 JAR \u6216\u5C55\u5F00\u7684\u6A21\u5757\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  {0} \u5206\u9694\u7684\u5143\u7D20\u5217\u8868\uFF0C\u6BCF\u4E2A\u5143\u7D20\u90FD\u662F\n                  \u6A21\u5757\u6216\u5305\u542B\u6A21\u5757\uFF08\u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\n                  \u53EF\u5347\u7EA7\u6A21\u5757\uFF09\u7684\u76EE\u5F55\u7684\u6587\u4EF6\u8DEF\u5F84\u3002\u6BCF\u4E2A\u6A21\u5757\u90FD\u662F\n                  \u6A21\u5757\u5316 JAR \u6216\u5C55\u5F00\u7684\u6A21\u5757\u76EE\u5F55\u3002\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \
-\u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    --disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
+\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    --disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\uFF1B\u5DF2\u8FC7\u65F6\uFF0C\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security\n                      \u663E\u793A\u6240\u6709\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:all\n                      \u663E\u793A\u6240\u6709\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:properties\n                      \
-\u663E\u793A\u5B89\u5168\u5C5E\u6027\u5E76\u7EE7\u7EED\n    -XshowSettings:security:providers\n                      \u663E\u793A\u9759\u6001\u5B89\u5168\u63D0\u4F9B\u65B9\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:tls\n                      \u663E\u793A\u4E0E TLS \u76F8\u5173\u7684\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n                      \u5B9E\u9645\u5927\u5C0F\u53EF\u4EE5\u820D\u5165\u5230\n                      \u64CD\u4F5C\u7CFB\u7EDF\u8981\u6C42\u7684\u7CFB\u7EDF\u9875\u9762\u5927\u5C0F\u7684\u500D\u6570\u3002\n    -Xverify          \u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002\u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n                      \
+\u5B9E\u9645\u5927\u5C0F\u53EF\u4EE5\u820D\u5165\u5230\n                      \u64CD\u4F5C\u7CFB\u7EDF\u8981\u6C42\u7684\u7CFB\u7EDF\u9875\u9762\u5927\u5C0F\u7684\u500D\u6570\u3002\n    -Xverify          \u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<path to icon file>\n                     \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n

src/java.base/share/man/java.1

@@ -36,7 +36,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "JAVA" "1" "2023" "JDK 21" "JDK Commands"
+.TH "JAVA" "1" "2023" "JDK 21-ea" "JDK Commands"
 .hy
 .SH NAME
 .PP
@@ -530,27 +530,26 @@ The value \[dq]disabled\[dq] disables finalization, so that no
 finalizers are invoked.
 .TP
 \f[V]--module-path\f[R] \f[I]modulepath\f[R]... or \f[V]-p\f[R] \f[I]modulepath\f[R]
-Specifies where to find application modules with a list of path
-elements.
-The elements of a module path can be a file path to a module or a
-directory containing modules.
-Each module is either a modular JAR or an exploded-module directory.
+Specifies where to find application modules with a list of path elements.
+The elements of a module path can be a file path to a module or a directory
+containing modules. Each module is either a modular JAR or an
+exploded-module directory.
 .RS
 .PP
-On Windows, semicolons (\f[V];\f[R]) separate path elements in this
-list; on other platforms it is a colon (\f[V]:\f[R]).
+On Windows, semicolons (\f[V];\f[R]) separate path elements in this list;
+on other platforms it is a colon (\f[V]:\f[R]).
 .RE
 .TP
 \f[V]--upgrade-module-path\f[R] \f[I]modulepath\f[R]...
-Specifies where to find module replacements of upgradeable modules in
-the runtime image with a list of path elements.
-The elements of a module path can be a file path to a module or a
-directory containing modules.
-Each module is either a modular JAR or an exploded-module directory.
+Specifies where to find module replacements of upgradeable modules in the
+runtime image with a list of path elements.
+The elements of a module path can be a file path to a module or a directory
+containing modules. Each module is either a modular JAR or an
+exploded-module directory.
 .RS
 .PP
-On Windows, semicolons (\f[V];\f[R]) separate path elements in this
-list; on other platforms it is a colon (\f[V]:\f[R]).
+On Windows, semicolons (\f[V];\f[R]) separate path elements in this list;
+on other platforms it is a colon (\f[V]:\f[R]).
 .RE
 .TP
 \f[V]--add-modules\f[R] \f[I]module\f[R][\f[V],\f[R]\f[I]module\f[R]...]
@@ -1306,7 +1305,6 @@ By default this option is disabled.
 .TP
 \f[V]-XX:FlightRecorderOptions=\f[R]\f[I]parameter\f[R]\f[V]=\f[R]\f[I]value\f[R] (or) \f[V]-XX:FlightRecorderOptions:\f[R]\f[I]parameter\f[R]\f[V]=\f[R]\f[I]value\f[R]
 Sets the parameters that control the behavior of JFR.
-Multiple parameters can be specified by separating them with a comma.
 .RS
 .PP
 The following list contains the available JFR
@@ -1372,6 +1370,9 @@ By default, the local buffer size is set to 8 kilobytes, with a minimum
 value of 4 kilobytes.
 Overriding this parameter could reduce performance and is not
 recommended.
+.PP
+You can specify values for multiple parameters by separating them with a
+comma.
 .RE
 .TP
 \f[V]-XX:LargePageSizeInBytes=\f[R]\f[I]size\f[R]
@@ -1658,9 +1659,6 @@ written when the recording is stopped, for example:
 \f[V]/home/user/recordings/recording.jfr\f[R]
 .IP \[bu] 2
 \f[V]c:\[rs]recordings\[rs]recording.jfr\f[R]
-.PP
-If %p and/or %t is specified in the filename, it expands to the
-JVM\[aq]s PID and the current timestamp, respectively.
 .RE
 .TP
 \f[V]name=\f[R]\f[I]identifier\f[R]

src/java.base/share/man/keytool.1

@@ -36,7 +36,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "KEYTOOL" "1" "2023" "JDK 21" "JDK Commands"
+.TH "KEYTOOL" "1" "2023" "JDK 21-ea" "JDK Commands"
 .hy
 .SH NAME
 .PP
@@ -447,7 +447,7 @@ single-element certificate chain.
 When the \f[V]-signer\f[R] option is specified, a new certificate is
 generated and signed by the designated signer and stored as a
 multiple-element certificate chain (containing the generated certificate
-itself, and the signer\[aq]s certificate chain).
+itself, and the signer?s certificate chain).
 The certificate chain and private key are stored in a new keystore entry
 that is identified by its alias.
 .PP
@@ -467,8 +467,8 @@ specified.
 The \f[V]-signer\f[R] value specifies the alias of a
 \f[V]PrivateKeyEntry\f[R] for the signer that already exists in the
 keystore.
-This option is used to sign the certificate with the signer\[aq]s
-private key.
+This option is used to sign the certificate with the signer?s private
+key.
 This is especially useful for key agreement algorithms (i.e.
 the \f[V]-keyalg\f[R] value is \f[V]XDH\f[R], \f[V]X25519\f[R],
 \f[V]X448\f[R], or \f[V]DH\f[R]) as these keys cannot be used for
@@ -476,7 +476,7 @@ digital signatures, and therefore a self-signed certificate cannot be
 created.
 .PP
 The \f[V]-signerkeypass\f[R] value specifies the password of the
-signer\[aq]s private key.
+signer?s private key.
 It can be specified if the private key of the signer entry is protected
 by a password different from the store password.
 .PP

src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java

@@ -62,7 +62,6 @@ public class AquaCaret extends DefaultCaret
     public void deinstall(final JTextComponent c) {
         c.removePropertyChangeListener(this);
         super.deinstall(c);
-        mFocused = false;
     }
 
     @Override

src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties

@@ -60,7 +60,7 @@ FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
 FileChooser.openTitle.textAndMnemonic=\u958B\u304F
 FileChooser.newFolderExistsError.textAndMnemonic=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
 FileChooser.chooseButton.textAndMnemonic=\u9078\u629E
-FileChooser.chooseButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059
+FileChooser.chooseButtonToolTip.textAndMnemonic=\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059
 
 FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
 FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0

src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java

@@ -51,6 +51,7 @@ public class CInputMethod extends InputMethodAdapter {
     private volatile Component fAwtFocussedComponent;
     private LWComponentPeer<?, ?> fAwtFocussedComponentPeer;
     private boolean isActive;
+    private boolean isTemporarilyDeactivated;
 
     private static Map<TextAttribute, Integer>[] sHighlightStyles;
 
@@ -235,10 +236,12 @@ public class CInputMethod extends InputMethodAdapter {
      */
     public void activate() {
         isActive = true;
+        isTemporarilyDeactivated = false;
     }
 
     public void deactivate(boolean isTemporary) {
         isActive = false;
+        isTemporarilyDeactivated = isTemporary;
     }
 
     /**
@@ -266,7 +269,7 @@ public class CInputMethod extends InputMethodAdapter {
     public void removeNotify() {
         if (fAwtFocussedComponentPeer != null) {
             long modelPtr = getNativeViewPtr(fAwtFocussedComponentPeer);
-            nativeEndComposition(modelPtr, fAwtFocussedComponent);
+            nativeEndComposition(modelPtr);
             nativeNotifyPeer(modelPtr, null);
         }
 
@@ -281,10 +284,10 @@ public class CInputMethod extends InputMethodAdapter {
      * to talk to when responding to key events.
      */
     protected void setAWTFocussedComponent(Component component) {
-        if (component == null || component == fAwtFocussedComponent) {
+        if ((isTemporarilyDeactivated && component == null) || component == fAwtFocussedComponent) {
             // Sometimes input happens for the natively unfocused window
             // (e.g. in case of system emoji picker),
-            // so we don't reset last focused component on focus lost.
+            // so we don't reset last focused component on temporary focus lost.
             return;
         }
 
@@ -352,7 +355,7 @@ public class CInputMethod extends InputMethodAdapter {
      */
     public void endComposition() {
         if (fAwtFocussedComponentPeer != null)
-            nativeEndComposition(getNativeViewPtr(fAwtFocussedComponentPeer), fAwtFocussedComponent);
+            nativeEndComposition(getNativeViewPtr(fAwtFocussedComponentPeer));
     }
 
     /**
@@ -560,21 +563,18 @@ public class CInputMethod extends InputMethodAdapter {
     /**
      * Frequent callbacks from NSTextInput.  I think we're supposed to commit it here?
      */
-    private synchronized void unmarkText(Component component) {
-        if (component == null) {
-            component = fAwtFocussedComponent;
-        }
-        if (fCurrentText == null || component == null) return;
+    private synchronized void unmarkText() {
+        if (fCurrentText == null || fAwtFocussedComponent == null) return;
 
         TextHitInfo theCaret = TextHitInfo.afterOffset(fCurrentTextLength);
         TextHitInfo visiblePosition = theCaret;
-        InputMethodEvent event = new InputMethodEvent(component,
+        InputMethodEvent event = new InputMethodEvent(fAwtFocussedComponent,
                                                       InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
                                                       fCurrentText.getIterator(),
                                                       fCurrentTextLength,
                                                       theCaret,
                                                       visiblePosition);
-        LWCToolkit.postEvent(LWCToolkit.targetToAppContext(component), event);
+        LWCToolkit.postEvent(LWCToolkit.targetToAppContext(fAwtFocussedComponent), event);
         fCurrentText = null;
         fCurrentTextAsString = null;
         fCurrentTextLength = 0;
@@ -807,7 +807,7 @@ public class CInputMethod extends InputMethodAdapter {
     // Note that if nativePeer isn't something that normally accepts keystrokes (i.e., a CPanel)
     // these calls will be ignored.
     private native void nativeNotifyPeer(long nativePeer, CInputMethod imInstance);
-    private native void nativeEndComposition(long nativePeer, Component component);
+    private native void nativeEndComposition(long nativePeer);
     private native void nativeHandleEvent(LWComponentPeer<?, ?> peer, AWTEvent event);
 
     // Returns the locale of the active input method.

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h

@@ -67,6 +67,6 @@
 
 // Input method-related events
 - (void)setInputMethod:(jobject)inputMethod;
-- (void)abandonInput:(jobject) component;
+- (void)abandonInput;
 
 @end

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

@@ -393,7 +393,7 @@ static void debugPrintNSEvent(NSEvent* event, const char* comment) {
                 case kVK_End:
                     // Abandon input to reset IM and unblock input after
                     // canceling input accented symbols
-                    [self abandonInput:nil];
+                    [self abandonInput];
                     break;
             }
         }
@@ -1157,7 +1157,7 @@ static jclass jc_CInputMethod = NULL;
     // Abandon input to reset IM and unblock input after entering accented
     // symbols
 
-    [self abandonInput:nil];
+    [self abandonInput];
 }
 
 + (void)keyboardInputSourceChanged:(NSNotification *)notification
@@ -1251,11 +1251,7 @@ static jclass jc_CInputMethod = NULL;
     }
 }
 
-- (void) unmarkText {
-    [self unmarkText:nil];
-}
-
-- (void) unmarkText:(jobject) component
+- (void) unmarkText
 {
 #ifdef IM_DEBUG
     fprintf(stderr, "AWTView InputMethod Selector Called : [unmarkText]\n");
@@ -1268,8 +1264,8 @@ static jclass jc_CInputMethod = NULL;
     // unmarkText cancels any input in progress and commits it to the text field.
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     GET_CIM_CLASS();
-    DECLARE_METHOD(jm_unmarkText, jc_CInputMethod, "unmarkText", "(Ljava/awt/Component;)V");
-    (*env)->CallVoidMethod(env, fInputMethodLOCKABLE, jm_unmarkText, component);
+    DECLARE_METHOD(jm_unmarkText, jc_CInputMethod, "unmarkText", "()V");
+    (*env)->CallVoidMethod(env, fInputMethodLOCKABLE, jm_unmarkText);
     CHECK_EXCEPTION();
 }
 
@@ -1530,14 +1526,14 @@ static jclass jc_CInputMethod = NULL;
                                              object:nil];
 }
 
-- (void)abandonInput:(jobject) component
+- (void)abandonInput
 {
 #ifdef IM_DEBUG
     fprintf(stderr, "AWTView InputMethod Selector Called : [abandonInput]\n");
 #endif // IM_DEBUG
 
     [ThreadUtilities performOnMainThread:@selector(markedTextAbandoned:) on:[NSInputManager currentInputManager] withObject:self waitUntilDone:YES];
-    [self unmarkText:component];
+    [self unmarkText];
 }
 
 /********************************   END NSTextInputClient Protocol   ********************************/

src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m

@@ -118,6 +118,13 @@ static void initializeInputMethodController() {
     [view setInputMethod:inputMethod]; // inputMethod is a GlobalRef or null to disable.
 }
 
++ (void) _nativeEndComposition:(AWTView *)view {
+    if (view == nil) return;
+
+    [view abandonInput];
+}
+
+
 @end
 
 /*
@@ -179,21 +186,16 @@ JNI_COCOA_EXIT(env);
 /*
  * Class:     sun_lwawt_macosx_CInputMethod
  * Method:    nativeEndComposition
- * Signature: (JLjava/awt/Component;)V
+ * Signature: (J)V
  */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeEndComposition
-(JNIEnv *env, jobject this, jlong nativePeer, jobject component)
+(JNIEnv *env, jobject this, jlong nativePeer)
 {
 JNI_COCOA_ENTER(env);
-    AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
-    if (!view) return;
-    jobject componentRef = (*env)->NewGlobalRef(env, component);
-    [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
-       [view abandonInput:componentRef];
-       if (componentRef) {
-            JNIEnv *env = [ThreadUtilities getJNIEnv];
-            (*env)->DeleteGlobalRef(env, componentRef);
-       }
+   AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
+
+   [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
+        [CInputMethod _nativeEndComposition:view];
     }];
 
 JNI_COCOA_EXIT(env);

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ComboBoxAccessibility.m

@@ -53,7 +53,7 @@ static jmethodID sjm_getAccessibleName = NULL;
         [value release];
         value = nil;
     }
-    value = [[CommonComponentAccessibility createWithAccessible:axSelectedChild withEnv:env withView:fView] retain];
+    value = [CommonComponentAccessibility createWithAccessible:axSelectedChild withEnv:env withView:fView];
     return value;
 }
 

src/java.desktop/share/classes/com/jetbrains/desktop/JBRApiModule.java

@@ -62,7 +62,7 @@ public class JBRApiModule {
                     .withStatic("deriveFontWithFeatures", "deriveFont", "java.awt.Font")
                     .withStatic("getFeaturesAsString", "getFeaturesAsString", "com.jetbrains.desktop.FontExtensions")
                 .clientProxy("java.awt.Font$Features", "com.jetbrains.FontExtensions$Features")
-                .service("com.jetbrains.WindowMove", "java.awt.Window$WindowMoveService")
+                .service("com.jetbrains.WindowMove", "sun.awt.X11.XWindowPeer$WindowMoveService")
         ;
     }
 }

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

@@ -1963,7 +1963,7 @@ public class Font implements java.io.Serializable
      *
      * @serial
      */
-    private int fontSerializedDataVersion = 2;
+    private int fontSerializedDataVersion = 1;
 
     /**
      * Writes default serializable fields to a stream.
@@ -2032,14 +2032,10 @@ public class Font implements java.io.Serializable
             } catch (Throwable t) {
                 throw new IOException(t);
             } finally {
-                fRequestedAttributes = null; // don't need it any more
-            }
-        }
-
-        if (features == null) {
-            features = new TreeMap<>();
+            fRequestedAttributes = null; // don't need it any more
         }
     }
+    }
 
     /**
      * Returns the number of glyphs in this {@code Font}. Glyph codes

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

@@ -59,7 +59,6 @@ import java.util.List;
 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.Vector;
@@ -4258,67 +4257,6 @@ public class Window extends Container implements Accessible {
         }
     }
 
-    private interface WindowMovePeer {
-        void startMovingWindowTogetherWithMouse(Window window, int mouseButton);
-    }
-
-    private interface WindowMovePeerX11 extends WindowMovePeer {
-        WindowMovePeerX11 INSTANCE = (WindowMovePeerX11) JBRApi.internalServiceBuilder(MethodHandles.lookup())
-                .withStatic("startMovingWindowTogetherWithMouse",
-                        "startMovingWindowTogetherWithMouse",
-                        "sun.awt.X11.XWindowPeer")
-                .build();
-    }
-
-    private interface WindowMovePeerWayland extends WindowMovePeer {
-        WindowMovePeerWayland INSTANCE = (WindowMovePeerWayland) JBRApi.internalServiceBuilder(MethodHandles.lookup())
-                .withStatic("startMovingWindowTogetherWithMouse",
-                        "startMovingWindowTogetherWithMouse",
-                        "sun.awt.wl.WLComponentPeer")
-                .build();
-    }
-
-    private static class WindowMoveService {
-        WindowMovePeer windowMovePeer;
-
-        WindowMoveService() {
-            var toolkit = Toolkit.getDefaultToolkit();
-            var ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-            if (toolkit == null || ge == null) {
-                throw new JBRApi.ServiceNotAvailableException("Supported only with a Toolkit present");
-            }
-
-            boolean isWayland = objectIsInstanceOf(toolkit, "sun.awt.wl.WLToolkit");
-            if (isWayland) {
-                if (!objectIsInstanceOf(ge,"sun.awt.wl.WLGraphicsEnvironment")) {
-                    throw new JBRApi.ServiceNotAvailableException("On Wayland, supported only with WLGraphicsEnvironment");
-                }
-            } else {
-                if (!objectIsInstanceOf(toolkit, "sun.awt.X11.XToolkit")
-                        || !objectIsInstanceOf(ge, "sun.awt.X11GraphicsEnvironment")) {
-                    throw new JBRApi.ServiceNotAvailableException("Supported only with XToolkit and X11GraphicsEnvironment");
-                }
-            }
-
-            if (isWayland) {
-                windowMovePeer = WindowMovePeerWayland.INSTANCE;
-            } else {
-                // This will throw if the service is not supported by the underlying WM
-                windowMovePeer = WindowMovePeerX11.INSTANCE;
-            }
-        }
-
-        boolean objectIsInstanceOf(Object o, String className) {
-            Objects.requireNonNull(o);
-            return o.getClass().getName().equals(className);
-        }
-
-        void startMovingTogetherWithMouse(Window window, int mouseButton) {
-            Objects.requireNonNull(window);
-            windowMovePeer.startMovingWindowTogetherWithMouse(window, mouseButton);
-        }
-    }
-
     // ************************** JBR stuff *******************************
 
     private volatile boolean ignoreMouseEvents;

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

@@ -478,16 +478,6 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
                 y = 0 - yOffset - pmSize.height;   // Otherwise drop 'up'
             }
         }
-        // Note that the y position may be later adjusted to fit the menu into the screen if possible.
-        // However, the code that does it (JPopupMenu.adjustPopupLocationToFitScreen) has no idea which screen
-        // to fit into, and determines it by the position calculated here, so we need to make sure it's on
-        // the correct screen, otherwise the menu may appear on the wrong screen (JDK-6415065).
-        if (position.y + y < screenBounds.y) { // Above the current screen?
-            y = screenBounds.y - position.y; // Fit into the screen, relative to our origin.
-        }
-        if (position.y + y >= screenBounds.y + screenBounds.height) { // Below the current screen?
-            y = screenBounds.y + screenBounds.height - 1 - position.y; // Fit into the screen, relative to our origin.
-        }
         return new Point(x,y);
     }
 

src/java.desktop/share/classes/sun/swing/SwingUtilities2.java

@@ -1010,11 +1010,7 @@ public class SwingUtilities2 {
             } else {
                 layout = new TextLayout(iterator, frc);
             }
-            if (Boolean.TRUE.equals(Toolkit.getDefaultToolkit().getDesktopProperty("jb.swing.avoid.text.layout"))) {
-                g2d.drawString(iterator, x, y);
-            } else {
-                layout.draw(g2d, x, y);
-            }
+            layout.draw(g2d, x, y);
             retVal = layout.getAdvance();
         }
 

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

@@ -1,8 +0,0 @@
-#version 450
-
-layout(location = 0) in vec4 inColor;
-layout(location = 0) out vec4 outColor;
-
-void main() {
-    outColor = inColor;
-}

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

@@ -1,21 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push {
-    vec2 invViewport2; // 2.0/viewport
-} push;
-
-vec4 colors[3] = vec4[](
-vec4(1,0,0,1),
-vec4(0,1,0,1),
-vec4(0,0,1,1)
-);
-
-layout(location = 0) in vec2 inPosition;
-
-layout(location = 0) out vec4 outColor;
-
-void main() {
-    outColor = colors[gl_VertexIndex % 3];
-    gl_Position = vec4(inPosition * push.invViewport2 - 1.0, 0.0, 1.0);
-    gl_PointSize = 1.0f;
-}

src/java.desktop/share/native/common/java2d/vulkan/VKBase.cpp

@@ -27,18 +27,16 @@
 #include "VKBase.h"
 #include <Trace.h>
 #include <set>
-#if defined(DEBUG)
-#include <csignal>
-#endif
 
 #define VALIDATION_LAYER_NAME "VK_LAYER_KHRONOS_validation"
-static const uint32_t REQUIRED_VULKAN_VERSION = VK_MAKE_API_VERSION(0, 1, 2, 0);
+static const uint32_t REQUIRED_VULKAN_VERSION = VK_MAKE_API_VERSION(0, 1, 0, 0);
 
 std::unique_ptr<VKGraphicsEnvironment> VKGraphicsEnvironment::_ge_instance = nullptr;
 
-// ========== Graphics environment ==========
+// ========== Vulkan instance ==========
 
 #if defined(DEBUG)
+static vk::raii::DebugUtilsMessengerEXT debugMessenger = nullptr;
 
 static VkBool32 debugCallback(
         VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
@@ -59,13 +57,127 @@ static VkBool32 debugCallback(
 
     J2dRlsTraceLn(level, data->pMessage);
 
-    if (messageSeverity == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
-        raise(SIGABRT);
-    }
+    // TODO if (messageSeverity == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) ABORT?
     return 0;
 }
 #endif
 
+// ========== Vulkan device ==========
+
+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
+extern struct wl_display *wl_display;
+#endif
+
+class PhysicalDevice : vk::raii::PhysicalDevice {
+    friend class VKDevice;
+
+    bool _supported = false;
+    std::vector<const char*> _enabled_layers, _enabled_extensions;
+    int _queue_family = -1;
+public:
+
+    int queue_family() const {
+        return _queue_family;
+    }
+
+    std::vector<const char *> & enabled_layers()  {
+        return _enabled_layers;
+    }
+
+    std::vector<const char *> & enabled_extensions()  {
+        return _enabled_extensions;
+    }
+
+    explicit PhysicalDevice(vk::raii::PhysicalDevice&& handle) : vk::raii::PhysicalDevice(std::move(handle)) {
+        const auto& properties = getProperties();
+        const auto& queueFamilies = getQueueFamilyProperties();
+
+        J2dRlsTrace5(J2D_TRACE_INFO, "Vulkan: Found device %s (%d.%d.%d, %s)\n",
+                     (const char*) properties.deviceName,
+                     VK_API_VERSION_MAJOR(properties.apiVersion),
+                     VK_API_VERSION_MINOR(properties.apiVersion),
+                     VK_API_VERSION_PATCH(properties.apiVersion),
+                     vk::to_string(properties.deviceType).c_str());
+        if (properties.apiVersion < REQUIRED_VULKAN_VERSION) {
+            J2dRlsTrace(J2D_TRACE_INFO, "    Unsupported Vulkan version\n");
+            return;
+        }
+
+        // Check supported queue families.
+        for (unsigned int i = 0; i < queueFamilies.size(); i++) {
+            const auto& family = queueFamilies[i];
+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
+            bool presentationSupported = getWaylandPresentationSupportKHR(i, *wl_display);
+#endif
+            char logFlags[5] {
+                    family.queueFlags & vk::QueueFlagBits::eGraphics ? 'G' : '-',
+                    family.queueFlags & vk::QueueFlagBits::eCompute ? 'C' : '-',
+                    family.queueFlags & vk::QueueFlagBits::eTransfer ? 'T' : '-',
+                    family.queueFlags & vk::QueueFlagBits::eSparseBinding ? 'S' : '-',
+                    presentationSupported ? 'P' : '-'
+            };
+            J2dRlsTrace3(J2D_TRACE_INFO, "    %d queues in family (%.*s)\n", family.queueCount, 5, logFlags);
+
+            // TODO use compute workloads? Separate transfer-only DMA queue?
+            if (_queue_family == -1 && (family.queueFlags & vk::QueueFlagBits::eGraphics) && presentationSupported) {
+                _queue_family = i;
+            }
+        }
+
+        if (_queue_family == -1) {
+            J2dRlsTrace(J2D_TRACE_INFO, "    No suitable queue\n");
+            return;
+        }
+
+        // Populate maps and log supported layers & extensions.
+        std::set<std::string> layers, extensions;
+        J2dRlsTrace(J2D_TRACE_VERBOSE, "    Supported device layers:\n");
+        for (auto& l : enumerateDeviceLayerProperties()) {
+            J2dRlsTrace1(J2D_TRACE_VERBOSE, "        %s\n", (char*) l.layerName);
+            layers.emplace((char*) l.layerName);
+        }
+        J2dRlsTrace(J2D_TRACE_VERBOSE, "    Supported device extensions:\n");
+        for (auto& e : enumerateDeviceExtensionProperties(nullptr)) {
+            J2dRlsTrace1(J2D_TRACE_VERBOSE, "        %s\n", (char*) e.extensionName);
+            extensions.emplace((char*) e.extensionName);
+        }
+
+        // Check required layers & extensions.
+        _enabled_extensions.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+        bool requiredNotFound = false;
+        for (auto e : _enabled_extensions) {
+            if (extensions.find(e) == extensions.end()) {
+                J2dRlsTrace1(J2D_TRACE_INFO, "    Required device extension not supported: %s\n", (char*) e);
+                requiredNotFound = true;
+            }
+        }
+        if (requiredNotFound) return;
+
+        // Validation layer
+#ifdef DEBUG
+        if (layers.find(VALIDATION_LAYER_NAME) != layers.end()) {
+            _enabled_layers.push_back(VALIDATION_LAYER_NAME);
+        } else {
+            J2dRlsTrace1(J2D_TRACE_INFO, "    %s device layer is not supported\n", VALIDATION_LAYER_NAME);
+        }
+#endif
+
+        // This device is supported
+        _supported = true;
+    }
+
+    operator bool() const {
+        vk::PhysicalDevice handle = **this;
+        return handle && _supported;
+    }
+
+    uint32_t getMaxImageDimension2D() {
+        const auto& properties = getProperties();
+        return properties.limits.maxImageDimension2D;
+    }
+
+};
+
 VKGraphicsEnvironment *VKGraphicsEnvironment::graphics_environment() {
     if (!_ge_instance) {
         try {
@@ -80,7 +192,7 @@ VKGraphicsEnvironment *VKGraphicsEnvironment::graphics_environment() {
 }
 
 VKGraphicsEnvironment::VKGraphicsEnvironment() :
-    _vk_context(), _vk_instance(nullptr), _default_device(nullptr) {
+    _vk_context(), _vk_instance(nullptr), _default_device(-1) {
     // Load library.
     uint32_t version = _vk_context.enumerateInstanceVersion();
     J2dRlsTrace3(J2D_TRACE_INFO, "Vulkan: Available (%d.%d.%d)\n",
@@ -119,9 +231,9 @@ VKGraphicsEnvironment::VKGraphicsEnvironment() :
     }
     // Configure validation
 #ifdef DEBUG
-    std::array<vk::ValidationFeatureEnableEXT, 2> enabledValidationFeatures = {
-//            vk::ValidationFeatureEnableEXT::eGpuAssisted, // TODO GPU assisted validation is available only from Vulkan 1.1
-//            vk::ValidationFeatureEnableEXT::eGpuAssistedReserveBindingSlot,
+    std::array<vk::ValidationFeatureEnableEXT, 4> enabledValidationFeatures = {
+            vk::ValidationFeatureEnableEXT::eGpuAssisted,
+            vk::ValidationFeatureEnableEXT::eGpuAssistedReserveBindingSlot,
             vk::ValidationFeatureEnableEXT::eBestPractices,
             vk::ValidationFeatureEnableEXT::eSynchronizationValidation
     };
@@ -160,7 +272,7 @@ VKGraphicsEnvironment::VKGraphicsEnvironment() :
     // Create debug messenger
 #if defined(DEBUG)
     if (pNext) {
-        _debugMessenger = vk::raii::DebugUtilsMessengerEXT(_vk_instance, vk::DebugUtilsMessengerCreateInfoEXT {
+        debugMessenger = vk::raii::DebugUtilsMessengerEXT(_vk_instance, vk::DebugUtilsMessengerCreateInfoEXT {
                 /*flags*/           {},
                 /*messageSeverity*/ vk::DebugUtilsMessageSeverityFlagBitsEXT::eError |
                                     vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning |
@@ -177,21 +289,26 @@ VKGraphicsEnvironment::VKGraphicsEnvironment() :
 
     // Find suitable devices.
     for (auto &handle: _vk_instance.enumeratePhysicalDevices()) {
-        VKDevice device {*_vk_instance, std::move(handle)};
-        if (device.supported()) {
-            _devices.push_back(std::make_unique<VKDevice>(std::move(device)));
+        PhysicalDevice physicalDevice{std::move(handle)};
+        if (physicalDevice) { // Supported.
+            _physical_devices.push_back(std::move(physicalDevice));
         }
     }
 
-    if (_devices.empty()) {
+    if (_physical_devices.empty()) {
         throw std::runtime_error("Vulkan: No suitable device found");
     }
     // Create virtual device for a physical device.
     // TODO system property for manual choice of GPU
     // TODO integrated/discrete presets
     // TODO performance/power saving mode switch on the fly?
-    _default_device = &*_devices[0]; // TODO pick first just to check hat virtual device creation works
-    _default_device->init();
+    _default_physical_device = 0; // TODO pick first just to check hat virtual device creation works
+    _devices.push_back(std::move(VKDevice{_physical_devices[_default_physical_device]}));
+    _default_device = 0;
+}
+
+uint32_t VKGraphicsEnvironment::max_texture_size() {
+    return _physical_devices[_default_physical_device].getMaxImageDimension2D();
 }
 
 vk::raii::Instance& VKGraphicsEnvironment::vk_instance() {
@@ -203,215 +320,31 @@ void VKGraphicsEnvironment::dispose() {
 }
 
 VKDevice& VKGraphicsEnvironment::default_device() {
-    return *_default_device;
+    return _devices[_default_device];
 }
 
-// ========== Vulkan device ==========
 
-#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
-extern struct wl_display *wl_display;
-#endif
-
-VKDevice::VKDevice(vk::Instance instance, vk::raii::PhysicalDevice&& handle) :
-        vk::raii::Device(nullptr), vk::raii::PhysicalDevice(nullptr), _instance(instance) {
-    auto featuresChain = handle.getFeatures2<vk::PhysicalDeviceFeatures2,
-                                             vk::PhysicalDeviceVulkan11Features,
-                                             vk::PhysicalDeviceVulkan12Features>();
-    const auto& features10 = featuresChain.get<vk::PhysicalDeviceFeatures2>().features;
-    const auto& features11 = featuresChain.get<vk::PhysicalDeviceVulkan11Features>();
-    const auto& features12 = featuresChain.get<vk::PhysicalDeviceVulkan12Features>();
-
-    auto propertiesChain = handle.getProperties2<vk::PhysicalDeviceProperties2,
-                                               vk::PhysicalDeviceVulkan11Properties,
-                                               vk::PhysicalDeviceVulkan12Properties>();
-    const auto& properties10 = propertiesChain.get<vk::PhysicalDeviceProperties2>().properties;
-    const auto& properties11 = propertiesChain.get<vk::PhysicalDeviceVulkan11Properties>();
-    const auto& properties12 = propertiesChain.get<vk::PhysicalDeviceVulkan12Properties>();
-
-    const auto& queueFamilies = handle.getQueueFamilyProperties();
-
-    _name = (const char*) properties10.deviceName;
-    J2dRlsTrace5(J2D_TRACE_INFO, "Vulkan: Found device %s (%d.%d.%d, %s)\n",
-                 (const char*) properties10.deviceName,
-                 VK_API_VERSION_MAJOR(properties10.apiVersion),
-                 VK_API_VERSION_MINOR(properties10.apiVersion),
-                 VK_API_VERSION_PATCH(properties10.apiVersion),
-                 vk::to_string(properties10.deviceType).c_str());
-
-    // Check API version.
-    if (properties10.apiVersion < REQUIRED_VULKAN_VERSION) {
-        J2dRlsTrace(J2D_TRACE_INFO, "    Unsupported Vulkan version\n");
-        return;
-    }
-
-    // Check supported features.
-    if (!features10.logicOp) {
-        J2dRlsTrace(J2D_TRACE_INFO, "    Logic op not supported\n");
-        return;
-    }
-    if (!features12.timelineSemaphore) {
-        J2dRlsTrace(J2D_TRACE_INFO, "    Timeline semaphore not supported\n");
-        return;
-    }
-
-    // Check supported queue families.
-    for (unsigned int i = 0; i < queueFamilies.size(); i++) {
-        const auto& family = queueFamilies[i];
-#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
-        bool presentationSupported = handle.getWaylandPresentationSupportKHR(i, *wl_display);
-#endif
-        char logFlags[5] {
-                family.queueFlags & vk::QueueFlagBits::eGraphics ? 'G' : '-',
-                family.queueFlags & vk::QueueFlagBits::eCompute ? 'C' : '-',
-                family.queueFlags & vk::QueueFlagBits::eTransfer ? 'T' : '-',
-                family.queueFlags & vk::QueueFlagBits::eSparseBinding ? 'S' : '-',
-                presentationSupported ? 'P' : '-'
-        };
-        J2dRlsTrace3(J2D_TRACE_INFO, "    %d queues in family (%.*s)\n", family.queueCount, 5, logFlags);
-
-        // TODO use compute workloads? Separate transfer-only DMA queue?
-        if (_queue_family == -1 && (family.queueFlags & vk::QueueFlagBits::eGraphics) && presentationSupported) {
-            _queue_family = i;
-        }
-    }
-
-    if (_queue_family == -1) {
-        J2dRlsTrace(J2D_TRACE_INFO, "    No suitable queue\n");
-        return;
-    }
-
-    // Populate maps and log supported layers & extensions.
-    std::set<std::string> layers, extensions;
-    J2dRlsTrace(J2D_TRACE_VERBOSE, "    Supported device layers:\n");
-    for (auto& l : handle.enumerateDeviceLayerProperties()) {
-        J2dRlsTrace1(J2D_TRACE_VERBOSE, "        %s\n", (char*) l.layerName);
-        layers.emplace((char*) l.layerName);
-    }
-    J2dRlsTrace(J2D_TRACE_VERBOSE, "    Supported device extensions:\n");
-    for (auto& e : handle.enumerateDeviceExtensionProperties(nullptr)) {
-        J2dRlsTrace1(J2D_TRACE_VERBOSE, "        %s\n", (char*) e.extensionName);
-        extensions.emplace((char*) e.extensionName);
-    }
-
-    // Check required layers & extensions.
-    _enabled_extensions.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
-    bool requiredNotFound = false;
-    for (auto e : _enabled_extensions) {
-        if (extensions.find(e) == extensions.end()) {
-            J2dRlsTrace1(J2D_TRACE_INFO, "    Required device extension not supported: %s\n", (char*) e);
-            requiredNotFound = true;
-        }
-    }
-    if (requiredNotFound) return;
-    _ext_memory_budget = extensions.find(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME) != extensions.end();
-    if (_ext_memory_budget) _enabled_extensions.push_back(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);
-    _khr_synchronization2 = extensions.find(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME) != extensions.end();
-    if (_khr_synchronization2) _enabled_extensions.push_back(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
-    _khr_dynamic_rendering = extensions.find(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME) != extensions.end();
-    if (_khr_dynamic_rendering) _enabled_extensions.push_back(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
-
-    // Validation layer
-#ifdef DEBUG
-    if (layers.find(VALIDATION_LAYER_NAME) != layers.end()) {
-            _enabled_layers.push_back(VALIDATION_LAYER_NAME);
-        } else {
-            J2dRlsTrace1(J2D_TRACE_INFO, "    %s device layer is not supported\n", VALIDATION_LAYER_NAME);
-        }
-#endif
-
-    // This device is supported
-    ((vk::raii::PhysicalDevice&) *this) = std::move(handle);
-}
-
-void VKDevice::init() {
+VKDevice::VKDevice(PhysicalDevice& physicalDevice) : vk::raii::Device(nullptr), _command_pool(nullptr) {
     float queuePriorities[1] {1.0f}; // We only use one queue for now
     std::vector<vk::DeviceQueueCreateInfo> queueCreateInfos;
     queueCreateInfos.push_back(vk::DeviceQueueCreateInfo {
-            {}, queue_family(), 1, &queuePriorities[0]
+            {}, (uint32_t) physicalDevice.queue_family(), 1, &queuePriorities[0]
     });
 
-    vk::PhysicalDeviceFeatures features10;
-    features10.logicOp = true;
-    vk::PhysicalDeviceVulkan12Features features12;
-    features12.timelineSemaphore = true;
-
-    void *pNext = &features12;
-    vk::PhysicalDeviceSynchronization2FeaturesKHR synchronization2Features;
-    if (_khr_synchronization2) {
-        synchronization2Features.synchronization2 = true;
-        synchronization2Features.pNext = pNext;
-        pNext = &synchronization2Features;
-    }
-    vk::PhysicalDeviceDynamicRenderingFeaturesKHR dynamicRenderingFeatures;
-    if (_khr_dynamic_rendering) {
-        dynamicRenderingFeatures.dynamicRendering = true;
-        dynamicRenderingFeatures.pNext = pNext;
-        pNext = &dynamicRenderingFeatures;
-    }
-
     vk::DeviceCreateInfo deviceCreateInfo {
             /*flags*/                   {},
             /*pQueueCreateInfos*/       queueCreateInfos,
-            /*ppEnabledLayerNames*/     _enabled_layers,
-            /*ppEnabledExtensionNames*/ _enabled_extensions,
-            /*pEnabledFeatures*/        &features10,
-            /*pNext*/                   pNext
+            /*ppEnabledLayerNames*/     physicalDevice.enabled_layers(),
+            /*ppEnabledExtensionNames*/ physicalDevice.enabled_extensions(),
+            /*pEnabledFeatures*/        nullptr
     };
-    ((vk::raii::Device&) *this) = {*this, deviceCreateInfo};
-    _memory.init(_instance, *this, *this, REQUIRED_VULKAN_VERSION, _ext_memory_budget);
-    _pipelines.init((vk::raii::Device&) *this, _khr_dynamic_rendering);
-    _queue = getQueue(queue_family(), 0);
-    _commandPool = createCommandPool(vk::CommandPoolCreateInfo {
-        vk::CommandPoolCreateFlagBits::eTransient | vk::CommandPoolCreateFlagBits::eResetCommandBuffer,
-        queue_family()
-    });
-    vk::SemaphoreTypeCreateInfo semaphoreTypeCreateInfo { vk::SemaphoreType::eTimeline, 0 };
-    _timelineSemaphore = createSemaphore(vk::SemaphoreCreateInfo {{}, &semaphoreTypeCreateInfo});
-    _timelineCounter = 0;
-    J2dRlsTrace1(J2D_TRACE_INFO, "Vulkan: Device created %s\n", _name.c_str());
+    *((vk::raii::Device*) this) = {physicalDevice, deviceCreateInfo};
+    this->_queue_family =  physicalDevice.queue_family();
+    J2dRlsTrace(J2D_TRACE_INFO, "Vulkan: Device created\n"); // TODO which one?
 }
 
-VKBuffer VKDevice::getVertexBuffer() {
-    auto b = popPending<VKBuffer>(_pendingVertexBuffers);
-    if (*b) {
-        b.position() = 0;
-        return b;
-    } else {
-        return _memory.allocateBuffer(64 * 1024, vk::BufferUsageFlagBits::eVertexBuffer,
-                                      vma::AllocationCreateFlagBits::eMapped | vma::AllocationCreateFlagBits::eHostAccessSequentialWrite,
-                                      vma::MemoryUsage::eAutoPreferHost);
-    }
-}
-
-vk::raii::CommandBuffer VKDevice::getCommandBuffer(vk::CommandBufferLevel level) {
-    auto b = popPending<vk::raii::CommandBuffer>(level == vk::CommandBufferLevel::ePrimary ?
-                                                 _pendingPrimaryBuffers : _pendingSecondaryBuffers);
-    if (*b) {
-        b.reset({});
-        return b;
-    } else {
-        return std::move(allocateCommandBuffers({*_commandPool, level, 1})[0]);
-    }
-}
-
-void VKDevice::submitCommandBuffer(vk::raii::CommandBuffer&& primary,
-                                   std::vector<vk::raii::CommandBuffer>& secondary,
-                                   std::vector<VKBuffer>& vertexBuffers,
-                                   std::vector<vk::Semaphore>& waitSemaphores,
-                                   std::vector<vk::PipelineStageFlags>& waitStages,
-                                   std::vector<vk::Semaphore>& signalSemaphores) {
-    _timelineCounter++;
-    signalSemaphores.insert(signalSemaphores.begin(), *_timelineSemaphore);
-    vk::TimelineSemaphoreSubmitInfo timelineInfo { 0, nullptr, (uint32_t) signalSemaphores.size(), &_timelineCounter };
-    queue().submit(vk::SubmitInfo {
-            waitSemaphores, waitStages, *primary, signalSemaphores, &timelineInfo
-    }, nullptr);
-    pushPending(_pendingPrimaryBuffers, std::move(primary));
-    pushPending(_pendingSecondaryBuffers, secondary);
-    pushPending(_pendingVertexBuffers, vertexBuffers);
-    signalSemaphores.clear();
-    waitSemaphores.clear();
-    waitStages.clear();
+extern "C" jint VK_MaxTextureSize() {
+    return (jint)VKGraphicsEnvironment::graphics_environment()->max_texture_size();
 }
 
 extern "C" jboolean VK_Init() {
@@ -420,9 +353,8 @@ extern "C" jboolean VK_Init() {
         return true;
     }
 
+#if defined(DEBUG)
+    debugMessenger = nullptr;
+#endif
     return false;
-}
-
-extern "C" JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
-    VKGraphicsEnvironment::dispose();
-}
+}

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

@@ -31,111 +31,70 @@
 
 #define VK_NO_PROTOTYPES
 #define VULKAN_HPP_NO_DEFAULT_DISPATCHER
-#include <queue>
 #include <vulkan/vulkan_raii.hpp>
 #include "jni.h"
-#include "VKMemory.h"
-#include "VKPipeline.h"
 
-class VKDevice : public vk::raii::Device, public vk::raii::PhysicalDevice {
+class PhysicalDevice;
+class VKGraphicsEnvironment;
+
+class VKDevice : public vk::raii::Device {
     friend class VKGraphicsEnvironment;
-
-    vk::Instance             _instance;
-    std::string              _name;
-    std::vector<const char*> _enabled_layers, _enabled_extensions;
-    bool                     _ext_memory_budget, _khr_synchronization2, _khr_dynamic_rendering;
-    int                      _queue_family = -1;
-
-    // Logical device state
-    VKMemory                 _memory;
-    VKPipelines              _pipelines;
-    vk::raii::Queue          _queue = nullptr;
-    vk::raii::CommandPool    _commandPool = nullptr;
-    vk::raii::Semaphore      _timelineSemaphore = nullptr;
-    uint64_t                 _timelineCounter = 0;
-    uint64_t                 _lastReadTimelineCounter = 0;
-
-    template <typename T> struct Pending {
-        T        resource;
-        uint64_t counter;
-        using Queue = std::queue<Pending<T>>;
-    };
-    Pending<vk::raii::CommandBuffer>::Queue _pendingPrimaryBuffers, _pendingSecondaryBuffers;
-    Pending<VKBuffer>::Queue                _pendingVertexBuffers;
-
-    template <typename T> T popPending(typename Pending<T>::Queue& queue) {
-        if (!queue.empty()) {
-            auto& f = queue.front();
-            if (_lastReadTimelineCounter >= f.counter ||
-                (_lastReadTimelineCounter = _timelineSemaphore.getCounterValue()) >= f.counter) {
-                T resource = std::move(f.resource);
-                queue.pop();
-                return resource;
-            }
-        }
-        return T(nullptr);
-    }
-    template <typename T> void pushPending(typename Pending<T>::Queue& queue, T&& resource) {
-        queue.push({std::move(resource), _timelineCounter});
-    }
-    template <typename T> void pushPending(typename Pending<T>::Queue& queue, std::vector<T>& resources) {
-        for (T& r : resources) {
-            pushPending(queue, std::move(r));
-        }
-        resources.clear();
-    }
-
-    explicit VKDevice(vk::Instance instance, vk::raii::PhysicalDevice&& handle);
+    vk::raii::CommandPool  _command_pool;
+    int                    _queue_family = -1;
+    VKDevice(PhysicalDevice& physicalDevice);
 public:
-
-    bool synchronization2() {
-        return _khr_synchronization2;
-    }
-
-    bool dynamicRendering() {
-        return _khr_dynamic_rendering;
-    }
-
-    VKPipelines& pipelines() {
-        return _pipelines;
-    }
-
-    uint32_t queue_family() const {
-        return (uint32_t) _queue_family;
-    }
-
-    const vk::raii::Queue& queue() const {
-        return _queue;
-    }
-
-    void init(); // Creates actual logical device
-
-    VKBuffer getVertexBuffer();
-    vk::raii::CommandBuffer getCommandBuffer(vk::CommandBufferLevel level);
-    void submitCommandBuffer(vk::raii::CommandBuffer&& primary,
-                             std::vector<vk::raii::CommandBuffer>& secondary,
-                             std::vector<VKBuffer>& vertexBuffers,
-                             std::vector<vk::Semaphore>& waitSemaphores,
-                             std::vector<vk::PipelineStageFlags>& waitStages,
-                             std::vector<vk::Semaphore>& signalSemaphores);
-
-    bool supported() const { // Supported or not
-        return *((const vk::raii::PhysicalDevice&) *this);
-    }
-
-    explicit operator bool() const { // Initialized or not
-        return *((const vk::raii::Device&) *this);
+    int queue_family() const {
+        return _queue_family;
     }
 };
 
+class VKSurfaceData {
+    uint32_t               _width;
+    uint32_t               _height;
+    uint32_t               _scale;
+    uint32_t               _bg_color;
+public:
+    VKSurfaceData(uint32_t w, uint32_t h, uint32_t s, uint32_t bgc)
+        : _width(w), _height(h), _scale(s), _bg_color(bgc) {};
+
+    uint32_t width() const {
+        return _width;
+    }
+
+    uint32_t height() const {
+        return _height;
+    }
+
+    uint32_t scale() const {
+        return _scale;
+    }
+
+    uint32_t bg_color() const {
+        return _bg_color;
+    }
+
+    virtual void set_bg_color(uint32_t bg_color) {
+        _bg_color = bg_color;
+    }
+
+    virtual ~VKSurfaceData() = default;
+
+    virtual void revalidate(uint32_t w, uint32_t h, uint32_t s)
+    {
+        _width = w;
+        _height = h;
+        _scale = s;
+    }
+};
+
+
 class VKGraphicsEnvironment {
-    vk::raii::Context                      _vk_context;
-    vk::raii::Instance                     _vk_instance;
-#if defined(DEBUG)
-    vk::raii::DebugUtilsMessengerEXT       _debugMessenger = nullptr;
-#endif
-    std::vector<std::unique_ptr<VKDevice>> _devices;
-    VKDevice*                              _default_device;
+    vk::raii::Context             _vk_context;
+    vk::raii::Instance            _vk_instance;
+    std::vector<PhysicalDevice>   _physical_devices;
+    std::vector<VKDevice>         _devices;
+    int                           _default_physical_device;
+    int                           _default_device;
     static std::unique_ptr<VKGraphicsEnvironment> _ge_instance;
     VKGraphicsEnvironment();
 public:
@@ -143,6 +102,7 @@ public:
     static void dispose();
     VKDevice& default_device();
     vk::raii::Instance& vk_instance();
+    uint32_t max_texture_size();
 };
 
 extern "C" {
@@ -150,6 +110,8 @@ extern "C" {
 
 jboolean VK_Init();
 
+jint VK_MaxTextureSize();
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus

src/java.desktop/share/native/common/java2d/vulkan/VKMemory.cpp

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#define VMA_IMPLEMENTATION
-#include "VKMemory.h"
-
-void VKMemory::init(vk::Instance instance, const vk::raii::PhysicalDevice& physicalDevice,
-                    const vk::raii::Device& device, uint32_t apiVersion, bool extMemoryBudget) {
-    vma::VulkanFunctions functions = vma::functionsFromDispatcher(physicalDevice.getDispatcher(), device.getDispatcher());
-    vma::AllocatorCreateInfo createInfo {};
-    createInfo.instance = instance;
-    createInfo.physicalDevice = *physicalDevice;
-    createInfo.device = *device;
-    createInfo.pVulkanFunctions = &functions;
-    createInfo.vulkanApiVersion = apiVersion;
-    if (extMemoryBudget) {
-        createInfo.flags |= vma::AllocatorCreateFlagBits::eExtMemoryBudget;
-    }
-    _allocator = vma::createAllocatorUnique(createInfo);
-    *((vma::Allocator*) this) = *_allocator;
-}
-
-VKBuffer VKMemory::allocateBuffer(uint32_t size, vk::BufferUsageFlags usage,
-                                vma::AllocationCreateFlags flags, vma::MemoryUsage memoryUsage) {
-    VKBuffer b = nullptr;
-    auto pair = createBufferUnique(vk::BufferCreateInfo {
-            {}, size, usage, vk::SharingMode::eExclusive, {}
-    }, vma::AllocationCreateInfo {
-            flags,
-            memoryUsage, {}, {}, (uint32_t) -1
-    }, b._allocationInfo);
-    b._buffer = std::move(pair.first);
-    b._allocation = std::move(pair.second);
-    b._size = size;
-    return b;
-}

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

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#ifndef VKMemory_h_Included
-#define VKMemory_h_Included
-
-#define VK_NO_PROTOTYPES
-#define VULKAN_HPP_NO_DEFAULT_DISPATCHER
-#include <vulkan/vulkan_raii.hpp>
-#include <vk_mem_alloc.hpp>
-
-class VKBuffer {
-    friend class VKMemory;
-    vma::UniqueBuffer     _buffer;
-    vma::UniqueAllocation _allocation;
-    vma::AllocationInfo   _allocationInfo;
-    uint32_t              _size = 0;
-    uint32_t              _position = 0;
-public:
-    VKBuffer(nullptr_t) {}
-    vk::Buffer operator*() const {
-        return *_buffer;
-    }
-    uint32_t size() const {
-        return _size;
-    }
-    uint32_t& position() {
-        return _position;
-    }
-    void* data() {
-        return _allocationInfo.pMappedData;
-    }
-};
-
-class VKMemory : vma::Allocator {
-    vma::UniqueAllocator _allocator;
-
-public:
-    void init(vk::Instance instance, const vk::raii::PhysicalDevice& physicalDevice,
-              const vk::raii::Device& device, uint32_t apiVersion, bool extMemoryBudget);
-
-    VKBuffer allocateBuffer(uint32_t size, vk::BufferUsageFlags usage,
-                            vma::AllocationCreateFlags flags, vma::MemoryUsage memoryUsage);
-};
-
-#endif //VKMemory_h_Included

src/java.desktop/share/native/common/java2d/vulkan/VKPipeline.cpp

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#include "VKPipeline.h"
-
-void VKPipelines::init(const vk::raii::Device& device, bool dynamicRendering) {
-    shaders.init(device);
-
-    vk::Format format = vk::Format::eB8G8R8A8Unorm; // TODO
-
-    if (!dynamicRendering) {
-        vk::AttachmentDescription attachmentDescription {
-                /*flags*/          {},
-                /*format*/         format,
-                /*samples*/        vk::SampleCountFlagBits::e1,
-                /*loadOp*/         vk::AttachmentLoadOp::eLoad,
-                /*storeOp*/        vk::AttachmentStoreOp::eStore,
-                /*stencilLoadOp*/  vk::AttachmentLoadOp::eDontCare,
-                /*stencilStoreOp*/ vk::AttachmentStoreOp::eDontCare,
-                /*initialLayout*/  vk::ImageLayout::eColorAttachmentOptimal,
-                /*finalLayout*/    vk::ImageLayout::eColorAttachmentOptimal
-        };
-        vk::AttachmentReference attachmentReference { 0, vk::ImageLayout::eColorAttachmentOptimal };
-        vk::SubpassDescription subpassDescription {
-                /*flags*/                   {},
-                /*pipelineBindPoint*/       vk::PipelineBindPoint::eGraphics,
-                /*inputAttachmentCount*/    0,
-                /*pInputAttachments*/       nullptr,
-                /*colorAttachmentCount*/    1,
-                /*pColorAttachments*/       &attachmentReference,
-                /*pResolveAttachments*/     nullptr,
-                /*pDepthStencilAttachment*/ nullptr,
-                /*preserveAttachmentCount*/ 0,
-                /*pPreserveAttachments*/    nullptr,
-        };
-        // We don't know in advance, which operations to synchronize
-        // with before and after the render pass, so do a full sync.
-        std::array<vk::SubpassDependency, 2> subpassDependencies {vk::SubpassDependency{
-                /*srcSubpass*/      VK_SUBPASS_EXTERNAL,
-                /*dstSubpass*/      0,
-                /*srcStageMask*/    vk::PipelineStageFlagBits::eBottomOfPipe,
-                /*dstStageMask*/    vk::PipelineStageFlagBits::eColorAttachmentOutput,
-                /*srcAccessMask*/   {},
-                /*dstAccessMask*/   vk::AccessFlagBits::eColorAttachmentRead | vk::AccessFlagBits::eColorAttachmentWrite,
-                /*dependencyFlags*/ {},
-        }, vk::SubpassDependency{
-                /*srcSubpass*/      0,
-                /*dstSubpass*/      VK_SUBPASS_EXTERNAL,
-                /*srcStageMask*/    vk::PipelineStageFlagBits::eColorAttachmentOutput,
-                /*dstStageMask*/    vk::PipelineStageFlagBits::eTopOfPipe,
-                /*srcAccessMask*/   vk::AccessFlagBits::eColorAttachmentRead | vk::AccessFlagBits::eColorAttachmentWrite,
-                /*dstAccessMask*/   {},
-                /*dependencyFlags*/ {},
-        }};
-        renderPass = device.createRenderPass(vk::RenderPassCreateInfo{
-                /*flags*/           {},
-                /*pAttachments*/    attachmentDescription,
-                /*pSubpasses*/      subpassDescription,
-                /*pDependencies*/   subpassDependencies
-        });
-    }
-
-    vk::PushConstantRange pushConstantRange {vk::ShaderStageFlagBits::eVertex, 0, sizeof(float) * 2};
-    testLayout = device.createPipelineLayout(vk::PipelineLayoutCreateInfo {{}, {}, pushConstantRange});
-
-    std::array<vk::PipelineShaderStageCreateInfo, 2> testStages {shaders.test_vert.stage(), shaders.test_frag.stage()};
-    vk::VertexInputBindingDescription vertexInputBindingDescription {0, 8, vk::VertexInputRate::eVertex};
-    vk::VertexInputAttributeDescription vertexInputAttributeDescription {0, 0, vk::Format::eR32G32Sfloat, 0};
-    vk::PipelineVertexInputStateCreateInfo vertexInputStateCreateInfo {{}, vertexInputBindingDescription, vertexInputAttributeDescription};
-    vk::PipelineInputAssemblyStateCreateInfo inputAssemblyStateCreateInfo {{}, vk::PrimitiveTopology::eTriangleFan, false};
-    vk::Viewport viewport;
-    vk::Rect2D scissor;
-    vk::PipelineViewportStateCreateInfo viewportStateCreateInfo {{}, viewport, scissor};
-    vk::PipelineRasterizationStateCreateInfo rasterizationStateCreateInfo {
-            {}, false, false, vk::PolygonMode::eFill, vk::CullModeFlagBits::eNone,
-            vk::FrontFace::eClockwise, false, 0, 0, 0, 1
-    };
-    vk::PipelineMultisampleStateCreateInfo multisampleStateCreateInfo {};
-    vk::PipelineColorBlendAttachmentState colorBlendAttachmentState {false}; // TODO No blending yet
-    colorBlendAttachmentState.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA;
-    vk::PipelineColorBlendStateCreateInfo colorBlendStateCreateInfo {{}, false, vk::LogicOp::eXor, colorBlendAttachmentState};
-    std::array<vk::DynamicState, 2> dynamicStates {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
-    vk::PipelineDynamicStateCreateInfo dynamicStateCreateInfo {{}, dynamicStates};
-    vk::PipelineRenderingCreateInfoKHR renderingCreateInfo {0, format};
-    auto pipelines = device.createGraphicsPipelines(nullptr, {
-        vk::GraphicsPipelineCreateInfo {
-                {}, testStages,
-                &vertexInputStateCreateInfo,
-                &inputAssemblyStateCreateInfo,
-                nullptr,
-                &viewportStateCreateInfo,
-                &rasterizationStateCreateInfo,
-                &multisampleStateCreateInfo,
-                nullptr,
-                &colorBlendStateCreateInfo,
-                &dynamicStateCreateInfo,
-                *testLayout,
-                *renderPass, 0, nullptr, 0,
-                dynamicRendering ? &renderingCreateInfo : nullptr
-        }
-    });
-    // TODO pipeline cache
-    test = std::move(pipelines[0]);
-}

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

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#ifndef VKPipeline_h_Included
-#define VKPipeline_h_Included
-
-#include "VKShader.h"
-
-struct VKPipelines {
-    VKShaders shaders;
-    // TODO we need a pool of pipelines and (optionally) render passes for different formats.
-    vk::raii::RenderPass renderPass = nullptr; // Render pass is only needed if dynamic rendering is off.
-    vk::raii::PipelineLayout testLayout = nullptr;
-    vk::raii::Pipeline test = nullptr;
-
-    void init(const vk::raii::Device& device, bool dynamicRendering);
-};
-
-#endif //VKPipeline_h_Included

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

@@ -26,6 +26,8 @@
 
 #ifndef HEADLESS
 
+#include <stdlib.h>
+
 #include "sun_java2d_pipe_BufferedOpCodes.h"
 #include "sun_java2d_pipe_BufferedRenderPipe.h"
 #include "sun_java2d_pipe_BufferedTextPipe.h"
@@ -33,7 +35,6 @@
 #include "Trace.h"
 #include "jlong.h"
 #include "VKRenderQueue.h"
-#include "VKRenderer.h"
 
 #define BYTES_PER_POLY_POINT \
     sun_java2d_pipe_BufferedRenderPipe_BYTES_PER_POLY_POINT
@@ -61,13 +62,12 @@
 #define OFFSET_XFORM   sun_java2d_vulkan_VKBlitLoops_OFFSET_XFORM
 #define OFFSET_ISOBLIT sun_java2d_vulkan_VKBlitLoops_OFFSET_ISOBLIT
 
-static VKRenderer renderer;
-
 extern "C" JNIEXPORT void JNICALL
 Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
     (JNIEnv *env, jobject oglrq,
      jlong buf, jint limit)
 {
+    jboolean sync = JNI_FALSE;
     unsigned char *b, *end;
 
     J2dTraceLn1(J2D_TRACE_INFO,
@@ -87,7 +87,7 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
     while (b < end) {
         jint opcode = NEXT_INT(b);
 
-        J2dRlsTraceLn2(J2D_TRACE_VERBOSE2,
+        J2dRlsTraceLn2(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: opcode=%d, rem=%d",
                     opcode, (end-b));
 
@@ -103,7 +103,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn4(J2D_TRACE_VERBOSE,
                             "VKRenderQueue_flushBuffer: DRAW_LINE(%d, %d, %d, %d)",
                             x1, y1, x2, y2);
-                renderer.drawLine(x1, y1, x2, y2);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_RECT:
@@ -115,7 +114,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn4(J2D_TRACE_VERBOSE,
                             "VKRenderQueue_flushBuffer: DRAW_RECT(%d, %d, %d, %d)",
                             x, y, w, h);
-                renderer.drawRect(x, y, w, h);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_POLY:
@@ -127,8 +125,8 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint *xPoints = (jint *)b;
                 jint *yPoints = ((jint *)b) + nPoints;
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: DRAW_POLY");
+
                 SKIP_BYTES(b, nPoints * BYTES_PER_POLY_POINT);
-                renderer.drawPoly();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_PIXEL:
@@ -136,7 +134,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint x = NEXT_INT(b);
                 jint y = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: DRAW_PIXEL");
-                renderer.drawPixel(x, y);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_SCANLINES:
@@ -144,7 +141,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint count = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: DRAW_SCANLINES");
                 SKIP_BYTES(b, count * BYTES_PER_SCANLINE);
-                renderer.drawScanlines();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_PARALLELOGRAM:
@@ -160,7 +156,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn8(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DRAW_PARALLELOGRAM(%f, %f, %f, %f, %f, %f, %f, %f)",
                     x11, y11, dx21, dy21, dx12, dy12, lwr21, lwr12);
-                renderer.drawParallelogram(x11, y11, dx21, dy21, dx12, dy12, lwr21, lwr12);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DRAW_AAPARALLELOGRAM:
@@ -188,7 +183,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint h = NEXT_INT(b);
                 J2dRlsTraceLn4(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: FILL_RECT(%d, %d, %d, %d)", x, y, w, h);
-                renderer.fillRect(x, y, w, h);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_FILL_SPANS:
@@ -197,7 +191,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: FILL_SPANS");
                 SKIP_BYTES(b, count * BYTES_PER_SPAN);
-                renderer.fillSpans();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_FILL_PARALLELOGRAM:
@@ -211,7 +204,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn6(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: FILL_PARALLELOGRAM(%f, %f, %f, %f, %f, %f)",
                     x11, y11, dx21, dy21, dx12, dy12);
-                renderer.fillParallelogram(x11, y11, dx21, dy21, dx12, dy12);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_FILL_AAPARALLELOGRAM:
@@ -225,7 +217,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn6(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: FILL_AAPARALLELOGRAM(%f, %f, %f, %f, %f, %f)",
                     x11, y11, dx21, dy21, dx12, dy12);
-                renderer.fillAAParallelogram(x11, y11, dx21, dy21, dx12, dy12);
             }
             break;
 
@@ -256,7 +247,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 }
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: DRAW_GLYPH_LIST");
                 SKIP_BYTES(b, numGlyphs * bytesPerGlyph);
-                renderer.drawGlyphList();
             }
             break;
 
@@ -272,7 +262,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn6(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: COPY_AREA(%d, %d, %d, %d, %d, %d)",
                     x, y, w, h, dx, dy);
-                renderer.copyArea(x, y, w, h, dx, dy);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_BLIT:
@@ -298,7 +287,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jboolean isoblit  = EXTRACT_BOOLEAN(packedParams,
                                                     OFFSET_ISOBLIT);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: BLIT");
-                renderer.blit();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SURFACE_TO_SW_BLIT:
@@ -313,7 +301,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jlong pSrc   = NEXT_LONG(b);
                 jlong pDst   = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: SURFACE_TO_SW_BLIT");
-                renderer.surfaceToSwBlit();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_MASK_FILL:
@@ -328,7 +315,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 unsigned char *pMask = (masklen > 0) ? b : NULL;
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: MASK_FILL");
                 SKIP_BYTES(b, masklen);
-                renderer.maskFill();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_MASK_BLIT:
@@ -340,7 +326,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint masklen  = width * height * sizeof(jint);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE, "VKRenderQueue_flushBuffer: MASK_BLIT");
                 SKIP_BYTES(b, masklen);
-                renderer.maskBlit();
             }
             break;
 
@@ -354,14 +339,12 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn4(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_RECT_CLIP(%d, %d, %d, %d)",
                     x1, y1, x2, y2);
-                renderer.setRectClip(x1, y1, x2, y2);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_BEGIN_SHAPE_CLIP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: BEGIN_SHAPE_CLIP");
-                renderer.beginShapeClip();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_SHAPE_CLIP_SPANS:
@@ -370,21 +353,18 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_SHAPE_CLIP_SPANS");
                 SKIP_BYTES(b, count * BYTES_PER_SPAN);
-                renderer.setShapeClipSpans();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_END_SHAPE_CLIP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: END_SHAPE_CLIP");
-                renderer.endShapeClip();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_RESET_CLIP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_CLIP");
-                renderer.resetClip();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_ALPHA_COMPOSITE:
@@ -394,7 +374,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint flags        = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_ALPHA_COMPOSITE");
-                renderer.setAlphaComposite();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_XOR_COMPOSITE:
@@ -402,14 +381,12 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint xorPixel = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_XOR_COMPOSITE");
-                renderer.setXorComposite();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_RESET_COMPOSITE:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_COMPOSITE");
-                renderer.resetComposite();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_TRANSFORM:
@@ -422,25 +399,22 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jdouble m12 = NEXT_DOUBLE(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_TRANSFORM");
-                renderer.setTransform(m00, m10, m01, m11, m02, m12);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_RESET_TRANSFORM:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_TRANSFORM");
-                renderer.resetTransform();
             }
             break;
 
         // context-related ops
         case sun_java2d_pipe_BufferedOpCodes_SET_SURFACES:
             {
-                VKSurfaceData* src = NEXT_SURFACE(b);
-                VKSurfaceData* dst = NEXT_SURFACE(b);
+                jlong pSrc = NEXT_LONG(b);
+                jlong pDst = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_SURFACES");
-                renderer.setSurfaces(*src, *dst);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_SCRATCH_SURFACE:
@@ -448,23 +422,20 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jlong pConfigInfo = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                            "VKRenderQueue_flushBuffer: SET_SCRATCH_SURFACE");
-                renderer.setScratchSurface();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_FLUSH_SURFACE:
             {
-                VKSurfaceData* surface = NEXT_SURFACE(b);
+                jlong pData = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: FLUSH_SURFACE");
-                renderer.flushSurface(*surface);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISPOSE_SURFACE:
             {
                 jlong pData = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
-                    "VKRenderQueue_flushBuffer: DISPOSE_SURFACE");
-                renderer.disposeSurface();
+                    "VKRenderQueue_flushBuffer: FLUSH_SURFACE");
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISPOSE_CONFIG:
@@ -472,21 +443,18 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jlong pConfigInfo = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DISPOSE_CONFIG");
-                renderer.disposeConfig();
+
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_INVALIDATE_CONTEXT:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                            "VKRenderQueue_flushBuffer: INVALIDATE_CONTEXT");
-                renderer.invalidateContext();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SYNC:
             {
-                J2dRlsTraceLn(J2D_TRACE_VERBOSE,
-                              "VKRenderQueue_flushBuffer: SYNC");
-                renderer.sync();
+                sync = JNI_TRUE;
             }
             break;
 
@@ -496,16 +464,11 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jlong window = NEXT_LONG(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SWAP_BUFFERS");
-                renderer.swapBuffers();
             }
             break;
 
         // special no-op (mainly used for achieving 8-byte alignment)
         case sun_java2d_pipe_BufferedOpCodes_NOOP:
-            {
-                J2dRlsTraceLn(J2D_TRACE_VERBOSE,
-                              "VKRenderQueue_flushBuffer: NOOP");
-            }
             break;
 
         // paint-related ops
@@ -513,7 +476,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: RESET_PAINT");
-                renderer.resetPaint();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_COLOR:
@@ -521,7 +483,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint pixel = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_COLOR");
-                renderer.setColor((uint32_t) pixel);
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_GRADIENT_PAINT:
@@ -535,7 +496,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jint pixel2     = NEXT_INT(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_GRADIENT_PAINT");
-                renderer.setGradientPaint();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_LINEAR_GRADIENT_PAINT:
@@ -552,7 +512,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 pixels    = b; SKIP_BYTES(b, numStops * sizeof(jint));
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_LINEAR_GRADIENT_PAINT");
-                renderer.setLinearGradientPaint();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_RADIAL_GRADIENT_PAINT:
@@ -573,7 +532,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 pixels    = b; SKIP_BYTES(b, numStops * sizeof(jint));
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                            "VKRenderQueue_flushBuffer: SET_RADIAL_GRADIENT_PAINT");
-                renderer.setRadialGradientPaint();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_SET_TEXTURE_PAINT:
@@ -589,7 +547,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 jdouble yp3     = NEXT_DOUBLE(b);
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: SET_TEXTURE_PAINT");
-                renderer.setTexturePaint();
             }
             break;
 
@@ -603,14 +560,12 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: ENABLE_CONVOLVE_OP");
                 SKIP_BYTES(b, kernelWidth * kernelHeight * sizeof(jfloat));
-                renderer.enableConvolveOp();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISABLE_CONVOLVE_OP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DISABLE_CONVOLVE_OP");
-                renderer.disableConvolveOp();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_ENABLE_RESCALE_OP:
@@ -623,14 +578,12 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: ENABLE_RESCALE_OP");
                 SKIP_BYTES(b, numFactors * sizeof(jfloat) * 2);
-                renderer.enableRescaleOp();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISABLE_RESCALE_OP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DISABLE_RESCALE_OP");
-                renderer.disableRescaleOp();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_ENABLE_LOOKUP_OP:
@@ -646,14 +599,12 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: ENABLE_LOOKUP_OP");
                 SKIP_BYTES(b, numBands * bandLength * bytesPerElem);
-                renderer.enableLookupOp();
             }
             break;
         case sun_java2d_pipe_BufferedOpCodes_DISABLE_LOOKUP_OP:
             {
                 J2dRlsTraceLn(J2D_TRACE_VERBOSE,
                     "VKRenderQueue_flushBuffer: DISABLE_LOOKUP_OP");
-                renderer.disableLookupOp();
             }
             break;
 
@@ -663,7 +614,6 @@ Java_sun_java2d_vulkan_VKRenderQueue_flushBuffer
             return;
         }
     }
-    renderer.flush();
 }
 
 #endif /* !HEADLESS */

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

@@ -38,7 +38,6 @@
 #define NEXT_BOOLEAN(buf)   (jboolean)NEXT_INT(buf)
 #define NEXT_LONG(buf)      NEXT_VAL(buf, jlong)
 #define NEXT_DOUBLE(buf)    NEXT_VAL(buf, jdouble)
-#define NEXT_SURFACE(buf) ((VKSurfaceData*) (SurfaceDataOps*) jlong_to_ptr(NEXT_LONG(buf)))
 
 /*
  * Increments a pointer (buf) by the given number of bytes.

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

@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#include "VKRenderer.h"
-
-VKRecorder::Vertex* VKRecorder::draw(uint32_t numVertices) {
-    uint32_t bytes = numVertices * sizeof(VKRecorder::Vertex);
-    if (_renderPass.vertexBuffer == nullptr && !_vertexBuffers.empty()) {
-        _renderPass.vertexBuffer = &_vertexBuffers.back();
-        _renderPass.commandBuffer->bindVertexBuffers(0, **_renderPass.vertexBuffer, vk::DeviceSize(0));
-    }
-    if (_renderPass.vertexBuffer == nullptr ||
-        _renderPass.vertexBuffer->position() + bytes > _renderPass.vertexBuffer->size()) {
-        _vertexBuffers.push_back(device().getVertexBuffer());
-        _renderPass.vertexBuffer = &_vertexBuffers.back(); // TODO check that our number of vertices fit into single buffer at all
-        _renderPass.commandBuffer->bindVertexBuffers(0, **_renderPass.vertexBuffer, vk::DeviceSize(0));
-    }
-    auto data = (uintptr_t) _renderPass.vertexBuffer->data() + _renderPass.vertexBuffer->position();
-    uint32_t firstVertex = _renderPass.vertexBuffer->position() / sizeof(VKRecorder::Vertex);
-    _renderPass.vertexBuffer->position() += bytes;
-    _renderPass.commandBuffer->draw(numVertices, 1, firstVertex, 0);
-    return (VKRecorder::Vertex*) data;
-}
-
-VKDevice* VKRecorder::setDevice(VKDevice *device) {
-    if (device != _device) {
-        if (_device != nullptr) {
-            flush();
-        }
-        std::swap(_device, device);
-    }
-    return device;
-}
-
-void VKRecorder::waitSemaphore(vk::Semaphore semaphore, vk::PipelineStageFlags stage) {
-    _waitSemaphores.push_back(semaphore);
-    _waitSemaphoreStages.push_back(stage);
-}
-
-void VKRecorder::signalSemaphore(vk::Semaphore semaphore) {
-    _signalSemaphores.push_back(semaphore);
-}
-
-const vk::raii::CommandBuffer& VKRecorder::record(bool flushRenderPass) {
-    if (!*_commandBuffer) {
-        _commandBuffer = device().getCommandBuffer(vk::CommandBufferLevel::ePrimary);
-        _commandBuffer.begin({vk::CommandBufferUsageFlagBits::eOneTimeSubmit });
-    }
-    if (flushRenderPass && _renderPass.commandBuffer != nullptr) {
-        _renderPass.commandBuffer->end();
-        vk::Rect2D renderArea {{0, 0}, {_renderPass.surface->width(), _renderPass.surface->height()}};
-        if (device().dynamicRendering()) {
-            vk::RenderingAttachmentInfoKHR colorAttachmentInfo {
-                    _renderPass.surfaceView, vk::ImageLayout::eColorAttachmentOptimal,
-                    vk::ResolveModeFlagBits::eNone, {}, {},
-                    _renderPass.attachmentLoadOp, vk::AttachmentStoreOp::eStore,
-                    _renderPass.clearValue
-            };
-            _commandBuffer.beginRenderingKHR(vk::RenderingInfoKHR{
-                    vk::RenderingFlagBitsKHR::eContentsSecondaryCommandBuffers,
-                    renderArea, 1, 0, colorAttachmentInfo, {}, {}
-            });
-        } else {
-            _commandBuffer.beginRenderPass(vk::RenderPassBeginInfo{
-                    /*renderPass*/      *device().pipelines().renderPass,
-                    /*framebuffer*/     _renderPass.surfaceFramebuffer,
-                    /*renderArea*/      renderArea,
-                    /*clearValueCount*/ 0,
-                    /*pClearValues*/    nullptr
-            }, vk::SubpassContents::eSecondaryCommandBuffers);
-        }
-        _commandBuffer.executeCommands(**_renderPass.commandBuffer);
-        if (device().dynamicRendering()) {
-            _commandBuffer.endRenderingKHR();
-        } else {
-            _commandBuffer.endRenderPass();
-        }
-        _renderPass = {};
-    }
-    return _commandBuffer;
-}
-
-const vk::raii::CommandBuffer& VKRecorder::render(VKSurfaceData& surface, vk::ClearColorValue* clear) {
-    if (_renderPass.surface != &surface) {
-        if (_renderPass.commandBuffer != nullptr) {
-            record(true); // Flush current render pass
-        }
-        VKSurfaceImage i = surface.access(*this,
-                                          vk::PipelineStageFlagBits::eColorAttachmentOutput,
-                                          vk::AccessFlagBits::eColorAttachmentWrite,
-                                          vk::ImageLayout::eColorAttachmentOptimal);
-        _renderPass.surface = &surface;
-        _renderPass.surfaceView = i.view;
-        _renderPass.surfaceFramebuffer = i.framebuffer;
-        _renderPass.attachmentLoadOp = vk::AttachmentLoadOp::eLoad;
-    }
-    if (clear != nullptr) {
-        _renderPass.clearValue = *clear;
-        _renderPass.attachmentLoadOp = vk::AttachmentLoadOp::eClear;
-    }
-    if (_renderPass.commandBuffer == nullptr || clear != nullptr) {
-        if (_renderPass.commandBuffer == nullptr) {
-            _secondaryBuffers.push_back(device().getCommandBuffer(vk::CommandBufferLevel::eSecondary));
-            _renderPass.commandBuffer = &_secondaryBuffers.back();
-        } else {
-            // We already recorded some rendering commands, but it doesn't matter, as we'll clear the surface anyway.
-            _renderPass.commandBuffer->reset({});
-        }
-        vk::Format format = surface.format();
-        vk::CommandBufferInheritanceRenderingInfoKHR inheritanceRenderingInfo {
-                vk::RenderingFlagBitsKHR::eContentsSecondaryCommandBuffers,
-                0, format
-        };
-        vk::CommandBufferInheritanceInfo inheritanceInfo;
-        if (device().dynamicRendering()) {
-            inheritanceInfo.pNext = &inheritanceRenderingInfo;
-        } else {
-            inheritanceInfo.renderPass = *device().pipelines().renderPass;
-            inheritanceInfo.subpass = 0;
-            inheritanceInfo.framebuffer = _renderPass.surfaceFramebuffer;
-        }
-        _renderPass.commandBuffer->begin({ vk::CommandBufferUsageFlagBits::eOneTimeSubmit |
-                                           vk::CommandBufferUsageFlagBits::eRenderPassContinue, &inheritanceInfo });
-        if (clear != nullptr && !device().dynamicRendering()) {
-            // Our static render pass uses loadOp=LOAD, so clear attachment manually.
-            _renderPass.commandBuffer->clearAttachments(vk::ClearAttachment {
-                    vk::ImageAspectFlagBits::eColor, 0, _renderPass.clearValue
-            }, vk::ClearRect {vk::Rect2D{{0, 0}, {_renderPass.surface->width(), _renderPass.surface->height()}}, 0, 1});
-        }
-    }
-    return *_renderPass.commandBuffer;
-}
-
-void VKRecorder::flush() {
-    if (!*_commandBuffer && _renderPass.commandBuffer == nullptr) {
-        return;
-    }
-    record(true).end();
-    device().submitCommandBuffer(std::move(_commandBuffer), _secondaryBuffers, _vertexBuffers,
-                                 _waitSemaphores, _waitSemaphoreStages, _signalSemaphores);
-}
-
-// draw ops
-
-void VKRenderer::drawLine(jint x1, jint y1, jint x2, jint y2) {/*TODO*/}
-void VKRenderer::drawRect(jint x, jint y, jint w, jint h) {/*TODO*/}
-void VKRenderer::drawPoly(/*TODO*/) {/*TODO*/}
-void VKRenderer::drawPixel(jint x, jint y) {/*TODO*/}
-void VKRenderer::drawScanlines(/*TODO*/) {/*TODO*/}
-void VKRenderer::drawParallelogram(jfloat x11, jfloat y11,
-                                   jfloat dx21, jfloat dy21,
-                                   jfloat dx12, jfloat dy12,
-                                   jfloat lwr21, jfloat lwr12) {/*TODO*/}
-void VKRenderer::drawAAParallelogram(jfloat x11, jfloat y11,
-                                     jfloat dx21, jfloat dy21,
-                                     jfloat dx12, jfloat dy12,
-                                     jfloat lwr21, jfloat lwr12) {/*TODO*/}
-
-// fill ops
-
-void VKRenderer::fillRect(jint xi, jint yi, jint wi, jint hi) {
-    // TODO
-    auto& cb = render(*_dstSurface);
-//    cb.clearAttachments(vk::ClearAttachment {vk::ImageAspectFlagBits::eColor, 0, _color},
-//                        vk::ClearRect {vk::Rect2D {{x, y}, {(uint32_t) w, (uint32_t) h}}, 0, 1});
-    cb.bindPipeline(vk::PipelineBindPoint::eGraphics, *device().pipelines().test);
-    cb.pushConstants<float>(*device().pipelines().testLayout, vk::ShaderStageFlagBits::eVertex, 0, {
-        2.0f/(float)_dstSurface->width(), 2.0f/(float)_dstSurface->height()
-    });
-    vk::Viewport viewport {0, 0, (float) _dstSurface->width(), (float) _dstSurface->height(), 0, 1};
-    cb.setViewport(0, viewport);
-    vk::Rect2D scissor {{0, 0}, {_dstSurface->width(), _dstSurface->height()}};
-    cb.setScissor(0, scissor);
-    auto x = (float) xi, y = (float) yi, w = (float) wi, h = (float) hi;
-    auto v = draw(4);
-    v[0] = {x, y};
-    v[1] = {x+w, y};
-    v[2] = {x+w, y+h};
-    v[3] = {x, y+h};
-}
-void VKRenderer::fillSpans(/*TODO*/) {/*TODO*/}
-void VKRenderer::fillParallelogram(jfloat x11, jfloat y11,
-                                   jfloat dx21, jfloat dy21,
-                                   jfloat dx12, jfloat dy12) {/*TODO*/}
-void VKRenderer::fillAAParallelogram(jfloat x11, jfloat y11,
-                                     jfloat dx21, jfloat dy21,
-                                     jfloat dx12, jfloat dy12) {/*TODO*/}
-
-// text-related ops
-
-void VKRenderer::drawGlyphList(/*TODO*/) {/*TODO*/}
-
-// copy-related ops
-
-void VKRenderer::copyArea(jint x, jint y, jint w, jint h, jint dx, jint dy) {/*TODO*/}
-void VKRenderer::blit(/*TODO*/) {/*TODO*/}
-void VKRenderer::surfaceToSwBlit(/*TODO*/) {/*TODO*/}
-void VKRenderer::maskFill(/*TODO*/) {/*TODO*/}
-void VKRenderer::maskBlit(/*TODO*/) {/*TODO*/}
-
-// state-related ops
-
-void VKRenderer::setRectClip(jint x1, jint y1, jint x2, jint y2) {/*TODO*/}
-void VKRenderer::beginShapeClip() {/*TODO*/}
-void VKRenderer::setShapeClipSpans(/*TODO*/) {/*TODO*/}
-void VKRenderer::endShapeClip() {/*TODO*/}
-void VKRenderer::resetClip() {/*TODO*/}
-void VKRenderer::setAlphaComposite(/*TODO*/) {/*TODO*/}
-void VKRenderer::setXorComposite(/*TODO*/) {/*TODO*/}
-void VKRenderer::resetComposite() {/*TODO*/}
-void VKRenderer::setTransform(jdouble m00, jdouble m10,
-                              jdouble m01, jdouble m11,
-                              jdouble m02, jdouble m12) {/*TODO*/}
-void VKRenderer::resetTransform() {/*TODO*/}
-
-// context-related ops
-
-void VKRenderer::setSurfaces(VKSurfaceData& src, VKSurfaceData& dst) {
-    if (&src.device() != &dst.device()) {
-        throw std::runtime_error("src and dst surfaces use different devices!");
-    }
-    setDevice(&dst.device());
-    _dstSurface = &dst;
-    _srcSurface = &src;
-}
-void VKRenderer::setScratchSurface(/*TODO*/) {/*TODO*/}
-void VKRenderer::flushSurface(VKSurfaceData& surface) {
-    VKDevice* old = setDevice(&surface.device());
-    surface.flush(*this);
-    setDevice(old);
-}
-void VKRenderer::disposeSurface(/*TODO*/) {/*TODO*/}
-void VKRenderer::disposeConfig(/*TODO*/) {/*TODO*/}
-void VKRenderer::invalidateContext() {/*TODO*/}
-void VKRenderer::sync() {/*TODO*/}
-
-// multibuffering ops
-
-void VKRenderer::swapBuffers(/*TODO*/) {/*TODO*/}
-
-// paint-related ops
-
-void VKRenderer::resetPaint() {/*TODO*/}
-void VKRenderer::setColor(uint32_t pixel) {
-    _color = pixel;
-}
-void VKRenderer::setGradientPaint(/*TODO*/) {/*TODO*/}
-void VKRenderer::setLinearGradientPaint(/*TODO*/) {/*TODO*/}
-void VKRenderer::setRadialGradientPaint(/*TODO*/) {/*TODO*/}
-void VKRenderer::setTexturePaint(/*TODO*/) {/*TODO*/}
-
-// BufferedImageOp-related ops
-
-void VKRenderer::enableConvolveOp(/*TODO*/) {/*TODO*/}
-void VKRenderer::disableConvolveOp() {/*TODO*/}
-void VKRenderer::enableRescaleOp(/*TODO*/) {/*TODO*/}
-void VKRenderer::disableRescaleOp() {/*TODO*/}
-void VKRenderer::enableLookupOp() {/*TODO*/}
-void VKRenderer::disableLookupOp() {/*TODO*/}

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

@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#ifndef VKRenderer_h_Included
-#define VKRenderer_h_Included
-#ifdef __cplusplus
-
-#include "VKBase.h"
-#include "VKSurfaceData.h"
-
-class VKRecorder{
-    VKDevice                            *_device;
-    vk::raii::CommandBuffer              _commandBuffer = nullptr;
-    std::vector<vk::raii::CommandBuffer> _secondaryBuffers;
-    std::vector<vk::Semaphore>           _waitSemaphores, _signalSemaphores;
-    std::vector<vk::PipelineStageFlags>  _waitSemaphoreStages;
-    std::vector<VKBuffer>                _vertexBuffers;
-    struct RenderPass {
-        vk::raii::CommandBuffer *commandBuffer = nullptr;
-        VKSurfaceData           *surface = nullptr;
-        VKBuffer                *vertexBuffer = nullptr;
-        vk::ImageView            surfaceView;
-        vk::Framebuffer          surfaceFramebuffer; // Only if dynamic rendering is off.
-        vk::AttachmentLoadOp     attachmentLoadOp;
-        vk::ClearValue           clearValue;
-    } _renderPass {};
-
-protected:
-    struct Vertex {
-        float x, y;
-    };
-
-    Vertex* draw(uint32_t numVertices);
-
-    VKDevice& device() {
-        return *_device;
-    }
-    VKDevice* setDevice(VKDevice *device);
-
-public:
-    void waitSemaphore(vk::Semaphore semaphore, vk::PipelineStageFlags stage);
-
-    void signalSemaphore(vk::Semaphore semaphore);
-
-    const vk::raii::CommandBuffer& record(bool flushRenderPass = true); // Prepare for ordinary commands
-
-    const vk::raii::CommandBuffer& render(VKSurfaceData& surface,
-                                          vk::ClearColorValue* clear = nullptr); // Prepare for render pass commands
-
-    void flush();
-};
-
-class VKRenderer : private VKRecorder{
-    VKSurfaceData *_srcSurface, *_dstSurface;
-    struct alignas(16) Color {
-        float r, g, b, a;
-        Color& operator=(uint32_t c) {
-            r = (float) ((c >> 16) & 0xff) / 255.0f;
-            g = (float) ((c >> 8) & 0xff) / 255.0f;
-            b = (float) (c & 0xff) / 255.0f;
-            a = (float) ((c >> 24) & 0xff) / 255.0f;
-            return *this;
-        }
-        operator vk::ClearValue() const {
-            return vk::ClearColorValue {r, g, b, a};
-        }
-    } _color;
-
-public:
-    using VKRecorder::flush;
-
-    // draw ops
-    void drawLine(jint x1, jint y1, jint x2, jint y2);
-    void drawRect(jint x, jint y, jint w, jint h);
-    void drawPoly(/*TODO*/);
-    void drawPixel(jint x, jint y);
-    void drawScanlines(/*TODO*/);
-    void drawParallelogram(jfloat x11, jfloat y11,
-                           jfloat dx21, jfloat dy21,
-                           jfloat dx12, jfloat dy12,
-                           jfloat lwr21, jfloat lwr12);
-    void drawAAParallelogram(jfloat x11, jfloat y11,
-                             jfloat dx21, jfloat dy21,
-                             jfloat dx12, jfloat dy12,
-                             jfloat lwr21, jfloat lwr12);
-
-    // fill ops
-    void fillRect(jint x, jint y, jint w, jint h);
-    void fillSpans(/*TODO*/);
-    void fillParallelogram(jfloat x11, jfloat y11,
-                           jfloat dx21, jfloat dy21,
-                           jfloat dx12, jfloat dy12);
-    void fillAAParallelogram(jfloat x11, jfloat y11,
-                             jfloat dx21, jfloat dy21,
-                             jfloat dx12, jfloat dy12);
-
-    // text-related ops
-    void drawGlyphList(/*TODO*/);
-
-    // copy-related ops
-    void copyArea(jint x, jint y, jint w, jint h, jint dx, jint dy);
-    void blit(/*TODO*/);
-    void surfaceToSwBlit(/*TODO*/);
-    void maskFill(/*TODO*/);
-    void maskBlit(/*TODO*/);
-
-    // state-related ops
-    void setRectClip(jint x1, jint y1, jint x2, jint y2);
-    void beginShapeClip();
-    void setShapeClipSpans(/*TODO*/);
-    void endShapeClip();
-    void resetClip();
-    void setAlphaComposite(/*TODO*/);
-    void setXorComposite(/*TODO*/);
-    void resetComposite();
-    void setTransform(jdouble m00, jdouble m10,
-                      jdouble m01, jdouble m11,
-                      jdouble m02, jdouble m12);
-    void resetTransform();
-
-    // context-related ops
-    void setSurfaces(VKSurfaceData& src, VKSurfaceData& dst);
-    void setScratchSurface(/*TODO*/);
-    void flushSurface(VKSurfaceData& surface);
-    void disposeSurface(/*TODO*/);
-    void disposeConfig(/*TODO*/);
-    void invalidateContext();
-    void sync();
-
-    // multibuffering ops
-    void swapBuffers(/*TODO*/);
-
-    // paint-related ops
-    void resetPaint();
-    void setColor(uint32_t pixel);
-    void setGradientPaint(/*TODO*/);
-    void setLinearGradientPaint(/*TODO*/);
-    void setRadialGradientPaint(/*TODO*/);
-    void setTexturePaint(/*TODO*/);
-
-    // BufferedImageOp-related ops
-    void enableConvolveOp(/*TODO*/);
-    void disableConvolveOp();
-    void enableRescaleOp(/*TODO*/);
-    void disableRescaleOp();
-    void enableLookupOp();
-    void disableLookupOp();
-};
-
-#endif //__cplusplus
-#endif //VKRenderer_h_Included

src/java.desktop/share/native/common/java2d/vulkan/VKShader.cpp

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#include "VKShader.h"
-
-// Inline bytecode of all shaders
-#define INCLUDE_BYTECODE
-#define SHADER_ENTRY(NAME, TYPE) static uint32_t NAME ## _ ## TYPE ## _data[] = {
-#define BYTECODE_END };
-#include "vulkan/shader_list.h"
-#undef INCLUDE_BYTECODE
-#undef SHADER_ENTRY
-#undef BYTECODE_END
-
-void VKShaders::init(const vk::raii::Device& device) {
-    // Declare file extensions as stage flags
-    auto vert = vk::ShaderStageFlagBits::eVertex;
-    auto frag = vk::ShaderStageFlagBits::eFragment;
-    // Init all shader modules
-#   define SHADER_ENTRY(NAME, TYPE) \
-    NAME ## _ ## TYPE.init(device, sizeof NAME ## _ ## TYPE ## _data, NAME ## _ ## TYPE ## _data, TYPE);
-#   include "vulkan/shader_list.h"
-#   undef SHADER_ENTRY
-}

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#ifndef VKShader_h_Included
-#define VKShader_h_Included
-
-#define VK_NO_PROTOTYPES
-#define VULKAN_HPP_NO_DEFAULT_DISPATCHER
-#include <vulkan/vulkan_raii.hpp>
-
-class VKShader : public vk::raii::ShaderModule {
-    friend struct VKShaders;
-    vk::ShaderStageFlagBits _stage;
-    void init(const vk::raii::Device& device, size_t size, const uint32_t* data, vk::ShaderStageFlagBits stage) {
-        *((vk::raii::ShaderModule*) this) = device.createShaderModule({{}, size, data});
-        _stage = stage;
-    }
-public:
-    VKShader() : vk::raii::ShaderModule(nullptr), _stage() {}
-    vk::PipelineShaderStageCreateInfo stage(const vk::SpecializationInfo *specializationInfo = nullptr) {
-        return vk::PipelineShaderStageCreateInfo {{}, _stage, **this, "main", specializationInfo};
-    }
-};
-
-struct VKShaders {
-    // Actual list of shaders is autogenerated from source file names
-#   define SHADER_ENTRY(NAME, TYPE) VKShader NAME ## _ ## TYPE;
-#   include "vulkan/shader_list.h"
-#   undef SHADER_ENTRY
-
-    void init(const vk::raii::Device& device);
-};
-
-#endif //VKShader_h_Included

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

@@ -32,4 +32,8 @@ jboolean VK_Init() {
     return 0;
 }
 
+jint VK_MaxTextureSize() {
+    return 0;
+}
+
 #endif

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

@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 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.  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.
- */
-
-#include "jni_util.h"
-#include "Disposer.h"
-#include "Trace.h"
-#include "VKSurfaceData.h"
-#include "VKRenderer.h"
-
-void VKSurfaceData::attachToJavaSurface(JNIEnv *env, jobject javaSurfaceData) {
-    // SurfaceData utility functions operate on C structures and malloc/free,
-    // But we are using C++ classes, so set up the disposer manually.
-    // This is a C++ analogue of SurfaceData_InitOps / SurfaceData_SetOps.
-    jboolean exception = false;
-    if (JNU_GetFieldByName(env, &exception, javaSurfaceData, "pData", "J").j == 0 && !exception) {
-        jlong ptr = ptr_to_jlong((SurfaceDataOps*) this);
-        JNU_SetFieldByName(env, &exception, javaSurfaceData, "pData", "J", ptr);
-        /* Register the data for disposal */
-        Disposer_AddRecord(env, javaSurfaceData, [](JNIEnv *env, jlong ops) {
-            if (ops != 0) {
-                auto sd = (SurfaceDataOps*)jlong_to_ptr(ops);
-                jobject sdObject = sd->sdObject;
-                sd->Dispose(env, sd);
-                if (sdObject != nullptr) {
-                    env->DeleteWeakGlobalRef(sdObject);
-                }
-            }
-        }, ptr);
-    } else if (!exception) {
-        throw std::runtime_error("Attempting to set SurfaceData ops twice");
-    }
-    if (exception) {
-        throw std::runtime_error("VKSurfaceData::attachToJavaSurface error");
-    }
-    sdObject = env->NewWeakGlobalRef(javaSurfaceData);
-}
-
-VKSurfaceData::VKSurfaceData(uint32_t w, uint32_t h, uint32_t s, uint32_t bgc)
-        : SurfaceDataOps(), _width(w), _height(h), _scale(s), _bg_color(bgc), _device(nullptr) {
-    Lock = [](JNIEnv *env, SurfaceDataOps *ops, SurfaceDataRasInfo *rasInfo, jint lockFlags) {
-        ((VKSurfaceData*) ops)->_mutex.lock();
-        return SD_SUCCESS;
-    };
-    Unlock = [](JNIEnv *env, SurfaceDataOps *ops, SurfaceDataRasInfo *rasInfo) {
-        ((VKSurfaceData*) ops)->_mutex.unlock();
-    };
-    Dispose = [](JNIEnv *env, SurfaceDataOps *ops) {
-        delete (VKSurfaceData*) ops;
-    };
-}
-
-bool VKSurfaceData::barrier(VKRecorder& recorder, vk::Image image,
-                            vk::PipelineStageFlags stage, vk::AccessFlags access, vk::ImageLayout layout) {
-    // TODO consider write/read access
-    if (_lastStage != stage || _lastAccess != access || _layout != layout) {
-        if (_device->synchronization2()) {
-            vk::ImageMemoryBarrier2KHR barrier {
-                    (vk::PipelineStageFlags2KHR) (VkFlags) _lastStage,
-                    (vk::AccessFlags2KHR) (VkFlags) _lastAccess,
-                    (vk::PipelineStageFlags2KHR) (VkFlags) stage,
-                    (vk::AccessFlags2KHR) (VkFlags) access,
-                    _layout, layout,
-                    VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
-                    image, vk::ImageSubresourceRange {vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1}
-            };
-            recorder.record(false).pipelineBarrier2KHR(vk::DependencyInfoKHR {{}, {}, {}, barrier});
-        } else {
-            vk::ImageMemoryBarrier barrier {
-                    _lastAccess, access,
-                    _layout, layout,
-                    VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
-                    image, vk::ImageSubresourceRange {vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1}
-            };
-            recorder.record(false).pipelineBarrier(_lastStage, stage, {}, {}, {}, barrier);
-        }
-        _lastStage = stage;
-        _lastAccess = access;
-        _layout = layout;
-        // TODO check write access
-        return true;
-    } else return false;
-}
-
-void VKSwapchainSurfaceData::revalidate(uint32_t w, uint32_t h, uint32_t s) {
-    if (*_swapchain && s == scale() && w == width() && h == height() ) {
-        J2dTraceLn1(J2D_TRACE_INFO,
-                    "VKSwapchainSurfaceData_revalidate is skipped: swapchain(%p)",
-                    *_swapchain);
-        return;
-    }
-    VKSurfaceData::revalidate(w, h, s);
-    if (!_device || !*_surface) {
-        J2dTraceLn2(J2D_TRACE_ERROR,
-                    "VKSwapchainSurfaceData_revalidate is skipped: device(%p) surface(%p)",
-                    _device, *_surface);
-        return;
-    }
-
-    vk::SurfaceCapabilitiesKHR surfaceCapabilities = device().getSurfaceCapabilitiesKHR(*_surface);
-    _format = vk::Format::eB8G8R8A8Unorm; // TODO?
-
-    // TODO all these parameters must be checked against device & surface capabilities
-    vk::SwapchainCreateInfoKHR swapchainCreateInfo{
-            {},
-            *_surface,
-            surfaceCapabilities.minImageCount,
-            format(),
-            vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear,
-            {width(), height()}, // TODO According to spec we need to use surfaceCapabilities.currentExtent, which is not available at this point (it gives -1)... We'll figure this out later
-            1,
-            vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferDst,
-            vk::SharingMode::eExclusive,
-            0,
-            nullptr,
-            vk::SurfaceTransformFlagBitsKHR::eIdentity,
-            vk::CompositeAlphaFlagBitsKHR::eOpaque,
-            vk::PresentModeKHR::eImmediate,
-            true, *_swapchain
-    };
-
-    device().waitIdle(); // TODO proper synchronization in case there are rendering operations for old swapchain in flight
-    _images.clear();
-    _swapchain = device().createSwapchainKHR(swapchainCreateInfo);
-    for (vk::Image image : _swapchain.getImages()) {
-        _images.push_back({image, device().createImageView(vk::ImageViewCreateInfo {
-                {}, image, vk::ImageViewType::e2D, format(), {},
-                vk::ImageSubresourceRange {vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1}
-        })});
-        if (!device().dynamicRendering()) {
-            _images.back().framebuffer = device().createFramebuffer(vk::FramebufferCreateInfo{
-                    /*flags*/           {},
-                    /*renderPass*/      *device().pipelines().renderPass,
-                    /*attachmentCount*/ 1,
-                    /*pAttachments*/    &*_images.back().view,
-                    /*width*/           width(),
-                    /*height*/          height(),
-                    /*layers*/          1
-            });
-        }
-    }
-    _currentImage = (uint32_t) -1;
-    _freeSemaphore = nullptr;
-    // TODO Now we need to repaint our surface... How is it done? No idea
-}
-
-VKSurfaceImage VKSwapchainSurfaceData::access(VKRecorder& recorder,
-                                              vk::PipelineStageFlags stage,
-                                              vk::AccessFlags access,
-                                              vk::ImageLayout layout) {
-    // Acquire image
-    bool semaphorePending = false;
-    if (_currentImage == (uint32_t) -1) {
-        if (!*_freeSemaphore) {
-            _freeSemaphore = device().createSemaphore({});
-        }
-        auto img = _swapchain.acquireNextImage(-1, *_freeSemaphore, nullptr);
-        vk::resultCheck(img.first, "vk::SwapchainKHR::acquireNextImage");
-        _layout = vk::ImageLayout::eUndefined;
-        _lastStage = _lastWriteStage = vk::PipelineStageFlagBits::eTopOfPipe;
-        _lastAccess = _lastWriteAccess = {};
-        _currentImage = (int) img.second;
-        std::swap(_images[_currentImage].semaphore, _freeSemaphore);
-        semaphorePending = true;
-    }
-    // Insert barrier & semaphore
-    auto& current = _images[_currentImage];
-    barrier(recorder, current.image, stage, access, layout);
-    if (semaphorePending) {
-        recorder.waitSemaphore(*current.semaphore,
-                               vk::PipelineStageFlagBits::eColorAttachmentOutput | vk::PipelineStageFlagBits::eTransfer);
-    }
-    return {current.image, *current.view, *current.framebuffer};
-}
-
-void VKSwapchainSurfaceData::flush(VKRecorder& recorder) {
-    if (_currentImage == (uint32_t) -1) {
-        return; // Nothing to flush
-    }
-    recorder.record(true); // Force flush current render pass before accessing image with present layout.
-    access(recorder, vk::PipelineStageFlagBits::eTopOfPipe, {}, vk::ImageLayout::ePresentSrcKHR);
-    auto& current = _images[_currentImage];
-    recorder.signalSemaphore(*current.semaphore);
-    recorder.flush();
-    device().queue().presentKHR(vk::PresentInfoKHR {
-            *current.semaphore, *_swapchain, _currentImage
-    });
-    _currentImage = (uint32_t) -1;
-}

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

@@ -27,10 +27,62 @@
 #ifndef VKSurfaceData_h_Included
 #define VKSurfaceData_h_Included
 
-#include <mutex>
-#include "jni.h"
+#include "java_awt_image_AffineTransformOp.h"
+#include "sun_java2d_pipe_hw_AccelSurface.h"
+
 #include "SurfaceData.h"
-#include "VKBase.h"
+#include "Trace.h"
+
+/**
+ * The VKSDOps structure describes a native Vulkan surface and contains all
+ * information pertaining to the native surface.  Some information about
+ * the more important/different fields:
+ *
+ *     void *privOps;
+ * Pointer to native-specific SurfaceData info, such as the
+ * native Drawable handle and GraphicsConfig data.
+ *
+ *     jobject graphicsConfig;
+ * Strong reference to the VKGraphicsConfig used by this VKSurfaceData.
+ *
+ *     jint drawableType;
+ * The surface type; can be any one of the surface type constants defined
+ * below (VK_WINDOW, VK_TEXTURE, etc).
+ *
+ *     jboolean isOpaque;
+ * If true, the surface should be treated as being fully opaque.
+ *
+ *     jboolean needsInit;
+ * If true, the surface requires some one-time initialization, which should
+ * be performed after a context has been made current to the surface for
+ * the first time.
+ *
+ *     jint x/yOffset
+ * The offset in pixels of the Vulkan viewport origin from the lower-left
+ * corner of the heavyweight drawable.
+ *
+ *     jint width/height;
+ * The cached surface bounds.  For offscreen surface types (VK_RT_TEXTURE,
+ * VK_TEXTURE, etc.) these values must remain constant.  Onscreen window
+ * surfaces (VK_WINDOW, etc.) may have their
+ * bounds changed in response to a programmatic or user-initiated event, so
+ * these values represent the last known dimensions.  To determine the true
+ * current bounds of this surface, query the native Drawable through the
+ * privOps field.
+ *
+ */
+typedef struct _VKSDOps {
+    SurfaceDataOps               sdOps;
+    void                         *privOps;
+    jobject                      graphicsConfig;
+    jint                         drawableType;
+    jboolean                     isOpaque;
+    jboolean                     needsInit;
+    jint                         xOffset;
+    jint                         yOffset;
+    jint                         width;
+    jint                         height;
+  } VKSDOps;
 
 /**
  * These are shorthand names for the surface type constants defined in
@@ -40,123 +92,4 @@
 #define VKSD_WINDOW          sun_java2d_pipe_hw_AccelSurface_WINDOW
 #define VKSD_TEXTURE         sun_java2d_pipe_hw_AccelSurface_TEXTURE
 #define VKSD_RT_TEXTURE      sun_java2d_pipe_hw_AccelSurface_RT_TEXTURE
-
-class VKRecorder;
-
-struct VKSurfaceImage {
-    vk::Image       image;
-    vk::ImageView   view;
-    vk::Framebuffer framebuffer; // Only if dynamic rendering is off.
-};
-
-class VKSurfaceData : private SurfaceDataOps {
-    std::recursive_mutex   _mutex;
-    uint32_t               _width;
-    uint32_t               _height;
-    uint32_t               _scale; // TODO Is it needed there at all?
-    uint32_t               _bg_color;
-protected:
-    VKDevice*              _device;
-    vk::Format             _format;
-
-    vk::ImageLayout         _layout = vk::ImageLayout::eUndefined;
-    // We track any access and write access separately, as read-read access does not need synchronization.
-    vk::PipelineStageFlags _lastStage = vk::PipelineStageFlagBits::eTopOfPipe;
-    vk::PipelineStageFlags _lastWriteStage = vk::PipelineStageFlagBits::eTopOfPipe;
-    vk::AccessFlags        _lastAccess = {};
-    vk::AccessFlags        _lastWriteAccess = {};
-
-    /// Insert barrier if needed for given access and layout.
-    bool barrier(VKRecorder& recorder, vk::Image image,
-                 vk::PipelineStageFlags stage, vk::AccessFlags access, vk::ImageLayout layout);
-public:
-    VKSurfaceData(uint32_t w, uint32_t h, uint32_t s, uint32_t bgc);
-    // No need to move, as object must only be created with "new".
-    VKSurfaceData(VKSurfaceData&&) = delete;
-    VKSurfaceData& operator=(VKSurfaceData&&) = delete;
-
-    void attachToJavaSurface(JNIEnv *env, jobject javaSurfaceData);
-
-    VKDevice& device() const {
-        return *_device;
-    }
-
-    vk::Format format() const {
-        return _format;
-    }
-
-    uint32_t width() const {
-        return _width;
-    }
-
-    uint32_t height() const {
-        return _height;
-    }
-
-    uint32_t scale() const {
-        return _scale;
-    }
-
-    uint32_t bg_color() const {
-        return _bg_color;
-    }
-
-    void set_bg_color(uint32_t bg_color) {
-        if (_bg_color != bg_color) {
-            _bg_color = bg_color;
-            // TODO now we need to repaint the surface???
-        }
-    }
-
-    virtual ~VKSurfaceData() = default;
-
-    virtual void revalidate(uint32_t w, uint32_t h, uint32_t s) {
-        _width = w;
-        _height = h;
-        _scale = s;
-    }
-
-    /// Prepare image for access (necessary barriers & layout transitions).
-    virtual VKSurfaceImage access(VKRecorder& recorder,
-                                  vk::PipelineStageFlags stage,
-                                  vk::AccessFlags access,
-                                  vk::ImageLayout layout) = 0;
-    /// Flush all pending changes to the surface, including screen presentation for on-screen surfaces.
-    virtual void flush(VKRecorder& recorder) = 0;
-};
-
-class VKSwapchainSurfaceData : public VKSurfaceData {
-    struct Image {
-        vk::Image             image;
-        vk::raii::ImageView   view;
-        vk::raii::Framebuffer framebuffer = nullptr; // Only if dynamic rendering is off.
-        vk::raii::Semaphore   semaphore = nullptr;
-    };
-
-    vk::raii::SurfaceKHR   _surface = nullptr;
-    vk::raii::SwapchainKHR _swapchain = nullptr;
-    std::vector<Image>     _images;
-    uint32_t               _currentImage = (uint32_t) -1;
-    vk::raii::Semaphore    _freeSemaphore = nullptr;
-
-protected:
-    void reset(VKDevice& device, vk::raii::SurfaceKHR surface) {
-        _images.clear();
-        _swapchain = nullptr;
-        _surface = std::move(surface);
-        _device = &device;
-    }
-public:
-    VKSwapchainSurfaceData(uint32_t w, uint32_t h, uint32_t s, uint32_t bgc)
-            : VKSurfaceData(w, h, s, bgc) {};
-
-    virtual void revalidate(uint32_t w, uint32_t h, uint32_t s);
-
-    virtual VKSurfaceImage access(VKRecorder& recorder,
-                                  vk::PipelineStageFlags stage,
-                                  vk::AccessFlags access,
-                                  vk::ImageLayout layout);
-    virtual void flush(VKRecorder& recorder);
-};
-
 #endif /* VKSurfaceData_h_Included */

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -67,8 +67,12 @@
 #endif
 
 #ifndef DISABLE_FONTCONFIG
-#include "fontconfigmanager.h"
-#include <fontconfig/fontconfig.h>
+/* Use bundled fontconfig.h for now */
+#include "fontconfig.h"
+#endif
+
+#ifndef FC_LCD_FILTER
+#define FC_LCD_FILTER	"lcdfilter"
 #endif
 
 #ifndef FC_LCD_NONE
@@ -96,8 +100,16 @@
 #define  FT26Dot6ToIntRound(x) (((int)(x + (1 << 5))) >> 6)
 #define  FT26Dot6ToIntCeil(x) (((int)(x - 1 + (1 << 6))) >> 6)
 #define  IntToFT26Dot6(x) (((FT_Fixed)(x)) << 6)
+#define  DEFAULT_DPI 72
+#define  MAX_DPI 1024
+#define  ADJUST_FONT_SIZE(X, DPI) (((X)*DEFAULT_DPI + ((DPI)>>1))/(DPI))
 #define  FLOOR_DIV(X, Y) ((X) >= 0 ? (X) / (Y) : ((X) - (Y) + 1) / (Y))
 
+#ifndef DISABLE_FONTCONFIG
+#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
+#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1")
+#endif
+
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -203,14 +215,78 @@ static jmethodID invalidateScalerMID;
 static jboolean  debugFonts; // Stores the value of FontUtilities.debugFonts()
 static jmethodID getDefaultToolkitMID;
 static jclass tkClass;
+static jmethodID getScreenResolutionMID;
 static jfieldID platNameFID;
 static jfieldID familyNameFID;
 
+#ifndef DISABLE_FONTCONFIG
+typedef FcBool (*FcPatternAddPtrType) (FcPattern *p, const char *object, FcValue value, FcBool append);
+typedef FcBool (*FcPatternAddBoolPtrType) (FcPattern *p, const char *object, FcBool b);
+typedef FcBool (*FcPatternAddDoublePtrType) (FcPattern *p, const char *object, double d);
+typedef FcBool (*FcConfigSubstitutePtrType) (FcConfig *config, FcPattern *p, FcMatchKind kind);
+typedef void (*FcDefaultSubstitutePtrType) (FcPattern *pattern);
+typedef FcPattern* (*FcPatternCreatePtrType) ();
+typedef FcPattern* (*FcFontMatchPtrType) (FcConfig *config, FcPattern *p, FcResult *result);
+typedef void (*FcPatternDestroyPtrType) (FcPattern *p);
+typedef FcResult (*FcPatternGetBoolPtrType) (const FcPattern *p, const char *object, int n, FcBool *b);
+typedef FcResult (*FcPatternGetIntegerPtrType) (const FcPattern *p, const char *object, int n, int *i);
+typedef FT_Error (*FtLibrarySetLcdFilterPtrType) (FT_Library library, FT_LcdFilter  filter);
+typedef FcBool (*FcConfigParseAndLoadPtrType) (FcConfig *config, const FcChar8 *file, FcBool complain);
+typedef FcBool (*FcConfigSetCurrentPtrType) (FcConfig *config);
+typedef FcConfig * (*FcInitLoadConfigAndFontsPtrType)();
+typedef int (*FcGetVersionPtrType)();
+#endif
+
+static void *libFontConfig = NULL;
 static jboolean logFC = JNI_FALSE;
 static jboolean logFFS = JNI_FALSE;
 
+#ifndef DISABLE_FONTCONFIG
+static FcPatternAddPtrType FcPatternAddPtr;
+static FcPatternAddBoolPtrType FcPatternAddBoolPtr;
+static FcPatternAddDoublePtrType FcPatternAddDoublePtr;
+static FcConfigSubstitutePtrType FcConfigSubstitutePtr;
+static FcDefaultSubstitutePtrType FcDefaultSubstitutePtr;
+static FcPatternCreatePtrType FcPatternCreatePtr;
+static FcFontMatchPtrType FcFontMatchPtr;
+static FcPatternDestroyPtrType FcPatternDestroyPtr;
+static FcPatternGetBoolPtrType FcPatternGetBoolPtr;
+static FcPatternGetIntegerPtrType FcPatternGetIntegerPtr;
+static FcConfigParseAndLoadPtrType FcConfigParseAndLoadPtr;
+static FcConfigSetCurrentPtrType FcConfigSetCurrentPtr;
+static FcInitLoadConfigAndFontsPtrType FcInitLoadConfigAndFontsPtr;
+static FcGetVersionPtrType FcGetVersionPtr;
+#endif
+
 static FT_UnitVector subpixelGlyphResolution;
 
+static void* openFontConfig() {
+    void* libfontconfig = NULL;
+#ifndef DISABLE_FONTCONFIG
+    char *fcLogEnabled = getenv("OPENJDK_FFS_LOG_FC");
+
+    if (fcLogEnabled != NULL && !strcmp(fcLogEnabled, "yes")) {
+        logFC = JNI_TRUE;
+    }
+
+    char *useFC = getenv("OPENJDK_FFS_USE_FC");
+    if (useFC != NULL && !strcmp(useFC, "no")) {
+        if (logFC) fprintf(stderr, "FC_LOG: fontconfig disabled in freetypescaler\n");
+        return NULL;
+    }
+
+    libfontconfig = dlopen(FONTCONFIG_DLL_VERSIONED, RTLD_LOCAL | RTLD_LAZY);
+    if (libfontconfig == NULL) {
+        libfontconfig = dlopen(FONTCONFIG_DLL, RTLD_LOCAL | RTLD_LAZY);
+        if (libfontconfig == NULL) {
+            if (logFC) fprintf(stderr, "FC_LOG: cannot open %s\n", FONTCONFIG_DLL);
+            return NULL;
+        }
+    }
+#endif
+    return libfontconfig;
+}
+
 JNIEXPORT void JNICALL
 Java_sun_font_FreetypeFontScaler_initIDs(
         JNIEnv *env, jobject scaler, jclass FFSClass, jclass TKClass,
@@ -239,14 +315,57 @@ Java_sun_font_FreetypeFontScaler_initIDs(
     getDefaultToolkitMID =
         (*env)->GetStaticMethodID(env, TKClass, "getDefaultToolkit",
                                   "()Ljava/awt/Toolkit;");
+    getScreenResolutionMID =
+        (*env)->GetMethodID(env, TKClass, "getScreenResolution", "()I");
     tkClass = (*env)->NewGlobalRef(env, TKClass);
     platNameFID = (*env)->GetFieldID(env, PFClass, "platName", "Ljava/lang/String;");
     familyNameFID = (*env)->GetFieldID(env, PFClass, "familyName", "Ljava/lang/String;");
+    libFontConfig = openFontConfig();
+#ifndef DISABLE_FONTCONFIG
+    if (libFontConfig) {
+        FcConfig* fcConfig;
+        FcBool result;
+        FcPatternAddPtr = (FcPatternAddPtrType) dlsym(libFontConfig, "FcPatternAdd");
+        FcPatternAddBoolPtr = (FcPatternAddBoolPtrType) dlsym(libFontConfig, "FcPatternAddBool");
+        FcPatternAddDoublePtr = (FcPatternAddDoublePtrType) dlsym(libFontConfig, "FcPatternAddDouble");
+        FcConfigSubstitutePtr = (FcConfigSubstitutePtrType) dlsym(libFontConfig, "FcConfigSubstitute");
+        FcDefaultSubstitutePtr = (FcDefaultSubstitutePtrType)  dlsym(libFontConfig, "FcDefaultSubstitute");
+        FcPatternCreatePtr = (FcPatternCreatePtrType)  dlsym(libFontConfig, "FcPatternCreate");
+        FcFontMatchPtr = (FcFontMatchPtrType)  dlsym(libFontConfig, "FcFontMatch");
+        FcPatternDestroyPtr = (FcPatternDestroyPtrType)  dlsym(libFontConfig, "FcPatternDestroy");
+        FcPatternGetBoolPtr = (FcPatternGetBoolPtrType)  dlsym(libFontConfig, "FcPatternGetBool");
+        FcPatternGetIntegerPtr = (FcPatternGetIntegerPtrType)  dlsym(libFontConfig, "FcPatternGetInteger");
+        FcConfigParseAndLoadPtr = (FcConfigParseAndLoadPtrType) dlsym(libFontConfig, "FcConfigParseAndLoad");
+        FcConfigSetCurrentPtr =  (FcConfigSetCurrentPtrType) dlsym(libFontConfig, "FcConfigSetCurrent");
+        FcInitLoadConfigAndFontsPtr = (FcInitLoadConfigAndFontsPtrType) dlsym(libFontConfig, "FcInitLoadConfigAndFonts");
+        FcGetVersionPtr = (FcGetVersionPtrType) dlsym(libFontConfig, "FcGetVersion");
 
+
+        if (logFC) fprintf(stderr, "FC_LOG: fontconfig version %d \n", (*FcGetVersionPtr)());
+        fcConfig = (*FcInitLoadConfigAndFontsPtr)();
+        if (fcConfig != NULL && fontConf != NULL) {
+            result = (*FcConfigParseAndLoadPtr)(fcConfig, (const FcChar8 *) fontConf, FcFalse);
+            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad %d \n", result);
+            result = (*FcConfigSetCurrentPtr)(fcConfig);
+            if (logFC) fprintf(stderr, "FC_LOG: FcConfigSetCurrent %d \n", result);
+        }
+        else {
+            if (logFC) {
+                if (fontConf) {
+                    fprintf(stderr, "FC_LOG: FcInitLoadConfigAndFonts failed\n");
+                }
+                else {
+                    fprintf(stderr, "FC_LOG: FcInitLoadConfigAndFonts disabled\n");
+                }
+            }
+        }
+    }
+#endif
+    if (fontConf) {
+        (*env)->ReleaseStringUTFChars(env, jreFontConfName, fontConf);
+    }
 }
 
-typedef FT_Error (*FtLibrarySetLcdFilterPtrType) (FT_Library library, FT_LcdFilter  filter);
-
 static FT_Error FT_Library_SetLcdFilter_Proxy(FT_Library library, FT_LcdFilter  filter) {
 #ifndef DISABLE_FONTCONFIG
     static FtLibrarySetLcdFilterPtrType FtLibrarySetLcdFilterPtr = NULL;
@@ -269,6 +388,46 @@ static FT_Error FT_Library_SetLcdFilter_Proxy(FT_Library library, FT_LcdFilter
 #endif
 }
 
+static int getScreenResolution(JNIEnv *env) {
+/*
+ * Actual screen dpi is necessary only for fontconfig requests
+ */
+#ifndef DISABLE_FONTCONFIG
+    jthrowable exc;
+    jclass tk = (*env)->CallStaticObjectMethod(
+        env, tkClass, getDefaultToolkitMID);
+    exc = (*env)->ExceptionOccurred(env);
+    if (exc) {
+        (*env)->ExceptionClear(env);
+        return DEFAULT_DPI;
+    }
+    int dpi = (*env)->CallIntMethod(env, tk, getScreenResolutionMID);
+
+    /* Test if there is no exception here (can get java.awt.HeadlessException)
+     * Fallback to default DPI otherwise
+     */
+    exc = (*env)->ExceptionOccurred(env);
+    if (exc) {
+        (*env)->ExceptionClear(env);
+        return DEFAULT_DPI;
+    }
+
+    /* Some configurations report invalid dpi settings */
+    if (dpi > MAX_DPI) {
+        if (logFFS) {
+            fprintf(stderr, "FFS_LOG: Invalid dpi reported (%d) replaced with default (%d)\n", dpi, DEFAULT_DPI);
+        }
+        return DEFAULT_DPI;
+    }
+    if (logFFS) {
+        fprintf(stderr, "FFS_LOG: Screen Resolution (%d) dpi\n", dpi);
+    }
+    return dpi;
+#else
+    return DEFAULT_DPI;
+#endif
+}
+
 static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) {
 
     if (scalerInfo == NULL)
@@ -769,33 +928,25 @@ static void setDefaultScalerSettings(FTScalerContext *context) {
     context->renderFlags = FT_LOAD_TARGET_MODE(context->loadFlags);
 }
 
-#ifndef DISABLE_FONTCONFIG
-static FcBool getRenderingSettingsField(int *target, int value) {
-    *target = value;
-    return (value != -1) ? FcTrue : FcFalse;
-}
-#endif
-
 static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo, FTScalerContext *context,
                           FT_Bool configureFont) {
     FT_Matrix matrix;
     int errCode = 0;
     scalerInfo->env = env;
     scalerInfo->font2D = font2D;
-    const char *cfontFamilyName = NULL;
-    const char *cfontPath = NULL;
-    jstring jfontFamilyName = NULL;
-    jstring jfontPath = NULL;
 
     if (context != NULL) {
         context->colorFont = FT_HAS_COLOR(scalerInfo->face) || !FT_IS_SCALABLE(scalerInfo->face);
 
         setupTransform(&matrix, context);
         FT_Set_Transform(scalerInfo->face, &matrix, NULL);
+        FT_UInt dpi = (FT_UInt) getScreenResolution(env);
 
         if (FT_IS_SCALABLE(scalerInfo->face)) { // Standard scalable face
             context->fixedSizeIndex = -1;
-            errCode = FT_Set_Char_Size(scalerInfo->face, 0, context->ptsz, 72, 72);
+            errCode = FT_Set_Char_Size(scalerInfo->face, 0,
+                                       ADJUST_FONT_SIZE(context->ptsz, dpi),
+                                       dpi, dpi);
         } else { // Non-scalable face (that should only be bitmap faces)
             const int ptsz = context->ptsz;
             // Best size is smallest, but not smaller than requested
@@ -812,33 +963,35 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
                 }
             }
             context->fixedSizeIndex = bestSizeIndex;
-            errCode = FT_Set_Char_Size(scalerInfo->face, 0, bestSize, 72, 72);
+            errCode = FT_Set_Char_Size(scalerInfo->face, 0,
+                                       ADJUST_FONT_SIZE(bestSize, dpi),
+                                       dpi, dpi);
         }
-
         if (errCode) return errCode;
 
         errCode = FT_Activate_Size(scalerInfo->face->size);
         if (errCode) return errCode;
-
         if (configureFont) {
             context->renderFlags = FT_RENDER_MODE_NORMAL;
             context->lcdFilter = FT_LCD_FILTER_NONE;
             context->loadFlags = FT_LOAD_DEFAULT;
 
-#ifdef DISABLE_FONTCONFIG
-            setDefaultScalerSettings(context);
-            return 0;
-#else
-            jfontFamilyName = (*env)->GetObjectField(env, font2D, familyNameFID);
-            cfontFamilyName = (*env)->GetStringUTFChars(env, jfontFamilyName, NULL);
-            jfontPath = (*env)->GetObjectField(env, font2D, platNameFID);
-            cfontPath = (*env)->GetStringUTFChars(env, jfontPath, NULL);
+            if (libFontConfig == NULL) {
+                setDefaultScalerSettings(context);
+                return 0;
+            }
+#ifndef DISABLE_FONTCONFIG
+            jstring jfontFamilyName = (*env)->GetObjectField(env, font2D, familyNameFID);
+            const char *cfontFamilyName = (*env)->GetStringUTFChars(env, jfontFamilyName, NULL);
 
             if (logFC) {
+                jstring jfontPath = (*env)->GetObjectField(env, font2D, platNameFID);
+                char *cfontPath = (char*)(*env)->GetStringUTFChars(env, jfontPath, NULL);
                 fprintf(stderr, "FC_LOG: %s %s ", cfontFamilyName, cfontPath);
+                (*env)->ReleaseStringUTFChars(env, jfontPath, cfontPath);
             }
 
-            double fcSize = FT26Dot6ToDouble(context->ptsz);
+            double fcSize = FT26Dot6ToDouble(ADJUST_FONT_SIZE(context->ptsz, dpi));
             if (logFC) fprintf(stderr, " size=%f", fcSize);
 
             // Find cached value
@@ -852,33 +1005,55 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
             }
 
             if (cachedMatch.fcSize == 0) {
-                RenderingFontHints renderingFontHints;
-                int status = setupRenderingFontHints(cfontFamilyName, NULL, fcSize, &renderingFontHints);
-                if (status != 0) {
-                    if (cfontPath) {
-                        (*env)->ReleaseStringUTFChars(env, jfontPath, cfontPath);
-                    }
-                    if (cfontFamilyName) {
-                        (*env)->ReleaseStringUTFChars(env, jfontFamilyName, cfontFamilyName);
-                    }
+                cachedMatch.fcSize = fcSize;
+                clock_t begin = logFC ? clock() : 0;
+                // Setup query
+                FcPattern *fcPattern = 0;
+                fcPattern = (*FcPatternCreatePtr)();
+                FcValue fcValue;
+                fcValue.type = FcTypeString;
+
+                fcValue.u.s = (const FcChar8 *) cfontFamilyName;
+                (*FcPatternAddPtr)(fcPattern, FC_FAMILY, fcValue, FcTrue);
+                (*FcPatternAddBoolPtr)(fcPattern, FC_SCALABLE, FcTrue);
+                (*FcPatternAddDoublePtr)(fcPattern, FC_SIZE, fcSize);
+
+                (*FcConfigSubstitutePtr)(0, fcPattern, FcMatchPattern);
+                (*FcDefaultSubstitutePtr)(fcPattern);
+                FcResult matchResult = FcResultNoMatch;
+                // Match on pattern
+                FcPattern *resultPattern = 0;
+                resultPattern = (*FcFontMatchPtr)(0, fcPattern, &matchResult);
+
+                if (logFC) {
+                    clock_t end = clock();
+                    double time_spent = (double)(end - begin) * 1000.0 / CLOCKS_PER_SEC;
+                    fprintf(stderr, " in %f ms", time_spent);
+                }
+
+                if (matchResult != FcResultMatch) {
+                    (*FcPatternDestroyPtr)(fcPattern);
+                    if (logFC) fprintf(stderr, " - NOT FOUND\n");
                     setDefaultScalerSettings(context);
                     return 0;
                 }
+                (*FcPatternDestroyPtr)(fcPattern);
+                FcPattern *pattern = resultPattern;
 
-                cachedMatch.fcSize = fcSize;
+                // Extract values from result
+                cachedMatch.fcHintingSet = (*FcPatternGetBoolPtr)(pattern, FC_HINTING, 0, &cachedMatch.fcHinting) == FcResultMatch;
 
-                cachedMatch.fcHintingSet =
-                        getRenderingSettingsField(&cachedMatch.fcHinting, renderingFontHints.fcHinting);
                 cachedMatch.fcHintStyleSet =
-                        getRenderingSettingsField(&cachedMatch.fcHintStyle, renderingFontHints.fcHintStyle);
-                cachedMatch.fcAntialiasSet =
-                        getRenderingSettingsField(&cachedMatch.fcAntialias, renderingFontHints.fcAntialias);
-                cachedMatch.fcAutohintSet =
-                        getRenderingSettingsField(&cachedMatch.fcAutohint, renderingFontHints.fcAutohint);
+                        (*FcPatternGetIntegerPtr)(pattern, FC_HINT_STYLE, 0, &cachedMatch.fcHintStyle) == FcResultMatch;
+
+                cachedMatch.fcAntialiasSet = (*FcPatternGetBoolPtr)(pattern, FC_ANTIALIAS, 0, &cachedMatch.fcAntialias) == FcResultMatch;
+                cachedMatch.fcAutohintSet = (*FcPatternGetBoolPtr)(pattern, FC_AUTOHINT, 0, &cachedMatch.fcAutohint) == FcResultMatch;
                 cachedMatch.fcLCDFilterSet =
-                        getRenderingSettingsField(&cachedMatch.fcRGBA, renderingFontHints.fcRGBA);
-                cachedMatch.fcRGBASet =
-                        getRenderingSettingsField(&cachedMatch.fcLCDFilter, renderingFontHints.fcLCDFilter);
+                        (*FcPatternGetIntegerPtr)(pattern, FC_LCD_FILTER, 0, &cachedMatch.fcLCDFilter) == FcResultMatch;
+
+                cachedMatch.fcRGBASet = (*FcPatternGetIntegerPtr)(pattern, FC_RGBA, 0, &cachedMatch.fcRGBA) == FcResultMatch;
+
+                (*FcPatternDestroyPtr)(pattern);
 
                 if (NUM_CACHED_VALUES > 0) {
                     int nextCacheIdx = scalerInfo->nextCacheIdx;
@@ -1030,14 +1205,8 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
                 }
             }
 
+            (*env)->ReleaseStringUTFChars(env, jfontFamilyName, cfontFamilyName);
             if (logFC) fprintf(stderr, "\n");
-
-            if (cfontPath) {
-                (*env)->ReleaseStringUTFChars(env, jfontPath, cfontPath);
-            }
-            if (cfontFamilyName) {
-                (*env)->ReleaseStringUTFChars(env, jfontFamilyName, cfontFamilyName);
-            }
 #endif
         }
 
@@ -2554,4 +2723,13 @@ Java_sun_font_FreetypeFontScaler_getGlyphPointNative(
 
     return (*env)->NewObject(env, sunFontIDs.pt2DFloatClass,
                              sunFontIDs.pt2DFloatCtr, x, y);
-}
+}
+
+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM *vm, void *reserved) {
+    if (libFontConfig != NULL) {
+#ifndef DISABLE_FONTCONFIG
+        dlclose(libFontConfig);
+#endif
+    }
+}

src/java.desktop/share/native/libvmahpp/vk_mem_alloc.hpp

@@ -1,135 +0,0 @@
-#ifndef VULKAN_MEMORY_ALLOCATOR_HPP
-#define VULKAN_MEMORY_ALLOCATOR_HPP
-
-#if !defined(AMD_VULKAN_MEMORY_ALLOCATOR_H)
-#include <vk_mem_alloc.h>
-#endif
-
-#include <vulkan/vulkan.hpp>
-
-#if !defined(VMA_HPP_NAMESPACE)
-#define VMA_HPP_NAMESPACE vma
-#endif
-
-#define VMA_HPP_NAMESPACE_STRING VULKAN_HPP_STRINGIFY(VMA_HPP_NAMESPACE)
-
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VMA_HPP_NAMESPACE {
-  struct Dispatcher {}; // VMA uses function pointers from VmaAllocator instead
-  class Allocator;
-
-  template<class T>
-  VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher> createUniqueHandle(const T& t) VULKAN_HPP_NOEXCEPT {
-    return VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher>(t);
-  }
-  template<class T, class O>
-  VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher> createUniqueHandle(const T& t, const O* o) VULKAN_HPP_NOEXCEPT {
-    return VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher>(t, o);
-  }
-  template<class F, class S, class O>
-  std::pair<VULKAN_HPP_NAMESPACE::UniqueHandle<F, Dispatcher>, VULKAN_HPP_NAMESPACE::UniqueHandle<S, Dispatcher>>
-          createUniqueHandle(const std::pair<F, S>& t, const O* o) VULKAN_HPP_NOEXCEPT {
-    return {
-            VULKAN_HPP_NAMESPACE::UniqueHandle<F, Dispatcher>(t.first, o),
-            VULKAN_HPP_NAMESPACE::UniqueHandle<S, Dispatcher>(t.second, o)
-    };
-  }
-
-  template<class T, class UniqueVectorAllocator, class VectorAllocator, class O>
-  std::vector<VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher>, UniqueVectorAllocator>
-        createUniqueHandleVector(const std::vector<T, VectorAllocator>& vector, const O* o,
-                                 const UniqueVectorAllocator& vectorAllocator) VULKAN_HPP_NOEXCEPT {
-    std::vector<VULKAN_HPP_NAMESPACE::UniqueHandle<T, Dispatcher>, UniqueVectorAllocator> result(vectorAllocator);
-    result.reserve(vector.size());
-    for (const T& t : vector) result.emplace_back(t, o);
-    return result;
-  }
-
-  template<class T, class Owner> class Deleter {
-    const Owner* owner;
-  public:
-    Deleter() = default;
-    Deleter(const Owner* owner) VULKAN_HPP_NOEXCEPT : owner(owner) {}
-  protected:
-    void destroy(const T& t) VULKAN_HPP_NOEXCEPT; // Implemented manually for each handle type
-  };
-  template<class T> class Deleter<T, void> {
-  protected:
-    void destroy(const T& t) VULKAN_HPP_NOEXCEPT { t.destroy(); }
-  };
-}
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct UniqueHandleTraits<Buffer, VMA_HPP_NAMESPACE::Dispatcher> {
-    using deleter = VMA_HPP_NAMESPACE::Deleter<Buffer, VMA_HPP_NAMESPACE::Allocator>;
-  };
-  template<> struct UniqueHandleTraits<Image, VMA_HPP_NAMESPACE::Dispatcher> {
-    using deleter = VMA_HPP_NAMESPACE::Deleter<Image, VMA_HPP_NAMESPACE::Allocator>;
-  };
-}
-namespace VMA_HPP_NAMESPACE {
-  using UniqueBuffer = VULKAN_HPP_NAMESPACE::UniqueHandle<VULKAN_HPP_NAMESPACE::Buffer, Dispatcher>;
-  using UniqueImage = VULKAN_HPP_NAMESPACE::UniqueHandle<VULKAN_HPP_NAMESPACE::Image, Dispatcher>;
-}
-#endif
-
-#include "vk_mem_alloc_enums.hpp"
-#include "vk_mem_alloc_handles.hpp"
-#include "vk_mem_alloc_structs.hpp"
-#include "vk_mem_alloc_funcs.hpp"
-
-namespace VMA_HPP_NAMESPACE {
-  
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-# define VMA_HPP_DESTROY_IMPL(NAME) \
-  template<> VULKAN_HPP_INLINE void VULKAN_HPP_NAMESPACE::UniqueHandleTraits<NAME, Dispatcher>::deleter::destroy(const NAME& t) VULKAN_HPP_NOEXCEPT
-
-  VMA_HPP_DESTROY_IMPL(VULKAN_HPP_NAMESPACE::Buffer) { owner->destroyBuffer(t, nullptr); }
-  VMA_HPP_DESTROY_IMPL(VULKAN_HPP_NAMESPACE::Image) { owner->destroyImage(t, nullptr); }
-  VMA_HPP_DESTROY_IMPL(Pool) { owner->destroyPool(t); }
-  VMA_HPP_DESTROY_IMPL(Allocation) { owner->freeMemory(t); }
-  VMA_HPP_DESTROY_IMPL(VirtualAllocation) { owner->virtualFree(t); }
-
-# undef VMA_HPP_DESTROY_IMPL
-#endif
-
-  template<class InstanceDispatcher, class DeviceDispatcher>
-  VULKAN_HPP_CONSTEXPR VulkanFunctions functionsFromDispatcher(InstanceDispatcher const * instance,
-                                                               DeviceDispatcher const * device) VULKAN_HPP_NOEXCEPT {
-    return VulkanFunctions {
-            instance->vkGetInstanceProcAddr,
-            instance->vkGetDeviceProcAddr,
-            instance->vkGetPhysicalDeviceProperties,
-            instance->vkGetPhysicalDeviceMemoryProperties,
-            device->vkAllocateMemory,
-            device->vkFreeMemory,
-            device->vkMapMemory,
-            device->vkUnmapMemory,
-            device->vkFlushMappedMemoryRanges,
-            device->vkInvalidateMappedMemoryRanges,
-            device->vkBindBufferMemory,
-            device->vkBindImageMemory,
-            device->vkGetBufferMemoryRequirements,
-            device->vkGetImageMemoryRequirements,
-            device->vkCreateBuffer,
-            device->vkDestroyBuffer,
-            device->vkCreateImage,
-            device->vkDestroyImage,
-            device->vkCmdCopyBuffer,
-            device->vkGetBufferMemoryRequirements2KHR ? device->vkGetBufferMemoryRequirements2KHR : device->vkGetBufferMemoryRequirements2,
-            device->vkGetImageMemoryRequirements2KHR ? device->vkGetImageMemoryRequirements2KHR : device->vkGetImageMemoryRequirements2,
-            device->vkBindBufferMemory2KHR ? device->vkBindBufferMemory2KHR : device->vkBindBufferMemory2,
-            device->vkBindImageMemory2KHR ? device->vkBindImageMemory2KHR : device->vkBindImageMemory2,
-            instance->vkGetPhysicalDeviceMemoryProperties2KHR ? instance->vkGetPhysicalDeviceMemoryProperties2KHR : instance->vkGetPhysicalDeviceMemoryProperties2,
-            device->vkGetDeviceBufferMemoryRequirements,
-            device->vkGetDeviceImageMemoryRequirements
-    };
-  }
-
-  template<class Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
-  VULKAN_HPP_CONSTEXPR VulkanFunctions functionsFromDispatcher(Dispatch const & dispatch
-    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT) VULKAN_HPP_NOEXCEPT {
-    return functionsFromDispatcher(&dispatch, &dispatch);
-  }
-}
-
-#endif

src/java.desktop/share/native/libvmahpp/vk_mem_alloc_enums.hpp

@@ -1,478 +0,0 @@
-#ifndef VULKAN_MEMORY_ALLOCATOR_ENUMS_HPP
-#define VULKAN_MEMORY_ALLOCATOR_ENUMS_HPP
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class AllocatorCreateFlagBits : VmaAllocatorCreateFlags {
-    eExternallySynchronized = VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT,
-    eKhrDedicatedAllocation = VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT,
-    eKhrBindMemory2 = VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT,
-    eExtMemoryBudget = VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT,
-    eAmdDeviceCoherentMemory = VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT,
-    eBufferDeviceAddress = VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT,
-    eExtMemoryPriority = VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(AllocatorCreateFlagBits value) {
-    if (value == AllocatorCreateFlagBits::eExternallySynchronized) return "ExternallySynchronized";
-    if (value == AllocatorCreateFlagBits::eKhrDedicatedAllocation) return "KhrDedicatedAllocation";
-    if (value == AllocatorCreateFlagBits::eKhrBindMemory2) return "KhrBindMemory2";
-    if (value == AllocatorCreateFlagBits::eExtMemoryBudget) return "ExtMemoryBudget";
-    if (value == AllocatorCreateFlagBits::eAmdDeviceCoherentMemory) return "AmdDeviceCoherentMemory";
-    if (value == AllocatorCreateFlagBits::eBufferDeviceAddress) return "BufferDeviceAddress";
-    if (value == AllocatorCreateFlagBits::eExtMemoryPriority) return "ExtMemoryPriority";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::AllocatorCreateFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::AllocatorCreateFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eExternallySynchronized
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eKhrDedicatedAllocation
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eKhrBindMemory2
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eExtMemoryBudget
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eAmdDeviceCoherentMemory
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eBufferDeviceAddress
-      | VMA_HPP_NAMESPACE::AllocatorCreateFlagBits::eExtMemoryPriority;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using AllocatorCreateFlags = VULKAN_HPP_NAMESPACE::Flags<AllocatorCreateFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocatorCreateFlags operator|(AllocatorCreateFlagBits bit0, AllocatorCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocatorCreateFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocatorCreateFlags operator&(AllocatorCreateFlagBits bit0, AllocatorCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocatorCreateFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocatorCreateFlags operator^(AllocatorCreateFlagBits bit0, AllocatorCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocatorCreateFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocatorCreateFlags operator~(AllocatorCreateFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(AllocatorCreateFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(AllocatorCreateFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & AllocatorCreateFlagBits::eExternallySynchronized) result += "ExternallySynchronized | ";
-    if (value & AllocatorCreateFlagBits::eKhrDedicatedAllocation) result += "KhrDedicatedAllocation | ";
-    if (value & AllocatorCreateFlagBits::eKhrBindMemory2) result += "KhrBindMemory2 | ";
-    if (value & AllocatorCreateFlagBits::eExtMemoryBudget) result += "ExtMemoryBudget | ";
-    if (value & AllocatorCreateFlagBits::eAmdDeviceCoherentMemory) result += "AmdDeviceCoherentMemory | ";
-    if (value & AllocatorCreateFlagBits::eBufferDeviceAddress) result += "BufferDeviceAddress | ";
-    if (value & AllocatorCreateFlagBits::eExtMemoryPriority) result += "ExtMemoryPriority | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class MemoryUsage {
-    eUnknown = VMA_MEMORY_USAGE_UNKNOWN,
-    eGpuOnly = VMA_MEMORY_USAGE_GPU_ONLY,
-    eCpuOnly = VMA_MEMORY_USAGE_CPU_ONLY,
-    eCpuToGpu = VMA_MEMORY_USAGE_CPU_TO_GPU,
-    eGpuToCpu = VMA_MEMORY_USAGE_GPU_TO_CPU,
-    eCpuCopy = VMA_MEMORY_USAGE_CPU_COPY,
-    eGpuLazilyAllocated = VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED,
-    eAuto = VMA_MEMORY_USAGE_AUTO,
-    eAutoPreferDevice = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,
-    eAutoPreferHost = VMA_MEMORY_USAGE_AUTO_PREFER_HOST
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(MemoryUsage value) {
-    if (value == MemoryUsage::eUnknown) return "Unknown";
-    if (value == MemoryUsage::eGpuOnly) return "GpuOnly";
-    if (value == MemoryUsage::eCpuOnly) return "CpuOnly";
-    if (value == MemoryUsage::eCpuToGpu) return "CpuToGpu";
-    if (value == MemoryUsage::eGpuToCpu) return "GpuToCpu";
-    if (value == MemoryUsage::eCpuCopy) return "CpuCopy";
-    if (value == MemoryUsage::eGpuLazilyAllocated) return "GpuLazilyAllocated";
-    if (value == MemoryUsage::eAuto) return "Auto";
-    if (value == MemoryUsage::eAutoPreferDevice) return "AutoPreferDevice";
-    if (value == MemoryUsage::eAutoPreferHost) return "AutoPreferHost";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class AllocationCreateFlagBits : VmaAllocationCreateFlags {
-    eDedicatedMemory = VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT,
-    eNeverAllocate = VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT,
-    eMapped = VMA_ALLOCATION_CREATE_MAPPED_BIT,
-    eUserDataCopyString = VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT,
-    eUpperAddress = VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT,
-    eDontBind = VMA_ALLOCATION_CREATE_DONT_BIND_BIT,
-    eWithinBudget = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT,
-    eCanAlias = VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT,
-    eHostAccessSequentialWrite = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT,
-    eHostAccessRandom = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT,
-    eHostAccessAllowTransferInstead = VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT,
-    eStrategyMinMemory = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,
-    eStrategyMinTime = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,
-    eStrategyMinOffset = VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,
-    eStrategyBestFit = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT,
-    eStrategyFirstFit = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(AllocationCreateFlagBits value) {
-    if (value == AllocationCreateFlagBits::eDedicatedMemory) return "DedicatedMemory";
-    if (value == AllocationCreateFlagBits::eNeverAllocate) return "NeverAllocate";
-    if (value == AllocationCreateFlagBits::eMapped) return "Mapped";
-    if (value == AllocationCreateFlagBits::eUserDataCopyString) return "UserDataCopyString";
-    if (value == AllocationCreateFlagBits::eUpperAddress) return "UpperAddress";
-    if (value == AllocationCreateFlagBits::eDontBind) return "DontBind";
-    if (value == AllocationCreateFlagBits::eWithinBudget) return "WithinBudget";
-    if (value == AllocationCreateFlagBits::eCanAlias) return "CanAlias";
-    if (value == AllocationCreateFlagBits::eHostAccessSequentialWrite) return "HostAccessSequentialWrite";
-    if (value == AllocationCreateFlagBits::eHostAccessRandom) return "HostAccessRandom";
-    if (value == AllocationCreateFlagBits::eHostAccessAllowTransferInstead) return "HostAccessAllowTransferInstead";
-    if (value == AllocationCreateFlagBits::eStrategyMinMemory) return "StrategyMinMemory";
-    if (value == AllocationCreateFlagBits::eStrategyMinTime) return "StrategyMinTime";
-    if (value == AllocationCreateFlagBits::eStrategyMinOffset) return "StrategyMinOffset";
-    if (value == AllocationCreateFlagBits::eStrategyBestFit) return "StrategyBestFit";
-    if (value == AllocationCreateFlagBits::eStrategyFirstFit) return "StrategyFirstFit";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::AllocationCreateFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::AllocationCreateFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eDedicatedMemory
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eNeverAllocate
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eMapped
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eUserDataCopyString
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eUpperAddress
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eDontBind
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eWithinBudget
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eCanAlias
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eHostAccessSequentialWrite
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eHostAccessRandom
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eHostAccessAllowTransferInstead
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eStrategyMinMemory
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eStrategyMinTime
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eStrategyMinOffset
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eStrategyBestFit
-      | VMA_HPP_NAMESPACE::AllocationCreateFlagBits::eStrategyFirstFit;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using AllocationCreateFlags = VULKAN_HPP_NAMESPACE::Flags<AllocationCreateFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocationCreateFlags operator|(AllocationCreateFlagBits bit0, AllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocationCreateFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocationCreateFlags operator&(AllocationCreateFlagBits bit0, AllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocationCreateFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocationCreateFlags operator^(AllocationCreateFlagBits bit0, AllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return AllocationCreateFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR AllocationCreateFlags operator~(AllocationCreateFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(AllocationCreateFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(AllocationCreateFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & AllocationCreateFlagBits::eDedicatedMemory) result += "DedicatedMemory | ";
-    if (value & AllocationCreateFlagBits::eNeverAllocate) result += "NeverAllocate | ";
-    if (value & AllocationCreateFlagBits::eMapped) result += "Mapped | ";
-    if (value & AllocationCreateFlagBits::eUserDataCopyString) result += "UserDataCopyString | ";
-    if (value & AllocationCreateFlagBits::eUpperAddress) result += "UpperAddress | ";
-    if (value & AllocationCreateFlagBits::eDontBind) result += "DontBind | ";
-    if (value & AllocationCreateFlagBits::eWithinBudget) result += "WithinBudget | ";
-    if (value & AllocationCreateFlagBits::eCanAlias) result += "CanAlias | ";
-    if (value & AllocationCreateFlagBits::eHostAccessSequentialWrite) result += "HostAccessSequentialWrite | ";
-    if (value & AllocationCreateFlagBits::eHostAccessRandom) result += "HostAccessRandom | ";
-    if (value & AllocationCreateFlagBits::eHostAccessAllowTransferInstead) result += "HostAccessAllowTransferInstead | ";
-    if (value & AllocationCreateFlagBits::eStrategyMinMemory) result += "StrategyMinMemory | ";
-    if (value & AllocationCreateFlagBits::eStrategyMinTime) result += "StrategyMinTime | ";
-    if (value & AllocationCreateFlagBits::eStrategyMinOffset) result += "StrategyMinOffset | ";
-    if (value & AllocationCreateFlagBits::eStrategyBestFit) result += "StrategyBestFit | ";
-    if (value & AllocationCreateFlagBits::eStrategyFirstFit) result += "StrategyFirstFit | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class PoolCreateFlagBits : VmaPoolCreateFlags {
-    eIgnoreBufferImageGranularity = VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT,
-    eLinearAlgorithm = VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(PoolCreateFlagBits value) {
-    if (value == PoolCreateFlagBits::eIgnoreBufferImageGranularity) return "IgnoreBufferImageGranularity";
-    if (value == PoolCreateFlagBits::eLinearAlgorithm) return "LinearAlgorithm";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::PoolCreateFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::PoolCreateFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::PoolCreateFlagBits::eIgnoreBufferImageGranularity
-      | VMA_HPP_NAMESPACE::PoolCreateFlagBits::eLinearAlgorithm;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using PoolCreateFlags = VULKAN_HPP_NAMESPACE::Flags<PoolCreateFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR PoolCreateFlags operator|(PoolCreateFlagBits bit0, PoolCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return PoolCreateFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR PoolCreateFlags operator&(PoolCreateFlagBits bit0, PoolCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return PoolCreateFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR PoolCreateFlags operator^(PoolCreateFlagBits bit0, PoolCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return PoolCreateFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR PoolCreateFlags operator~(PoolCreateFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(PoolCreateFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(PoolCreateFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & PoolCreateFlagBits::eIgnoreBufferImageGranularity) result += "IgnoreBufferImageGranularity | ";
-    if (value & PoolCreateFlagBits::eLinearAlgorithm) result += "LinearAlgorithm | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class DefragmentationFlagBits : VmaDefragmentationFlags {
-    eFlagAlgorithmFast = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT,
-    eFlagAlgorithmBalanced = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT,
-    eFlagAlgorithmFull = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT,
-    eFlagAlgorithmExtensive = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(DefragmentationFlagBits value) {
-    if (value == DefragmentationFlagBits::eFlagAlgorithmFast) return "FlagAlgorithmFast";
-    if (value == DefragmentationFlagBits::eFlagAlgorithmBalanced) return "FlagAlgorithmBalanced";
-    if (value == DefragmentationFlagBits::eFlagAlgorithmFull) return "FlagAlgorithmFull";
-    if (value == DefragmentationFlagBits::eFlagAlgorithmExtensive) return "FlagAlgorithmExtensive";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::DefragmentationFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::DefragmentationFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::DefragmentationFlagBits::eFlagAlgorithmFast
-      | VMA_HPP_NAMESPACE::DefragmentationFlagBits::eFlagAlgorithmBalanced
-      | VMA_HPP_NAMESPACE::DefragmentationFlagBits::eFlagAlgorithmFull
-      | VMA_HPP_NAMESPACE::DefragmentationFlagBits::eFlagAlgorithmExtensive;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using DefragmentationFlags = VULKAN_HPP_NAMESPACE::Flags<DefragmentationFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR DefragmentationFlags operator|(DefragmentationFlagBits bit0, DefragmentationFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return DefragmentationFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR DefragmentationFlags operator&(DefragmentationFlagBits bit0, DefragmentationFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return DefragmentationFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR DefragmentationFlags operator^(DefragmentationFlagBits bit0, DefragmentationFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return DefragmentationFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR DefragmentationFlags operator~(DefragmentationFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(DefragmentationFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(DefragmentationFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & DefragmentationFlagBits::eFlagAlgorithmFast) result += "FlagAlgorithmFast | ";
-    if (value & DefragmentationFlagBits::eFlagAlgorithmBalanced) result += "FlagAlgorithmBalanced | ";
-    if (value & DefragmentationFlagBits::eFlagAlgorithmFull) result += "FlagAlgorithmFull | ";
-    if (value & DefragmentationFlagBits::eFlagAlgorithmExtensive) result += "FlagAlgorithmExtensive | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class DefragmentationMoveOperation {
-    eCopy = VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY,
-    eIgnore = VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE,
-    eDestroy = VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(DefragmentationMoveOperation value) {
-    if (value == DefragmentationMoveOperation::eCopy) return "Copy";
-    if (value == DefragmentationMoveOperation::eIgnore) return "Ignore";
-    if (value == DefragmentationMoveOperation::eDestroy) return "Destroy";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class VirtualBlockCreateFlagBits : VmaVirtualBlockCreateFlags {
-    eLinearAlgorithm = VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(VirtualBlockCreateFlagBits value) {
-    if (value == VirtualBlockCreateFlagBits::eLinearAlgorithm) return "LinearAlgorithm";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::VirtualBlockCreateFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::VirtualBlockCreateFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::VirtualBlockCreateFlagBits::eLinearAlgorithm;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using VirtualBlockCreateFlags = VULKAN_HPP_NAMESPACE::Flags<VirtualBlockCreateFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualBlockCreateFlags operator|(VirtualBlockCreateFlagBits bit0, VirtualBlockCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualBlockCreateFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualBlockCreateFlags operator&(VirtualBlockCreateFlagBits bit0, VirtualBlockCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualBlockCreateFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualBlockCreateFlags operator^(VirtualBlockCreateFlagBits bit0, VirtualBlockCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualBlockCreateFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualBlockCreateFlags operator~(VirtualBlockCreateFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(VirtualBlockCreateFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(VirtualBlockCreateFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & VirtualBlockCreateFlagBits::eLinearAlgorithm) result += "LinearAlgorithm | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  enum class VirtualAllocationCreateFlagBits : VmaVirtualAllocationCreateFlags {
-    eUpperAddress = VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT,
-    eStrategyMinMemory = VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,
-    eStrategyMinTime = VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,
-    eStrategyMinOffset = VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT
-  };
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(VirtualAllocationCreateFlagBits value) {
-    if (value == VirtualAllocationCreateFlagBits::eUpperAddress) return "UpperAddress";
-    if (value == VirtualAllocationCreateFlagBits::eStrategyMinMemory) return "StrategyMinMemory";
-    if (value == VirtualAllocationCreateFlagBits::eStrategyMinTime) return "StrategyMinTime";
-    if (value == VirtualAllocationCreateFlagBits::eStrategyMinOffset) return "StrategyMinOffset";
-    return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString(static_cast<uint32_t>(value)) + " )";
-  }
-# endif
-}
-
-namespace VULKAN_HPP_NAMESPACE {
-  template<> struct FlagTraits<VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits> {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR Flags<VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits> allFlags =
-        VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits::eUpperAddress
-      | VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits::eStrategyMinMemory
-      | VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits::eStrategyMinTime
-      | VMA_HPP_NAMESPACE::VirtualAllocationCreateFlagBits::eStrategyMinOffset;
-  };
-}
-
-namespace VMA_HPP_NAMESPACE {
-
-  using VirtualAllocationCreateFlags = VULKAN_HPP_NAMESPACE::Flags<VirtualAllocationCreateFlagBits>;
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualAllocationCreateFlags operator|(VirtualAllocationCreateFlagBits bit0, VirtualAllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualAllocationCreateFlags(bit0) | bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualAllocationCreateFlags operator&(VirtualAllocationCreateFlagBits bit0, VirtualAllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualAllocationCreateFlags(bit0) & bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualAllocationCreateFlags operator^(VirtualAllocationCreateFlagBits bit0, VirtualAllocationCreateFlagBits bit1) VULKAN_HPP_NOEXCEPT {
-    return VirtualAllocationCreateFlags(bit0) ^ bit1;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR VirtualAllocationCreateFlags operator~(VirtualAllocationCreateFlagBits bits) VULKAN_HPP_NOEXCEPT {
-    return ~(VirtualAllocationCreateFlags(bits));
-  }
-
-# if !defined( VULKAN_HPP_NO_TO_STRING )
-  VULKAN_HPP_INLINE std::string to_string(VirtualAllocationCreateFlags value) {
-    if (!value) return "{}";
-    std::string result;
-    if (value & VirtualAllocationCreateFlagBits::eUpperAddress) result += "UpperAddress | ";
-    if (value & VirtualAllocationCreateFlagBits::eStrategyMinMemory) result += "StrategyMinMemory | ";
-    if (value & VirtualAllocationCreateFlagBits::eStrategyMinTime) result += "StrategyMinTime | ";
-    if (value & VirtualAllocationCreateFlagBits::eStrategyMinOffset) result += "StrategyMinOffset | ";
-    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
-  }
-# endif
-}
-
-#endif

src/java.desktop/share/native/libvmahpp/vk_mem_alloc_handles.hpp

@@ -1,935 +0,0 @@
-#ifndef VULKAN_MEMORY_ALLOCATOR_HANDLES_HPP
-#define VULKAN_MEMORY_ALLOCATOR_HANDLES_HPP
-
-namespace VMA_HPP_NAMESPACE {
-
-  struct DeviceMemoryCallbacks;
-  struct VulkanFunctions;
-  struct AllocatorCreateInfo;
-  struct AllocatorInfo;
-  struct Statistics;
-  struct DetailedStatistics;
-  struct TotalStatistics;
-  struct Budget;
-  struct AllocationCreateInfo;
-  struct PoolCreateInfo;
-  struct AllocationInfo;
-  struct DefragmentationInfo;
-  struct DefragmentationMove;
-  struct DefragmentationPassMoveInfo;
-  struct DefragmentationStats;
-  struct VirtualBlockCreateInfo;
-  struct VirtualAllocationCreateInfo;
-  struct VirtualAllocationInfo;
-
-  class Allocator;
-  class Pool;
-  class Allocation;
-  class DefragmentationContext;
-  class VirtualAllocation;
-  class VirtualBlock;
-}
-
-
-namespace VMA_HPP_NAMESPACE {
-  class Pool {
-  public:
-    using CType      = VmaPool;
-    using NativeType = VmaPool;
-  public:
-    VULKAN_HPP_CONSTEXPR         Pool() = default;
-    VULKAN_HPP_CONSTEXPR         Pool(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT Pool(VmaPool pool) VULKAN_HPP_NOEXCEPT : m_pool(pool) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    Pool& operator=(VmaPool pool) VULKAN_HPP_NOEXCEPT {
-      m_pool = pool;
-      return *this;
-    }
-#endif
-
-    Pool& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_pool = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(Pool const &) const = default;
-#else
-    bool operator==(Pool const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_pool == rhs.m_pool;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaPool() const VULKAN_HPP_NOEXCEPT {
-      return m_pool;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_pool != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_pool == VK_NULL_HANDLE;
-    }
-
-  private:
-    VmaPool m_pool = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(Pool) == sizeof(VmaPool),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::Pool, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::Pool, VMA_HPP_NAMESPACE::Allocator>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniquePool = VULKAN_HPP_NAMESPACE::UniqueHandle<Pool, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-  class Allocation {
-  public:
-    using CType      = VmaAllocation;
-    using NativeType = VmaAllocation;
-  public:
-    VULKAN_HPP_CONSTEXPR         Allocation() = default;
-    VULKAN_HPP_CONSTEXPR         Allocation(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT Allocation(VmaAllocation allocation) VULKAN_HPP_NOEXCEPT : m_allocation(allocation) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    Allocation& operator=(VmaAllocation allocation) VULKAN_HPP_NOEXCEPT {
-      m_allocation = allocation;
-      return *this;
-    }
-#endif
-
-    Allocation& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_allocation = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(Allocation const &) const = default;
-#else
-    bool operator==(Allocation const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_allocation == rhs.m_allocation;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaAllocation() const VULKAN_HPP_NOEXCEPT {
-      return m_allocation;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_allocation != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_allocation == VK_NULL_HANDLE;
-    }
-
-  private:
-    VmaAllocation m_allocation = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(Allocation) == sizeof(VmaAllocation),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::Allocation, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::Allocation, VMA_HPP_NAMESPACE::Allocator>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniqueAllocation = VULKAN_HPP_NAMESPACE::UniqueHandle<Allocation, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-  class DefragmentationContext {
-  public:
-    using CType      = VmaDefragmentationContext;
-    using NativeType = VmaDefragmentationContext;
-  public:
-    VULKAN_HPP_CONSTEXPR         DefragmentationContext() = default;
-    VULKAN_HPP_CONSTEXPR         DefragmentationContext(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT DefragmentationContext(VmaDefragmentationContext defragmentationContext) VULKAN_HPP_NOEXCEPT : m_defragmentationContext(defragmentationContext) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    DefragmentationContext& operator=(VmaDefragmentationContext defragmentationContext) VULKAN_HPP_NOEXCEPT {
-      m_defragmentationContext = defragmentationContext;
-      return *this;
-    }
-#endif
-
-    DefragmentationContext& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_defragmentationContext = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(DefragmentationContext const &) const = default;
-#else
-    bool operator==(DefragmentationContext const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_defragmentationContext == rhs.m_defragmentationContext;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaDefragmentationContext() const VULKAN_HPP_NOEXCEPT {
-      return m_defragmentationContext;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_defragmentationContext != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_defragmentationContext == VK_NULL_HANDLE;
-    }
-
-  private:
-    VmaDefragmentationContext m_defragmentationContext = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(DefragmentationContext) == sizeof(VmaDefragmentationContext),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::DefragmentationContext, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::DefragmentationContext, void>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniqueDefragmentationContext = VULKAN_HPP_NAMESPACE::UniqueHandle<DefragmentationContext, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-  class Allocator {
-  public:
-    using CType      = VmaAllocator;
-    using NativeType = VmaAllocator;
-  public:
-    VULKAN_HPP_CONSTEXPR         Allocator() = default;
-    VULKAN_HPP_CONSTEXPR         Allocator(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT Allocator(VmaAllocator allocator) VULKAN_HPP_NOEXCEPT : m_allocator(allocator) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    Allocator& operator=(VmaAllocator allocator) VULKAN_HPP_NOEXCEPT {
-      m_allocator = allocator;
-      return *this;
-    }
-#endif
-
-    Allocator& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_allocator = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(Allocator const &) const = default;
-#else
-    bool operator==(Allocator const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_allocator == rhs.m_allocator;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaAllocator() const VULKAN_HPP_NOEXCEPT {
-      return m_allocator;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_allocator != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_allocator == VK_NULL_HANDLE;
-    }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void destroy() const;
-#else
-    void destroy() const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS AllocatorInfo getAllocatorInfo() const;
-#endif
-    void getAllocatorInfo(AllocatorInfo* allocatorInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS const VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties* getPhysicalDeviceProperties() const;
-#endif
-    void getPhysicalDeviceProperties(const VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties** physicalDeviceProperties) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS const VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties* getMemoryProperties() const;
-#endif
-    void getMemoryProperties(const VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties** physicalDeviceMemoryProperties) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_NAMESPACE::MemoryPropertyFlags getMemoryTypeProperties(uint32_t memoryTypeIndex) const;
-#endif
-    void getMemoryTypeProperties(uint32_t memoryTypeIndex,
-                                 VULKAN_HPP_NAMESPACE::MemoryPropertyFlags* flags) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void setCurrentFrameIndex(uint32_t frameIndex) const;
-#else
-    void setCurrentFrameIndex(uint32_t frameIndex) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS TotalStatistics calculateStatistics() const;
-#endif
-    void calculateStatistics(TotalStatistics* stats) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    template<typename VectorAllocator = std::allocator<Budget>,
-             typename B = VectorAllocator,
-             typename std::enable_if<std::is_same<typename B::value_type, Budget>::value, int>::type = 0>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS std::vector<Budget, VectorAllocator> getHeapBudgets(VectorAllocator& vectorAllocator) const;
-
-    template<typename VectorAllocator = std::allocator<Budget>>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS std::vector<Budget, VectorAllocator> getHeapBudgets() const;
-#endif
-    void getHeapBudgets(Budget* budgets) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<uint32_t>::type findMemoryTypeIndex(uint32_t memoryTypeBits,
-                                                                                                                               const AllocationCreateInfo& allocationCreateInfo) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result findMemoryTypeIndex(uint32_t memoryTypeBits,
-                                                                          const AllocationCreateInfo* allocationCreateInfo,
-                                                                          uint32_t* memoryTypeIndex) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<uint32_t>::type findMemoryTypeIndexForBufferInfo(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
-                                                                                                                                            const AllocationCreateInfo& allocationCreateInfo) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result findMemoryTypeIndexForBufferInfo(const VULKAN_HPP_NAMESPACE::BufferCreateInfo* bufferCreateInfo,
-                                                                                       const AllocationCreateInfo* allocationCreateInfo,
-                                                                                       uint32_t* memoryTypeIndex) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<uint32_t>::type findMemoryTypeIndexForImageInfo(const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo,
-                                                                                                                                           const AllocationCreateInfo& allocationCreateInfo) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result findMemoryTypeIndexForImageInfo(const VULKAN_HPP_NAMESPACE::ImageCreateInfo* imageCreateInfo,
-                                                                                      const AllocationCreateInfo* allocationCreateInfo,
-                                                                                      uint32_t* memoryTypeIndex) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<Pool>::type createPool(const PoolCreateInfo& createInfo) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniquePool>::type createPoolUnique(const PoolCreateInfo& createInfo) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createPool(const PoolCreateInfo* createInfo,
-                                                                 Pool* pool) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void destroyPool(Pool pool) const;
-#else
-    void destroyPool(Pool pool) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS Statistics getPoolStatistics(Pool pool) const;
-#endif
-    void getPoolStatistics(Pool pool,
-                           Statistics* poolStats) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS DetailedStatistics calculatePoolStatistics(Pool pool) const;
-#endif
-    void calculatePoolStatistics(Pool pool,
-                                 DetailedStatistics* poolStats) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type checkPoolCorruption(Pool pool) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result checkPoolCorruption(Pool pool) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS const char* getPoolName(Pool pool) const;
-#endif
-    void getPoolName(Pool pool,
-                     const char** name) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void setPoolName(Pool pool,
-                     const char* name) const;
-#else
-    void setPoolName(Pool pool,
-                     const char* name) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<Allocation>::type allocateMemory(const VULKAN_HPP_NAMESPACE::MemoryRequirements& vkMemoryRequirements,
-                                                                                                                            const AllocationCreateInfo& createInfo,
-                                                                                                                            VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueAllocation>::type allocateMemoryUnique(const VULKAN_HPP_NAMESPACE::MemoryRequirements& vkMemoryRequirements,
-                                                                                                                                        const AllocationCreateInfo& createInfo,
-                                                                                                                                        VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result allocateMemory(const VULKAN_HPP_NAMESPACE::MemoryRequirements* vkMemoryRequirements,
-                                                                     const AllocationCreateInfo* createInfo,
-                                                                     Allocation* allocation,
-                                                                     AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    template<typename VectorAllocator = std::allocator<Allocation>,
-             typename B = VectorAllocator,
-             typename std::enable_if<std::is_same<typename B::value_type, Allocation>::value, int>::type = 0>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::vector<Allocation, VectorAllocator>>::type allocateMemoryPages(VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryRequirements> vkMemoryRequirements,
-                                                                                                                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const AllocationCreateInfo> createInfo,
-                                                                                                                                                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<AllocationInfo> allocationInfo,
-                                                                                                                                                               VectorAllocator& vectorAllocator) const;
-
-    template<typename VectorAllocator = std::allocator<Allocation>>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::vector<Allocation, VectorAllocator>>::type allocateMemoryPages(VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryRequirements> vkMemoryRequirements,
-                                                                                                                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const AllocationCreateInfo> createInfo,
-                                                                                                                                                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    template<typename VectorAllocator = std::allocator<UniqueAllocation>,
-             typename B = VectorAllocator,
-             typename std::enable_if<std::is_same<typename B::value_type, UniqueAllocation>::value, int>::type = 0>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::vector<UniqueAllocation, VectorAllocator>>::type allocateMemoryPagesUnique(VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryRequirements> vkMemoryRequirements,
-                                                                                                                                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const AllocationCreateInfo> createInfo,
-                                                                                                                                                                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<AllocationInfo> allocationInfo,
-                                                                                                                                                                           VectorAllocator& vectorAllocator) const;
-
-    template<typename VectorAllocator = std::allocator<UniqueAllocation>>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::vector<UniqueAllocation, VectorAllocator>>::type allocateMemoryPagesUnique(VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryRequirements> vkMemoryRequirements,
-                                                                                                                                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const AllocationCreateInfo> createInfo,
-                                                                                                                                                                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result allocateMemoryPages(const VULKAN_HPP_NAMESPACE::MemoryRequirements* vkMemoryRequirements,
-                                                                          const AllocationCreateInfo* createInfo,
-                                                                          size_t allocationCount,
-                                                                          Allocation* allocations,
-                                                                          AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<Allocation>::type allocateMemoryForBuffer(VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                                                                                     const AllocationCreateInfo& createInfo,
-                                                                                                                                     VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueAllocation>::type allocateMemoryForBufferUnique(VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                                                                                                 const AllocationCreateInfo& createInfo,
-                                                                                                                                                 VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result allocateMemoryForBuffer(VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                              const AllocationCreateInfo* createInfo,
-                                                                              Allocation* allocation,
-                                                                              AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<Allocation>::type allocateMemoryForImage(VULKAN_HPP_NAMESPACE::Image image,
-                                                                                                                                    const AllocationCreateInfo& createInfo,
-                                                                                                                                    VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueAllocation>::type allocateMemoryForImageUnique(VULKAN_HPP_NAMESPACE::Image image,
-                                                                                                                                                const AllocationCreateInfo& createInfo,
-                                                                                                                                                VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result allocateMemoryForImage(VULKAN_HPP_NAMESPACE::Image image,
-                                                                             const AllocationCreateInfo* createInfo,
-                                                                             Allocation* allocation,
-                                                                             AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void freeMemory(Allocation allocation) const;
-#else
-    void freeMemory(Allocation allocation) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void freeMemoryPages(VULKAN_HPP_NAMESPACE::ArrayProxy<const Allocation> allocations) const;
-#endif
-    void freeMemoryPages(size_t allocationCount,
-                         const Allocation* allocations) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS AllocationInfo getAllocationInfo(Allocation allocation) const;
-#endif
-    void getAllocationInfo(Allocation allocation,
-                           AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void setAllocationUserData(Allocation allocation,
-                               void* userData) const;
-#else
-    void setAllocationUserData(Allocation allocation,
-                               void* userData) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void setAllocationName(Allocation allocation,
-                           const char* name) const;
-#else
-    void setAllocationName(Allocation allocation,
-                           const char* name) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_NAMESPACE::MemoryPropertyFlags getAllocationMemoryProperties(Allocation allocation) const;
-#endif
-    void getAllocationMemoryProperties(Allocation allocation,
-                                       VULKAN_HPP_NAMESPACE::MemoryPropertyFlags* flags) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<void*>::type mapMemory(Allocation allocation) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result mapMemory(Allocation allocation,
-                                                                void** data) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void unmapMemory(Allocation allocation) const;
-#else
-    void unmapMemory(Allocation allocation) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type flushAllocation(Allocation allocation,
-                                                                               VULKAN_HPP_NAMESPACE::DeviceSize offset,
-                                                                               VULKAN_HPP_NAMESPACE::DeviceSize size) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result flushAllocation(Allocation allocation,
-                                                                      VULKAN_HPP_NAMESPACE::DeviceSize offset,
-                                                                      VULKAN_HPP_NAMESPACE::DeviceSize size) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type invalidateAllocation(Allocation allocation,
-                                                                                    VULKAN_HPP_NAMESPACE::DeviceSize offset,
-                                                                                    VULKAN_HPP_NAMESPACE::DeviceSize size) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result invalidateAllocation(Allocation allocation,
-                                                                           VULKAN_HPP_NAMESPACE::DeviceSize offset,
-                                                                           VULKAN_HPP_NAMESPACE::DeviceSize size) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type flushAllocations(VULKAN_HPP_NAMESPACE::ArrayProxy<const Allocation> allocations,
-                                                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> offsets,
-                                                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> sizes) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result flushAllocations(uint32_t allocationCount,
-                                                                       const Allocation* allocations,
-                                                                       const VULKAN_HPP_NAMESPACE::DeviceSize* offsets,
-                                                                       const VULKAN_HPP_NAMESPACE::DeviceSize* sizes) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type invalidateAllocations(VULKAN_HPP_NAMESPACE::ArrayProxy<const Allocation> allocations,
-                                                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> offsets,
-                                                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> sizes) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result invalidateAllocations(uint32_t allocationCount,
-                                                                            const Allocation* allocations,
-                                                                            const VULKAN_HPP_NAMESPACE::DeviceSize* offsets,
-                                                                            const VULKAN_HPP_NAMESPACE::DeviceSize* sizes) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type checkCorruption(uint32_t memoryTypeBits) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result checkCorruption(uint32_t memoryTypeBits) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<DefragmentationContext>::type beginDefragmentation(const DefragmentationInfo& info) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result beginDefragmentation(const DefragmentationInfo* info,
-                                                                           DefragmentationContext* context) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void endDefragmentation(DefragmentationContext context,
-                            VULKAN_HPP_NAMESPACE::Optional<DefragmentationStats> stats = nullptr) const;
-#endif
-    void endDefragmentation(DefragmentationContext context,
-                            DefragmentationStats* stats) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<DefragmentationPassMoveInfo>::type beginDefragmentationPass(DefragmentationContext context) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result beginDefragmentationPass(DefragmentationContext context,
-                                                                               DefragmentationPassMoveInfo* passInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<DefragmentationPassMoveInfo>::type endDefragmentationPass(DefragmentationContext context) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result endDefragmentationPass(DefragmentationContext context,
-                                                                             DefragmentationPassMoveInfo* passInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type bindBufferMemory(Allocation allocation,
-                                                                                VULKAN_HPP_NAMESPACE::Buffer buffer) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result bindBufferMemory(Allocation allocation,
-                                                                       VULKAN_HPP_NAMESPACE::Buffer buffer) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type bindBufferMemory2(Allocation allocation,
-                                                                                 VULKAN_HPP_NAMESPACE::DeviceSize allocationLocalOffset,
-                                                                                 VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                                 const void* next) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result bindBufferMemory2(Allocation allocation,
-                                                                        VULKAN_HPP_NAMESPACE::DeviceSize allocationLocalOffset,
-                                                                        VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                        const void* next) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type bindImageMemory(Allocation allocation,
-                                                                               VULKAN_HPP_NAMESPACE::Image image) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result bindImageMemory(Allocation allocation,
-                                                                      VULKAN_HPP_NAMESPACE::Image image) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type bindImageMemory2(Allocation allocation,
-                                                                                VULKAN_HPP_NAMESPACE::DeviceSize allocationLocalOffset,
-                                                                                VULKAN_HPP_NAMESPACE::Image image,
-                                                                                const void* next) const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result bindImageMemory2(Allocation allocation,
-                                                                       VULKAN_HPP_NAMESPACE::DeviceSize allocationLocalOffset,
-                                                                       VULKAN_HPP_NAMESPACE::Image image,
-                                                                       const void* next) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::Buffer, Allocation>>::type createBuffer(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
-                                                                                                                                                                   const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                                   VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<UniqueBuffer, UniqueAllocation>>::type createBufferUnique(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
-                                                                                                                                                               const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                               VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createBuffer(const VULKAN_HPP_NAMESPACE::BufferCreateInfo* bufferCreateInfo,
-                                                                   const AllocationCreateInfo* allocationCreateInfo,
-                                                                   VULKAN_HPP_NAMESPACE::Buffer* buffer,
-                                                                   Allocation* allocation,
-                                                                   AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::Buffer, Allocation>>::type createBufferWithAlignment(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
-                                                                                                                                                                                const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                                                VULKAN_HPP_NAMESPACE::DeviceSize minAlignment,
-                                                                                                                                                                                VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<UniqueBuffer, UniqueAllocation>>::type createBufferWithAlignmentUnique(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
-                                                                                                                                                                            const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                                            VULKAN_HPP_NAMESPACE::DeviceSize minAlignment,
-                                                                                                                                                                            VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createBufferWithAlignment(const VULKAN_HPP_NAMESPACE::BufferCreateInfo* bufferCreateInfo,
-                                                                                const AllocationCreateInfo* allocationCreateInfo,
-                                                                                VULKAN_HPP_NAMESPACE::DeviceSize minAlignment,
-                                                                                VULKAN_HPP_NAMESPACE::Buffer* buffer,
-                                                                                Allocation* allocation,
-                                                                                AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<VULKAN_HPP_NAMESPACE::Buffer>::type createAliasingBuffer(Allocation allocation,
-                                                                                                                                                    const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createAliasingBuffer(Allocation allocation,
-                                                                           const VULKAN_HPP_NAMESPACE::BufferCreateInfo* bufferCreateInfo,
-                                                                           VULKAN_HPP_NAMESPACE::Buffer* buffer) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void destroyBuffer(VULKAN_HPP_NAMESPACE::Buffer buffer,
-                       Allocation allocation) const;
-#else
-    void destroyBuffer(VULKAN_HPP_NAMESPACE::Buffer buffer,
-                       Allocation allocation) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::Image, Allocation>>::type createImage(const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo,
-                                                                                                                                                                 const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                                 VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<UniqueImage, UniqueAllocation>>::type createImageUnique(const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo,
-                                                                                                                                                             const AllocationCreateInfo& allocationCreateInfo,
-                                                                                                                                                             VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> allocationInfo = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createImage(const VULKAN_HPP_NAMESPACE::ImageCreateInfo* imageCreateInfo,
-                                                                  const AllocationCreateInfo* allocationCreateInfo,
-                                                                  VULKAN_HPP_NAMESPACE::Image* image,
-                                                                  Allocation* allocation,
-                                                                  AllocationInfo* allocationInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<VULKAN_HPP_NAMESPACE::Image>::type createAliasingImage(Allocation allocation,
-                                                                                                                                                  const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo) const;
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createAliasingImage(Allocation allocation,
-                                                                          const VULKAN_HPP_NAMESPACE::ImageCreateInfo* imageCreateInfo,
-                                                                          VULKAN_HPP_NAMESPACE::Image* image) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void destroyImage(VULKAN_HPP_NAMESPACE::Image image,
-                      Allocation allocation) const;
-#else
-    void destroyImage(VULKAN_HPP_NAMESPACE::Image image,
-                      Allocation allocation) const;
-#endif
-
-#if VMA_STATS_STRING_ENABLED
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS char* buildStatsString(VULKAN_HPP_NAMESPACE::Bool32 detailedMap) const;
-#endif
-    void buildStatsString(char** statsString,
-                          VULKAN_HPP_NAMESPACE::Bool32 detailedMap) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void freeStatsString(char* statsString) const;
-#else
-    void freeStatsString(char* statsString) const;
-#endif
-
-#endif
-  private:
-    VmaAllocator m_allocator = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(Allocator) == sizeof(VmaAllocator),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::Allocator, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::Allocator, void>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniqueAllocator = VULKAN_HPP_NAMESPACE::UniqueHandle<Allocator, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-  class VirtualAllocation {
-  public:
-    using CType      = VmaVirtualAllocation;
-    using NativeType = VmaVirtualAllocation;
-  public:
-    VULKAN_HPP_CONSTEXPR         VirtualAllocation() = default;
-    VULKAN_HPP_CONSTEXPR         VirtualAllocation(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT VirtualAllocation(VmaVirtualAllocation virtualAllocation) VULKAN_HPP_NOEXCEPT : m_virtualAllocation(virtualAllocation) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    VirtualAllocation& operator=(VmaVirtualAllocation virtualAllocation) VULKAN_HPP_NOEXCEPT {
-      m_virtualAllocation = virtualAllocation;
-      return *this;
-    }
-#endif
-
-    VirtualAllocation& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_virtualAllocation = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(VirtualAllocation const &) const = default;
-#else
-    bool operator==(VirtualAllocation const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_virtualAllocation == rhs.m_virtualAllocation;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaVirtualAllocation() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualAllocation;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualAllocation != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualAllocation == VK_NULL_HANDLE;
-    }
-
-  private:
-    VmaVirtualAllocation m_virtualAllocation = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(VirtualAllocation) == sizeof(VmaVirtualAllocation),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::VirtualAllocation, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::VirtualAllocation, VMA_HPP_NAMESPACE::VirtualBlock>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniqueVirtualAllocation = VULKAN_HPP_NAMESPACE::UniqueHandle<VirtualAllocation, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-  class VirtualBlock {
-  public:
-    using CType      = VmaVirtualBlock;
-    using NativeType = VmaVirtualBlock;
-  public:
-    VULKAN_HPP_CONSTEXPR         VirtualBlock() = default;
-    VULKAN_HPP_CONSTEXPR         VirtualBlock(std::nullptr_t) VULKAN_HPP_NOEXCEPT {}
-    VULKAN_HPP_TYPESAFE_EXPLICIT VirtualBlock(VmaVirtualBlock virtualBlock) VULKAN_HPP_NOEXCEPT : m_virtualBlock(virtualBlock) {}
-
-#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
-    VirtualBlock& operator=(VmaVirtualBlock virtualBlock) VULKAN_HPP_NOEXCEPT {
-      m_virtualBlock = virtualBlock;
-      return *this;
-    }
-#endif
-
-    VirtualBlock& operator=(std::nullptr_t) VULKAN_HPP_NOEXCEPT {
-      m_virtualBlock = {};
-      return *this;
-    }
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>(VirtualBlock const &) const = default;
-#else
-    bool operator==(VirtualBlock const & rhs) const VULKAN_HPP_NOEXCEPT {
-      return m_virtualBlock == rhs.m_virtualBlock;
-    }
-#endif
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VmaVirtualBlock() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualBlock;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualBlock != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT {
-      return m_virtualBlock == VK_NULL_HANDLE;
-    }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void destroy() const;
-#else
-    void destroy() const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_NAMESPACE::Bool32 isVirtualBlockEmpty() const;
-#else
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 isVirtualBlockEmpty() const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VirtualAllocationInfo getVirtualAllocationInfo(VirtualAllocation allocation) const;
-#endif
-    void getVirtualAllocationInfo(VirtualAllocation allocation,
-                                  VirtualAllocationInfo* virtualAllocInfo) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<VirtualAllocation>::type virtualAllocate(const VirtualAllocationCreateInfo& createInfo,
-                                                                                                                                    VULKAN_HPP_NAMESPACE::Optional<VULKAN_HPP_NAMESPACE::DeviceSize> offset = nullptr) const;
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueVirtualAllocation>::type virtualAllocateUnique(const VirtualAllocationCreateInfo& createInfo,
-                                                                                                                                                VULKAN_HPP_NAMESPACE::Optional<VULKAN_HPP_NAMESPACE::DeviceSize> offset = nullptr) const;
-#endif
-#endif
-    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result virtualAllocate(const VirtualAllocationCreateInfo* createInfo,
-                                                                      VirtualAllocation* allocation,
-                                                                      VULKAN_HPP_NAMESPACE::DeviceSize* offset) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void virtualFree(VirtualAllocation allocation) const;
-#else
-    void virtualFree(VirtualAllocation allocation) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void clearVirtualBlock() const;
-#else
-    void clearVirtualBlock() const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void setVirtualAllocationUserData(VirtualAllocation allocation,
-                                      void* userData) const;
-#else
-    void setVirtualAllocationUserData(VirtualAllocation allocation,
-                                      void* userData) const;
-#endif
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS Statistics getVirtualBlockStatistics() const;
-#endif
-    void getVirtualBlockStatistics(Statistics* stats) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS DetailedStatistics calculateVirtualBlockStatistics() const;
-#endif
-    void calculateVirtualBlockStatistics(DetailedStatistics* stats) const;
-
-#if VMA_STATS_STRING_ENABLED
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS char* buildVirtualBlockStatsString(VULKAN_HPP_NAMESPACE::Bool32 detailedMap) const;
-#endif
-    void buildVirtualBlockStatsString(char** statsString,
-                                      VULKAN_HPP_NAMESPACE::Bool32 detailedMap) const;
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    void freeVirtualBlockStatsString(char* statsString) const;
-#else
-    void freeVirtualBlockStatsString(char* statsString) const;
-#endif
-
-#endif
-  private:
-    VmaVirtualBlock m_virtualBlock = {};
-  };
-  VULKAN_HPP_STATIC_ASSERT(sizeof(VirtualBlock) == sizeof(VmaVirtualBlock),
-                           "handle and wrapper have different size!");
-}
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-namespace VULKAN_HPP_NAMESPACE {
-  template<> class UniqueHandleTraits<VMA_HPP_NAMESPACE::VirtualBlock, VMA_HPP_NAMESPACE::Dispatcher> {
-    public:
-    using deleter = VMA_HPP_NAMESPACE::Deleter<VMA_HPP_NAMESPACE::VirtualBlock, void>;
-  };
-}
-namespace VMA_HPP_NAMESPACE { using UniqueVirtualBlock = VULKAN_HPP_NAMESPACE::UniqueHandle<VirtualBlock, Dispatcher>; }
-#endif
-
-namespace VMA_HPP_NAMESPACE {
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<Allocator>::type createAllocator(const AllocatorCreateInfo& createInfo);
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueAllocator>::type createAllocatorUnique(const AllocatorCreateInfo& createInfo);
-#endif
-#endif
-  VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createAllocator(const AllocatorCreateInfo* createInfo,
-                                                                    Allocator* allocator);
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<VirtualBlock>::type createVirtualBlock(const VirtualBlockCreateInfo& createInfo);
-#ifndef VULKAN_HPP_NO_SMART_HANDLE
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueVirtualBlock>::type createVirtualBlockUnique(const VirtualBlockCreateInfo& createInfo);
-#endif
-#endif
-  VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createVirtualBlock(const VirtualBlockCreateInfo* createInfo,
-                                                                       VirtualBlock* virtualBlock);
-}
-#endif

src/java.desktop/share/native/libwakefield/protocol/wakefield.xml

@@ -84,37 +84,6 @@
             <arg name="error_code" type="uint" enum="error"/>
         </event>
 
-        <request name="send_key">
-            <description summary="facilitates implementation of Robot.keyPress/Robot.keyRelease">
-                This requests an emulation of a key press by its Linux event key code.
-            </description>
-            <arg name="key" type="uint" />
-            <arg name="state" type="uint" />
-        </request>
-
-        <request name="send_cursor">
-            <description summary="facilitates implementation of Robot.mouseMove">
-                This requests an emulation of the mouse cursor being moved to the specified screen coordinates.
-            </description>
-            <arg name="x" type="int" />
-            <arg name="y" type="int" />
-        </request>
-
-        <request name="send_button">
-            <description summary="facilitates implementation of Robot.mousePress/Robot.mouseRelease">
-                This requests an emulation of a mouse button press by its Linux event code.
-            </description>
-            <arg name="button" type="uint" />
-            <arg name="state" type="uint" />
-        </request>
-
-        <request name="send_wheel">
-            <description summary="facilitates implementation of Robot.mouseWheel">
-                This requests an emulation of a rotation of a mouse scroll wheel.
-            </description>
-            <arg name="amount" type="int" />
-        </request>
-
         <enum name="error">
             <entry name="no_error" value="0" summary="error code 0 reserved for the absence of error"/>
             <entry name="invalid_coordinates" value="1" summary="supplied absolute coordinates point

src/java.desktop/share/native/libwakefield/src/wakefield.c

@@ -44,37 +44,6 @@ struct wakefield {
     struct weston_log_scope *log;
 };
 
-#define DEFAULT_AXIS_STEP_DISTANCE 10
-
-// These functions are part of Weston's private backend API (libweston/backend.h)
-void
-notify_axis(struct weston_seat *seat, const struct timespec *time,
-            struct weston_pointer_axis_event *event);
-
-void
-notify_axis_source(struct weston_seat *seat, uint32_t source);
-
-void
-notify_button(struct weston_seat *seat, const struct timespec *time,
-              int32_t button, enum wl_pointer_button_state state);
-
-void
-notify_key(struct weston_seat *seat, const struct timespec *time, uint32_t key,
-           enum wl_keyboard_key_state state,
-           enum weston_key_state_update update_state);
-
-void
-notify_motion(struct weston_seat *seat, const struct timespec *time,
-              struct weston_pointer_motion_event *event);
-
-void
-notify_motion_absolute(struct weston_seat *seat, const struct timespec *time,
-                       double x, double y);
-
-void
-notify_pointer_frame(struct weston_seat *seat);
-
-
 static struct weston_output*
 get_output_for_point(struct wakefield* wakefield, int32_t x, int32_t y)
 {
@@ -513,96 +482,11 @@ wakefield_capture_create(struct wl_client *client,
     wakefield_send_capture_ready(resource, buffer_resource, WAKEFIELD_ERROR_NO_ERROR);
 }
 
-static void
-wakefield_send_key(struct wl_client *client,
-                   struct wl_resource *resource,
-                   uint32_t key,
-                   uint32_t state)
-{
-    struct wakefield *wakefield = wl_resource_get_user_data(resource);
-    struct weston_compositor *compositor = wakefield->compositor;
-
-    struct timespec time;
-    weston_compositor_get_time(&time);
-
-    struct weston_seat *seat;
-    wl_list_for_each(seat, &compositor->seat_list, link) {
-        notify_key(seat, &time, key,
-                   state ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED,
-                   STATE_UPDATE_AUTOMATIC);
-
-    }
-}
-
-static void wakefield_send_cursor(struct wl_client* client,
-                                  struct wl_resource* resource,
-                                  int32_t x, int32_t y)
-{
-    struct wakefield *wakefield = wl_resource_get_user_data(resource);
-    struct weston_compositor *compositor = wakefield->compositor;
-
-    struct timespec time;
-    weston_compositor_get_time(&time);
-
-    struct weston_seat *seat;
-    wl_list_for_each(seat, &compositor->seat_list, link) {
-        notify_motion_absolute(seat, &time, (double)x, (double)y);
-        notify_pointer_frame(seat);
-    }
-}
-
-static void wakefield_send_button(struct wl_client* client,
-                                  struct wl_resource* resource,
-                                  uint32_t button,
-                                  uint32_t state)
-{
-    struct wakefield *wakefield = wl_resource_get_user_data(resource);
-    struct weston_compositor *compositor = wakefield->compositor;
-
-    struct timespec time;
-    weston_compositor_get_time(&time);
-
-    struct weston_seat *seat;
-    wl_list_for_each(seat, &compositor->seat_list, link) {
-        notify_button(seat, &time, (int32_t)button,
-                      state ? WL_POINTER_BUTTON_STATE_PRESSED : WL_POINTER_BUTTON_STATE_RELEASED);
-        notify_pointer_frame(seat);
-    }
-}
-
-static void wakefield_send_wheel(struct wl_client* client,
-                                 struct wl_resource* resource,
-                                 int32_t amount)
-{
-    struct wakefield *wakefield = wl_resource_get_user_data(resource);
-    struct weston_compositor *compositor = wakefield->compositor;
-
-    struct timespec time;
-    weston_compositor_get_time(&time);
-
-    struct weston_pointer_axis_event event = {
-            .axis = WL_POINTER_AXIS_VERTICAL_SCROLL,
-            .value = DEFAULT_AXIS_STEP_DISTANCE * amount,
-            .has_discrete = true,
-            .discrete = amount
-    };
-
-    struct weston_seat *seat;
-    wl_list_for_each(seat, &compositor->seat_list, link) {
-        notify_axis(seat, &time, &event);
-        notify_pointer_frame(seat);
-    }
-}
-
 static const struct wakefield_interface wakefield_implementation = {
         .get_surface_location = wakefield_get_surface_location,
         .move_surface = wakefield_move_surface,
         .get_pixel_color = wakefield_get_pixel_color,
-        .capture_create = wakefield_capture_create,
-        .send_key = wakefield_send_key,
-        .send_cursor = wakefield_send_cursor,
-        .send_button = wakefield_send_button,
-        .send_wheel = wakefield_send_wheel,
+        .capture_create = wakefield_capture_create
 };
 
 static void

src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java

@@ -1423,14 +1423,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
         if (syncSizeOnly && dimensions != null) {
             dimensions.setSize(r.width, r.height);
             dimensions.setInsets(ins);
-            boolean isMaximized = target instanceof Frame f && (f.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
-            // When a window is maximized, affirming its size through an explicit request to the X server
-            // may make the window fullscreen, which has undesirable consequences. Also, when a window
-            // already has the maximized attributes, it is already properly sized, so no need to
-            // resize explicitly.
-            if (!isMaximized) {
-                xSetSize(r.width, r.height);
-            }
+            xSetSize(r.width, r.height);
         } else {
             dimensions = new WindowDimensions(r, ins, false);
             xSetBounds(r.x, r.y, r.width, r.height);

src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java

@@ -2655,16 +2655,6 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         XWM.getWM().startMovingWindowTogetherWithMouse(getParentTopLevel().getWindow(), getLastButtonPressAbsLocation(), mouseButton);
     }
 
-    private static void startMovingWindowTogetherWithMouse(Window window, int mouseButton) {
-        final AWTAccessor.ComponentAccessor acc = AWTAccessor.getComponentAccessor();
-        ComponentPeer peer = acc.getPeer(window);
-        if (peer instanceof XWindowPeer xWindowPeer) {
-            xWindowPeer.startMovingTogetherWithMouse(mouseButton);
-        } else {
-            throw new IllegalArgumentException("AWT window must have XWindowPeer as its peer");
-        }
-    }
-
     private static class WindowMoveService {
         WindowMoveService() {
             final var toolkit = Toolkit.getDefaultToolkit();

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

@@ -83,7 +83,6 @@ public class WLComponentPeer implements ComponentPeer {
     };
 
     private long nativePtr;
-    private volatile boolean surfaceAssigned = false;
     protected final Component target;
 
     // Graphics devices this top-level component is visible on
@@ -147,11 +146,6 @@ public class WLComponentPeer implements ComponentPeer {
     }
 
     public void postPaintEvent(int x, int y, int w, int h) {
-        if (!hasSurface()) {
-           log.warning("WLComponentPeer: No surface. Skipping paint request x=" + x + " y=" + y +
-                        " width=" + w + " height=" + h);
-            return;
-        }
         PaintEvent event = PaintEventDispatcher.getPaintEventDispatcher().
                 createPaintEvent(target, x, y, w, h);
         if (event != null) {
@@ -171,9 +165,6 @@ public class WLComponentPeer implements ComponentPeer {
         return visible;
     }
 
-    boolean hasSurface() {
-        return surfaceAssigned;
-    }
 
     @Override
     public void reparent(ContainerPeer newContainer) {
@@ -275,7 +266,6 @@ public class WLComponentPeer implements ComponentPeer {
             performLocked(() -> {
                 WLToolkit.unregisterWLSurface(getWLSurface(nativePtr));
                 SurfaceData.convertTo(WLSurfaceDataExt.class, surfaceData).assignSurface(0);
-                surfaceAssigned = false;
                 nativeHideFrame(nativePtr);
             });
         }
@@ -997,7 +987,6 @@ public class WLComponentPeer implements ComponentPeer {
         final long wlSurfacePtr = getWLSurface(nativePtr);
         // TODO: this needs to be done only once after wlSetVisible(true)
         SurfaceData.convertTo(WLSurfaceDataExt.class, surfaceData).assignSurface(wlSurfacePtr);
-        surfaceAssigned = true;
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine(String.format("%s configured to %dx%d", this, newWidth, newHeight));
         }
@@ -1143,15 +1132,4 @@ public class WLComponentPeer implements ComponentPeer {
             WLToolkit.awtLock();
         }
     }
-
-    private static void startMovingWindowTogetherWithMouse(Window window, int mouseButton)
-    {
-        final AWTAccessor.ComponentAccessor acc = AWTAccessor.getComponentAccessor();
-        ComponentPeer peer = acc.getPeer(window);
-        if (peer instanceof WLComponentPeer wlComponentPeer) {
-            wlComponentPeer.startDrag();
-        } else {
-            throw new IllegalArgumentException("AWT window must have WLComponentPeer as its peer");
-        }
-    }
 }

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

@@ -1,54 +1,30 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2023 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.wl;
 
 import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.ColorModel;
+import java.awt.image.DirectColorModel;
 import java.awt.image.WritableRaster;
 
 import sun.awt.image.OffScreenImage;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.SurfaceType;
+import sun.java2d.wl.WLSurfaceData;
 
-public abstract class WLGraphicsConfig extends GraphicsConfiguration {
+public class WLGraphicsConfig extends GraphicsConfiguration {
     private final WLGraphicsDevice device;
     private final int width;
     private final int height;
     private final int scale;
 
-    protected WLGraphicsConfig(WLGraphicsDevice device, int width, int height, int scale) {
+    public WLGraphicsConfig(WLGraphicsDevice device, int width, int height, int scale) {
         this.device = device;
         this.width = width;
         this.height = height;
         this.scale = scale;
     }
 
-    boolean differsFrom(int width, int height, int scale) {
+    public boolean differsFrom(int width, int height, int scale) {
         return width != this.width || height != this.height || scale != this.scale;
     }
 
@@ -57,6 +33,21 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
         return device;
     }
 
+    @Override
+    public ColorModel getColorModel() {
+        return new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
+    }
+
+    @Override
+    public ColorModel getColorModel(int transparency) {
+        return switch (transparency) {
+            case Transparency.OPAQUE -> getColorModel();
+            case Transparency.BITMASK -> new DirectColorModel(25, 0xff0000, 0xff00, 0xff, 0x1000000);
+            case Transparency.TRANSLUCENT -> new DirectColorModel(32, 0xff0000, 0xff00, 0xff, 0xff000000);
+            default -> null;
+        };
+    }
+
     public Image createAcceleratedImage(Component target,
                                         int width, int height)
     {
@@ -84,15 +75,20 @@ public abstract class WLGraphicsConfig extends GraphicsConfiguration {
         return new Rectangle(width, height);
     }
 
+    public SurfaceType getSurfaceType() {
+        return SurfaceType.IntArgb;
+    }
+
+    public SurfaceData createSurfaceData(WLComponentPeer peer) {
+        return WLSurfaceData.createData(peer);
+    }
+
     public int getScale() {
         return scale;
     }
 
-    public abstract SurfaceType getSurfaceType();
-    public abstract SurfaceData createSurfaceData(WLComponentPeer peer);
-
     @Override
     public String toString() {
-        return String.format("%dx%d %dx scale", width, height, scale);
+        return String.format("WLGraphicsConfig: %dx%d %dx scale", width, height, scale);
     }
 }

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

@@ -27,12 +27,11 @@
 package sun.awt.wl;
 
 import sun.awt.AWTAccessor;
+import sun.awt.DisplayChangedListener;
 import sun.java2d.vulkan.WLVKGraphicsConfig;
 
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.Rectangle;
-import java.awt.Window;
+import java.awt.*;
+import java.util.ArrayList;
 
 /**
  * Corresponds to Wayland's output and is identified by its wlID and x, y coordinates
@@ -60,11 +59,8 @@ public class WLGraphicsDevice extends GraphicsDevice {
      */
     private volatile int y; // only changes when the device gets invalidated
 
-    // Configs are always the same in size and scale
-    private volatile WLGraphicsConfig[] configs = null;
-
-    // The default config is an object from the configs array
-    private volatile WLGraphicsConfig defaultConfig = null;
+    private final java.util.List<WLComponentPeer> peers = new ArrayList<>();
+    private volatile WLGraphicsConfig config = null;
 
     private WLGraphicsDevice(int id, int x, int y) {
         this.wlID = id;
@@ -78,22 +74,12 @@ public class WLGraphicsDevice extends GraphicsDevice {
 
     void updateConfiguration(String name, int width, int height, int scale) {
         this.name = name == null ? "wl_output." + wlID : name;
-
-        if (configs == null || configs[0].differsFrom(width, height, scale)) {
+        if (config == null || config.differsFrom(width, height, scale)) {
             // 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 (WLGraphicsEnvironment.isVulkanEnabled()) {
-                defaultConfig = WLVKGraphicsConfig.getConfig(this, width, height, scale);
-                configs = new WLGraphicsConfig[1];
-                configs[0] = defaultConfig;
-            } 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.
-                defaultConfig = WLSMGraphicsConfig.getConfig(this, width, height, scale, false);
-                configs = new WLGraphicsConfig[2];
-                configs[0] = defaultConfig;
-                configs[1] = WLSMGraphicsConfig.getConfig(this, width, height, scale, true);
-            }
+            config = WLGraphicsEnvironment.isVulkanEnabled() ?
+                    WLVKGraphicsConfig.getConfig(this, width, height, scale) :
+                    new WLGraphicsConfig(this, width, height, scale);
         }
     }
 
@@ -108,7 +94,7 @@ public class WLGraphicsDevice extends GraphicsDevice {
         this.y = similarDevice.y;
 
         final int newScale = similarDevice.getScale();
-        final Rectangle newBounds = similarDevice.defaultConfig.getBounds();
+        final Rectangle newBounds = similarDevice.config.getBounds();
         updateConfiguration(similarDevice.name, newBounds.width, newBounds.height, newScale);
     }
 
@@ -122,16 +108,16 @@ public class WLGraphicsDevice extends GraphicsDevice {
      * 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) {
+    public boolean isSameDeviceAs(int wlID, int x, int y) {
         return this.wlID == wlID && this.x == x && this.y == y;
     }
 
-    boolean hasSameNameAs(WLGraphicsDevice otherDevice) {
+    public boolean hasSameNameAs(WLGraphicsDevice otherDevice) {
         return name != null && otherDevice.name != null && name.equals(otherDevice.name);
     }
 
-    boolean hasSameSizeAs(WLGraphicsDevice modelDevice) {
-        return defaultConfig != null && modelDevice.defaultConfig != null && defaultConfig.getBounds().equals(modelDevice.defaultConfig.getBounds());
+    public boolean hasSameSizeAs(WLGraphicsDevice modelDevice) {
+        return config != null && modelDevice.config != null && config.getBounds().equals(modelDevice.config.getBounds());
     }
 
     @Override
@@ -150,17 +136,17 @@ public class WLGraphicsDevice extends GraphicsDevice {
         // "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."
-        // So there's always the same set of configs.
-        return configs.clone();
+        // So there is just one config, always.
+        return new GraphicsConfiguration[] {config};
     }
 
     @Override
     public GraphicsConfiguration getDefaultConfiguration() {
-        return defaultConfig;
+        return config;
     }
 
     int getScale() {
-        return defaultConfig.getScale();
+        return config.getScale();
     }
 
     @Override
@@ -211,8 +197,6 @@ public class WLGraphicsDevice extends GraphicsDevice {
 
     @Override
     public String toString() {
-        return String.format("WLGraphicsDevice: id=%d at (%d, %d) with %s",
-                wlID, x, y,
-                defaultConfig != null ? defaultConfig : "<no configs>");
+        return String.format("WLGraphicsDevice: id=%d at (%d, %d) with %s", wlID, x, y, config);
     }
 }