Merge branch 'Htylol-change_3d_api' into devel

data_from_portwine/locales/PortProton.pot

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2025-02-27 01:09+0300\n"
+        "POT-Creation-Date: 2025-02-27 20:05+0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,9 +67,6 @@ msgstr  ""
 msgid   "WineD3D OpenGL (For video cards without Vulkan)"
 msgstr  ""
 
-msgid   "WineD3D Vulkan (Damavand experimental)"
-msgstr  ""
-
 msgid   "Legacy DXVK (Vulkan v1.1)"
 msgstr  ""
 
@@ -79,9 +76,6 @@ msgstr  ""
 msgid   "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
 msgstr  ""
 
-msgid   "Gallium Zink (OpenGL to Vulkan)"
-msgstr  ""
-
 msgid   "GET-OTHER-WINE"
 msgstr  ""
 
@@ -411,16 +405,31 @@ msgstr  ""
 msgid   "WINE MANAGER"
 msgstr  ""
 
+msgid   "Using FPS and system load monitoring (Turns on and off by the key "
+        "combination - right Shift + F12)"
+msgstr  ""
+
+msgid   "Forced use of MANGOHUD system settings (GOverlay, etc.)"
+msgstr  ""
+
+msgid   "Forced use of VKBASALT system settings (GOverlay, etc.)"
+msgstr  ""
+
 msgid   "Enable dgVoodoo2. Forced use all dgVoodoo2 libs (Glide 2.11-3.1, "
         "DirectDraw 1-7, Direct3D 2-9) on all 3D API. For WineD3D OpenGL need "
         "use WineLG (For Gallium Nine and Zink use too)"
 msgstr  ""
 
-msgid   "Force use DirectInput protocol instead of XInput"
-msgstr  ""
-
-msgid   "Enable experemental native Wayland support (need special wine build "
-        "to work)"
+msgid   "<b>Super + F :</b> Toggle fullscreen\n"
+        "<b>Super + N :</b> Toggle nearest neighbour filtering\n"
+        "<b>Super + U :</b> Toggle FSR upscaling\n"
+        "<b>Super + Y :</b> Toggle NIS upscaling\n"
+        "<b>Super + I :</b> Increase FSR sharpness by 1\n"
+        "<b>Super + O :</b> Decrease FSR sharpness by 1\n"
+        "<b>Super + S :</b> Take screenshot (currently goes to /tmp/"
+        "gamescope_DATE.png)\n"
+        "<b>Super + G :</b> Toggle keyboard grab\n"
+        "<b>Super + C :</b> Update clipboard"
 msgstr  ""
 
 msgid   "Do not use in-process synchronization primitives based on eventfd. "
@@ -435,17 +444,18 @@ msgstr  ""
 msgid   "Enable vkd3d support - Ray Tracing"
 msgstr  ""
 
-msgid   "Required for video playback in some games so that it is not "
-        "distorted (usually colored pink)"
+msgid   "Enable DLSS on supported NVIDIA graphics cards"
 msgstr  ""
 
-msgid   "Disable asynchronous calls for VULKAN and DXVK modes"
+msgid   "Enable DLSS translator in FSR 2 in DirectX 12 games (CyberFSR2)"
 msgstr  ""
 
-msgid   "Enable DLSS on supported NVIDIA graphics cards"
+msgid   "Enable DLSS 3 with FG translator in FSR 3 in DirectX 12 games (based "
+        "on Decky-Framegen) Do not use in multiplayer games"
 msgstr  ""
 
-msgid   "Forced use of older versions of OpenGL"
+msgid   "Works while using any version of ProtonGE in full screen mode at a "
+        "resolution below the standard screen"
 msgstr  ""
 
 msgid   "Disguise all features used for NVIDIA graphics cards"
@@ -457,102 +467,85 @@ msgstr  ""
 msgid   "Run the application in the terminal"
 msgstr  ""
 
-msgid   "Include a delay in releasing some memory to bypass errors associated "
-        "with using the application after the memory is released"
-msgstr  ""
-
-msgid   "A very dangerous way to hack the memory write timer in ntdll. This "
-        "improves the performance of some very specific games. (It is "
-        "recommended not to change the value.)"
-msgstr  ""
-
 msgid   "Disable the window for selecting startup modes and WINE versions"
 msgstr  ""
 
-msgid   "Use Gstreamer to output clips in games (WMF support)"
+msgid   "Using automatic system optimization to improve performance in games "
+        "(provided the gamemode package is installed on the system, doesn't "
+        "work with ananicy)"
 msgstr  ""
 
-msgid   "Use container launch mode (It is recommended not to change the value)"
+msgid   "Enable forced use of third-party DirectX libraries"
 msgstr  ""
 
-msgid   "Using FPS and system load monitoring (Turns on and off by the key "
-        "combination - right Shift + F12)"
+msgid   "Required for video playback in some games so that it is not "
+        "distorted (usually colored pink)"
 msgstr  ""
 
-msgid   "Using automatic system optimization to improve performance in games "
-        "(provided the gamemode package is installed on the system, doesn't "
-        "work with ananicy)"
+msgid   "Reduce pulseaudio latency to fix intermittent sound"
 msgstr  ""
 
-msgid   "Forced use of built-in DXGI library (in rare cases it solves "
-        "problems with DX12 games)"
+msgid   "Forced use of the us layout (useful for games in which the control "
+        "works correctly only on the us layout)"
 msgstr  ""
 
-msgid   "Forced use of MANGOHUD system settings (GOverlay, etc.)"
+msgid   "Use Gstreamer to output clips in games (WMF support)"
 msgstr  ""
 
-msgid   "Forced use of VKBASALT system settings (GOverlay, etc.)"
+msgid   "Use WINE shader caching (disable only if there are microfreezes in "
+        "the game)"
 msgstr  ""
 
-msgid   "Enable forced use of third-party DirectX libraries"
+msgid   "Forced use of built-in DXGI library (in rare cases it solves "
+        "problems with DX12 games)"
 msgstr  ""
 
-msgid   "Change the version of WINDOWS 10 to WINDOWS 7 in the prefix"
+msgid   "Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if "
+        "game used this anti-cheats)"
 msgstr  ""
 
-msgid   "Use WINE shader caching (disable only if there are microfreezes in "
-        "the game)"
+msgid   "Use system mangohud, vkBasalt, obs-vkcapture and other applications "
+        "using vulkan layers"
 msgstr  ""
 
-msgid   "Works while using any version of ProtonGE in full screen mode at a "
-        "resolution below the standard screen"
+msgid   "Enable the ability to write to OBS Studio using obs-vkcapture "
+        "(ATTENTION: the forced use of system mangohud, vkBasalt, obs-"
+        "vkcapture and other applications using vulkan layers will be enabled)"
 msgstr  ""
 
-msgid   "Enable DLSS translator in FSR 2 in DirectX 12 games (CyberFSR2)"
+msgid   "Disable desktop compositing (effects). It often improves performance."
 msgstr  ""
 
-msgid   "Enable DLSS 3 with FG translator in FSR 3 in DirectX 12 games (based "
-        "on Decky-Framegen) Do not use in multiplayer games"
+msgid   "Use container launch mode (It is recommended not to change the value)"
 msgstr  ""
 
-msgid   "Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if "
-        "game used this anti-cheats)"
+msgid   "Force use DirectInput protocol instead of XInput"
 msgstr  ""
 
-msgid   "Reduce pulseaudio latency to fix intermittent sound"
+msgid   "Enable experemental native Wayland support (need special wine build "
+        "to work)"
 msgstr  ""
 
-msgid   "Forced use of the us layout (useful for games in which the control "
-        "works correctly only on the us layout)"
+msgid   "Use Gallium Zink (OpenGL driver is implemented via Vulkan)"
 msgstr  ""
 
-msgid   "Remember the screen resolution when starting the game and return it "
-        "when closing (useful for games that change the screen resolution "
-        "when closing)"
+msgid   "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental "
+        "function."
 msgstr  ""
 
-msgid   "Use system mangohud, vkBasalt, obs-vkcapture and other applications "
-        "using vulkan layers"
+msgid   "Disable asynchronous calls for VULKAN and DXVK modes"
 msgstr  ""
 
-msgid   "Enable the ability to write to OBS Studio using obs-vkcapture "
-        "(ATTENTION: the forced use of system mangohud, vkBasalt, obs-"
-        "vkcapture and other applications using vulkan layers will be enabled)"
+msgid   "Forced use of older versions of OpenGL"
 msgstr  ""
 
-msgid   "Disable desktop compositing (effects). It often improves performance."
+msgid   "Include a delay in releasing some memory to bypass errors associated "
+        "with using the application after the memory is released"
 msgstr  ""
 
-msgid   "<b>Super + F :</b> Toggle fullscreen\n"
-        "<b>Super + N :</b> Toggle nearest neighbour filtering\n"
-        "<b>Super + U :</b> Toggle FSR upscaling\n"
-        "<b>Super + Y :</b> Toggle NIS upscaling\n"
-        "<b>Super + I :</b> Increase FSR sharpness by 1\n"
-        "<b>Super + O :</b> Decrease FSR sharpness by 1\n"
-        "<b>Super + S :</b> Take screenshot (currently goes to /tmp/"
-        "gamescope_DATE.png)\n"
-        "<b>Super + G :</b> Toggle keyboard grab\n"
-        "<b>Super + C :</b> Update clipboard"
+msgid   "A very dangerous way to hack the memory write timer in ntdll. This "
+        "improves the performance of some very specific games. (It is "
+        "recommended not to change the value.)"
 msgstr  ""
 
 msgid   "Change the version of <b>WINDOWS</b> emulation"

data_from_portwine/scripts/start.sh

@@ -481,19 +481,15 @@ then DIST_ADD_TO_GUI+="!${translations[USE_SYSTEM_WINE]}"
 fi
 
 SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}"
-SORT_VULKAN="${translations[WineD3D Vulkan (Damavand experimental)]}"
 SORT_LEGACY="${translations[Legacy DXVK (Vulkan v1.1)]}"
 SORT_STABLE="${translations[Stable DXVK, VKD3D (Vulkan v1.2)]}"
 SORT_NEWEST="${translations[Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)]}"
-SORT_G_ZINK="${translations[Gallium Zink (OpenGL to Vulkan)]}"
 
 case "$PW_VULKAN_USE" in
-    0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_VULKAN" ;;
-    6) PW_DEFAULT_VULKAN_USE="$SORT_VULKAN!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL" ;;
-    1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
-    5) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
-    4) PW_DEFAULT_VULKAN_USE="$SORT_G_ZINK!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL!$SORT_VULKAN" ;;
-    *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
+    0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY" ;;
+    1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_OPENGL" ;;
+    5) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_OPENGL" ;;
+    *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL" ;;
 esac
 
 if [[ $PW_WINE_USE == PROTON_LG ]] ; then
@@ -905,9 +901,7 @@ case "${VULKAN_MOD}" in
     "$SORT_OPENGL" )     export PW_VULKAN_USE="0" ;;
     "$SORT_STABLE" )     export PW_VULKAN_USE="1" ;;
     "$SORT_NEWEST" )     export PW_VULKAN_USE="2" ;;
-    "$SORT_G_ZINK" )     export PW_VULKAN_USE="4" ;;
     "$SORT_LEGACY" )     export PW_VULKAN_USE="5" ;;
-    "$SORT_VULKAN" )     export PW_VULKAN_USE="6" ;;
 esac
 
 init_wine_ver

data_from_portwine/scripts/var

@@ -38,6 +38,8 @@ export PW_LOCALE_SELECT="disabled"
 export PW_DINPUT_PROTOCOL="0"
 export PW_USE_VRCLIENT="0"
 export STAGING_SHARED_MEMORY="1"
+export PW_USE_GALLIUM_ZINK="1"
+export PW_USE_DAMAVAND="0"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
 export PW_PLUGINS_VER="_v19"