支持更多 Vulkan 渲染器

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -173,11 +173,10 @@ private void launch0() {
                                 }
                             }),
                             Task.composeAsync(() -> {
-                                Renderer renderer = setting.getRenderer();
-                                if (renderer == null || renderer.getMesaDriverName() == null
-                                        || OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS) {
+                                if (OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS
+                                        || !(setting.getRenderer() instanceof Renderer.Driver renderer)
+                                        || renderer.mesaDriverName() == null)
                                     return null;
-                                }
 
                                 Library lib = NativePatcher.getWindowsMesaLoader(java, renderer, OperatingSystem.SYSTEM_VERSION);
                                 if (lib == null)
@@ -188,7 +187,7 @@ private void launch0() {
                                     return null;
                                 }
 
-                                String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.getMesaDriverName();
+                                String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.mesaDriverName();
 
                                 if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
                                     return new LibraryDownloadTask(dependencyManager, file, lib)

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java

@@ -836,7 +836,7 @@ public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializati
 
             obj.addProperty("graphicsBackend", src.getGraphicsBackend().name());
             obj.addProperty("renderer", src.getRenderer().name());
-            if (src.getRenderer() == Renderer.LLVMPIPE)
+            if (src.getRenderer() == Renderer.OpenGL.LLVMPIPE)
                 obj.addProperty("useSoftwareRenderer", true);
 
             return obj;
@@ -909,15 +909,9 @@ public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializ
             }
 
             vs.setRenderer(Optional.ofNullable(obj.get("renderer")).map(JsonElement::getAsString)
-                    .flatMap(name -> {
-                        try {
-                            return Optional.of(Renderer.valueOf(name.toUpperCase(Locale.ROOT)));
-                        } catch (IllegalArgumentException ignored) {
-                            return Optional.empty();
-                        }
-                    }).orElseGet(() -> {
+                    .map(Renderer::of).orElseGet(() -> {
                         boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
-                        return useSoftwareRenderer ? Renderer.LLVMPIPE : Renderer.DEFAULT;
+                        return useSoftwareRenderer ? Renderer.OpenGL.LLVMPIPE : Renderer.DEFAULT;
                     }));
 
             vs.setGraphicsBackend(Optional.ofNullable(obj.get("graphicsBackend")).map(JsonElement::getAsString)
@@ -927,7 +921,7 @@ public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializ
                         } catch (IllegalArgumentException ignored) {
                             return Optional.empty();
                         }
-                    }).orElseGet(() -> vs.getRenderer().getApi()));
+                    }).orElseGet(() -> vs.getRenderer() instanceof Renderer.Driver renderer ? renderer.api() : GraphicsAPI.DEFAULT));
 
             return vs;
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java

@@ -219,22 +219,20 @@ else if (gameVersion.compareTo("26.2-snapshot-2") < 0)
                 return I18n.hasKey(bundleKey) ? i18n(bundleKey) : null;
             });
             rendererPane.setValue(Renderer.DEFAULT);
-            rendererPane.setItems(Renderer.DEFAULT);
 
             FXUtils.onChangeAndOperate(graphicsBackendPane.valueProperty(), backend -> {
                 if (backend == null) { // unbind
                     return;
                 }
 
-                rendererPane.setItems(Renderer.SUPPORTED.get(backend));
+                rendererPane.setItems(Renderer.getSupported(backend));
                 if (backend == GraphicsAPI.DEFAULT) {
                     rendererPane.setDisable(true);
                     rendererPane.setValue(Renderer.DEFAULT);
                 } else {
                     rendererPane.setDisable(false);
-                    if (rendererPane.getValue() == null || !rendererPane.getValue().isSupported(backend)) {
+                    if (!(rendererPane.getValue() instanceof Renderer.Driver driver) || driver.api() != backend)
                         rendererPane.setValue(Renderer.DEFAULT);
-                    }
                 }
             });
 

HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java

@@ -197,7 +197,7 @@ public static Version patchNative(DefaultGameRepository repository,
         if (windowsVersion.isAtLeast(OSVersion.WINDOWS_10)) {
             return getNatives(java.getPlatform()).get("mesa-loader");
         } else if (windowsVersion.isAtLeast(OSVersion.WINDOWS_7)) {
-            if (renderer == Renderer.LLVMPIPE)
+            if (renderer == Renderer.OpenGL.LLVMPIPE)
                 return getNatives(java.getPlatform()).get("software-renderer-loader");
             else
                 return null;

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -1389,14 +1389,44 @@ settings.advanced.post_exit_command.prompt=Commands to execute after the game ex
 settings.advanced.renderer=Renderer
 settings.advanced.renderer.default=Default
 settings.advanced.renderer.default.desc=Use System Default
-settings.advanced.renderer.d3d12=Mesa D3D12
-settings.advanced.renderer.d3d12.desc=OpenGL renderer based on DirectX 12
+# Vulkan Renderers
 settings.advanced.renderer.lavapipe=Mesa Lavapipe
 settings.advanced.renderer.lavapipe.desc=Software Vulkan Renderer
-settings.advanced.renderer.llvmpipe=Mesa LLVMpipe
-settings.advanced.renderer.llvmpipe.desc=Software OpenGL Renderer
 settings.advanced.renderer.dozen=Mesa Dozen
 settings.advanced.renderer.dozen.desc=Vulkan renderer based on DirectX 12 (Experimental)
+settings.advanced.renderer.nvidia_vulkan=NVIDIA
+settings.advanced.renderer.nvidia_vulkan.desc=Official Vulkan driver for NVIDIA GPUs
+settings.advanced.renderer.nvidia_nvk=NVIDIA (NVK)
+settings.advanced.renderer.nvidia_nvk.desc=Open-source Vulkan driver for NVIDIA GPUs
+settings.advanced.renderer.amdvlk=AMD
+settings.advanced.renderer.amdvlk.desc=Official Vulkan driver for AMD GPUs
+settings.advanced.renderer.amd_radv=AMD (RADV)
+settings.advanced.renderer.amd_radv.desc=Open-source Vulkan driver for AMD GPUs
+settings.advanced.renderer.intel_vulkan=Intel
+settings.advanced.renderer.intel_vulkan.desc=Official Vulkan driver for Intel GPUs
+settings.advanced.renderer.intel_anv=Intel (ANV)
+settings.advanced.renderer.intel_anv.desc=Open-source Vulkan driver for Intel GPUs
+settings.advanced.renderer.intel_hasvk=Intel (HASVK)
+settings.advanced.renderer.intel_hasvk.desc=Open-source Vulkan driver for older Intel GPUs
+settings.advanced.renderer.qualcomm=Qualcomm
+settings.advanced.renderer.qualcomm.desc=Official Vulkan driver for Qualcomm Adreno GPUs
+settings.advanced.renderer.turnip=Qualcomm (Turnip)
+settings.advanced.renderer.turnip.desc=Open-source Vulkan driver for Qualcomm Adreno GPUs
+settings.advanced.renderer.moltenvk=MoltenVK
+settings.advanced.renderer.moltenvk.desc=Vulkan renderer based on Metal
+settings.advanced.renderer.kosmickrisp=KosmicKrisp
+settings.advanced.renderer.kosmickrisp.desc=Vulkan renderer based on Metal 4 (Experimental)
+settings.advanced.renderer.powervr=PowerVR
+settings.advanced.renderer.powervr.desc=Open-source Vulkan driver for PowerVR GPUs (Experimental)
+settings.advanced.renderer.panvk=PanVK
+settings.advanced.renderer.panvk.desc=Open-source Vulkan driver for Arm Mali GPUs (Experimental)
+settings.advanced.renderer.v3dv=V3DV
+settings.advanced.renderer.v3dv.desc=Open-source Vulkan driver for Raspberry Pi 4/5 GPUs (Experimental)
+# OpenGL Renderers
+settings.advanced.renderer.llvmpipe=Mesa LLVMpipe
+settings.advanced.renderer.llvmpipe.desc=Software OpenGL renderer
+settings.advanced.renderer.d3d12=Mesa D3D12
+settings.advanced.renderer.d3d12.desc=OpenGL renderer based on DirectX 12
 settings.advanced.renderer.zink=Mesa Zink
 settings.advanced.renderer.zink.desc=OpenGL renderer based on Vulkan
 settings.advanced.server_ip=Server Address

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -1173,17 +1173,47 @@ settings.advanced.process_priority.high=高
 settings.advanced.process_priority.high.desc=優先保證遊戲執行，但可能會導致其他程式卡頓
 settings.advanced.post_exit_command=遊戲結束後執行指令
 settings.advanced.post_exit_command.prompt=將在遊戲結束後呼叫使用
-settings.advanced.renderer=繪製器
+settings.advanced.renderer=繪製器/驅動
 settings.advanced.renderer.default=預設
 settings.advanced.renderer.default.desc=使用系統預設繪製器
-settings.advanced.renderer.d3d12=Mesa D3D12
-settings.advanced.renderer.d3d12.desc=基於 DirectX 12 的 OpenGL 繪製器
+# Vulkan Renderers
 settings.advanced.renderer.lavapipe=Mesa Lavapipe
 settings.advanced.renderer.lavapipe.desc=軟體 Vulkan 繪製器
-settings.advanced.renderer.llvmpipe=Mesa LLVMpipe
-settings.advanced.renderer.llvmpipe.desc=軟體 OpenGL 繪製器
 settings.advanced.renderer.dozen=Mesa Dozen
 settings.advanced.renderer.dozen.desc=基於 DirectX 12 的 Vulkan 繪製器 (實驗性)
+settings.advanced.renderer.nvidia_vulkan=NVIDIA
+settings.advanced.renderer.nvidia_vulkan.desc=NVIDIA GPU 的官方 Vulkan 驅動
+settings.advanced.renderer.nvidia_nvk=NVIDIA (NVK)
+settings.advanced.renderer.nvidia_nvk.desc=NVIDIA GPU 的開源 Vulkan 驅動
+settings.advanced.renderer.amdvlk=AMD
+settings.advanced.renderer.amdvlk.desc=AMD GPU 的官方 Vulkan 驅動
+settings.advanced.renderer.amd_radv=AMD (RADV)
+settings.advanced.renderer.amd_radv.desc=AMD GPU 的開源 Vulkan 驅動
+settings.advanced.renderer.intel_vulkan=Intel
+settings.advanced.renderer.intel_vulkan.desc=Intel GPU 的官方 Vulkan 驅動
+settings.advanced.renderer.intel_anv=Intel (ANV)
+settings.advanced.renderer.intel_anv.desc=Intel GPU 的開源 Vulkan 驅動
+settings.advanced.renderer.intel_hasvk=Intel (HASVK)
+settings.advanced.renderer.intel_hasvk.desc=Intel 舊 GPU 的開源 Vulkan 驅動
+settings.advanced.renderer.qualcomm=高通
+settings.advanced.renderer.qualcomm.desc=高通 Adreno GPU 的官方 Vulkan 驅動
+settings.advanced.renderer.turnip=高通 (Turnip)
+settings.advanced.renderer.turnip.desc=高通 Adreno GPU 的開源 Vulkan 驅動
+settings.advanced.renderer.moltenvk=MoltenVK
+settings.advanced.renderer.moltenvk.desc=基於 Metal 的 Vulkan 繪製器
+settings.advanced.renderer.kosmickrisp=KosmicKrisp
+settings.advanced.renderer.kosmickrisp.desc=基於 Metal 4 的 Vulkan 繪製器 (實驗性)
+settings.advanced.renderer.powervr=PowerVR
+settings.advanced.renderer.powervr.desc=PowerVR GPU 的開源 Vulkan 驅動 (實驗性)
+settings.advanced.renderer.panvk=PanVK
+settings.advanced.renderer.panvk.desc=Arm Mali GPU 的開源 Vulkan 驅動 (實驗性)
+settings.advanced.renderer.v3dv=V3DV
+settings.advanced.renderer.v3dv.desc=樹莓派 4/5 GPU 的開源 Vulkan 驅動 (實驗性)
+# OpenGL Renderers
+settings.advanced.renderer.llvmpipe=Mesa LLVMpipe
+settings.advanced.renderer.llvmpipe.desc=軟體 OpenGL 繪製器
+settings.advanced.renderer.d3d12=Mesa D3D12
+settings.advanced.renderer.d3d12.desc=基於 DirectX 12 的 OpenGL 繪製器
 settings.advanced.renderer.zink=Mesa Zink
 settings.advanced.renderer.zink.desc=基於 Vulkan 的 OpenGL 繪製器
 settings.advanced.server_ip=伺服器位址

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -1178,17 +1178,47 @@ settings.advanced.process_priority.high=高
 settings.advanced.process_priority.high.desc=优先保证游戏运行，但可能会导致其他程序卡顿
 settings.advanced.post_exit_command=游戏结束后执行命令
 settings.advanced.post_exit_command.prompt=将在游戏结束后调用
-settings.advanced.renderer=渲染器
+settings.advanced.renderer=渲染器/驱动
 settings.advanced.renderer.default=默认
 settings.advanced.renderer.default.desc=使用系统默认渲染器
-settings.advanced.renderer.d3d12=Mesa D3D12
-settings.advanced.renderer.d3d12.desc=基于 DirectX 12 的 OpenGL 渲染器
-settings.advanced.renderer.dozen=Mesa Dozen
-settings.advanced.renderer.dozen.desc=基于 DirectX 12 的 Vulkan 渲染器 (实验性)
+# Vulkan Renderers
 settings.advanced.renderer.lavapipe=Mesa Lavapipe
 settings.advanced.renderer.lavapipe.desc=软件 Vulkan 渲染器
+settings.advanced.renderer.dozen=Mesa Dozen
+settings.advanced.renderer.dozen.desc=基于 DirectX 12 的 Vulkan 渲染器 (实验性)
+settings.advanced.renderer.nvidia_vulkan=NVIDIA
+settings.advanced.renderer.nvidia_vulkan.desc=NVIDIA GPU 的官方 Vulkan 驱动
+settings.advanced.renderer.nvidia_nvk=NVIDIA (NVK)
+settings.advanced.renderer.nvidia_nvk.desc=NVIDIA GPU 的开源 Vulkan 驱动
+settings.advanced.renderer.amdvlk=AMD
+settings.advanced.renderer.amdvlk.desc=AMD GPU 的官方 Vulkan 驱动
+settings.advanced.renderer.amd_radv=AMD (RADV)
+settings.advanced.renderer.amd_radv.desc=AMD GPU 的开源 Vulkan 驱动
+settings.advanced.renderer.intel_vulkan=Intel
+settings.advanced.renderer.intel_vulkan.desc=Intel GPU 的官方 Vulkan 驱动
+settings.advanced.renderer.intel_anv=Intel (ANV)
+settings.advanced.renderer.intel_anv.desc=Intel GPU 的开源 Vulkan 驱动
+settings.advanced.renderer.intel_hasvk=Intel (HASVK)
+settings.advanced.renderer.intel_hasvk.desc=Intel 旧 GPU 的开源 Vulkan 驱动
+settings.advanced.renderer.qualcomm=高通
+settings.advanced.renderer.qualcomm.desc=高通 Adreno GPU 的官方 Vulkan 驱动
+settings.advanced.renderer.turnip=高通 (Turnip)
+settings.advanced.renderer.turnip.desc=高通 Adreno GPU 的开源 Vulkan 驱动
+settings.advanced.renderer.moltenvk=MoltenVK
+settings.advanced.renderer.moltenvk.desc=基于 Metal 的 Vulkan 渲染器
+settings.advanced.renderer.kosmickrisp=KosmicKrisp
+settings.advanced.renderer.kosmickrisp.desc=基于 Metal 4 的 Vulkan 渲染器 (实验性)
+settings.advanced.renderer.powervr=PowerVR
+settings.advanced.renderer.powervr.desc=PowerVR GPU 的开源 Vulkan 驱动 (实验性)
+settings.advanced.renderer.panvk=PanVK
+settings.advanced.renderer.panvk.desc=Arm Mali GPU 的开源 Vulkan 驱动 (实验性)
+settings.advanced.renderer.v3dv=V3DV
+settings.advanced.renderer.v3dv.desc=树莓派 4/5 GPU 的开源 Vulkan 驱动 (实验性)
+# OpenGL Renderers
 settings.advanced.renderer.llvmpipe=Mesa LLVMpipe
 settings.advanced.renderer.llvmpipe.desc=软件 OpenGL 渲染器
+settings.advanced.renderer.d3d12=Mesa D3D12
+settings.advanced.renderer.d3d12.desc=基于 DirectX 12 的 OpenGL 渲染器
 settings.advanced.renderer.zink=Mesa Zink
 settings.advanced.renderer.zink.desc=基于 Vulkan 的 OpenGL 渲染器
 settings.advanced.server_ip=服务器地址