From 60930399af06330c46fe36d92d7acaa7c24d3361 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Thu, 21 Sep 2023 00:37:35 +0100 Subject: [PATCH] Game Menu: Replace vkBasalt checkbox with generic Vulkan Post Processing checkbox (#910) --- lang/chinese.txt | 4 ++-- lang/dutch.txt | 4 ++-- lang/english.txt | 4 ++-- lang/englishUK.txt | 4 ++-- lang/french.txt | 5 ++--- lang/german.txt | 4 ++-- lang/italian.txt | 4 ++-- lang/polish.txt | 4 ++-- lang/russian.txt | 4 ++-- steamtinkerlaunch | 29 ++++++++++++++++++++++------- 10 files changed, 40 insertions(+), 26 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index 50228b43..91b1e0e8 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -257,9 +257,7 @@ GUI_DLSHADER="着色器下载" DESC_DLSHADER="如果需要，允许拉取和更新着色器" GUI_SHADERDIALOG="选中的着色器库将被安装到'XXX'gamedir中，未选中的将从其中删除" DESC_USERESHADE="在启用 ReShade 后开始游戏" -DESC_ENABLE_VKBASALT="启动游戏时启用 vkBasalt" GUI_USERESHADE="启用 ReShade" -GUI_ENABLE_VKBASALT="启用 vkBasalt" GUI_ALTEXEPATH="替代游戏 exe 路径" DESC_ALTEXEPATH="替代的游戏 exe 路径(例如，对于 ReShade 安装和游戏启动器在一个额外的目录中)" GUI_CHOOSESHADERS="着色器菜单" @@ -1212,3 +1210,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/dutch.txt b/lang/dutch.txt index 335f5d9a..d73fdbda 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Shader download" DESC_DLSHADER="Toestaan van pulling en updating shaders indien nodig" GUI_SHADERDIALOG="Checked shader repos will be installed into the 'XXX' gamedir and unchecked will be removed from it" DESC_USERESHADE="Start spel met ReShade ingeschakeld" -DESC_ENABLE_VKBASALT="Start spel met vkBasalt ingeschakeld" GUI_USERESHADE="ReShade inschakelen" -GUI_ENABLE_VKBASALT="vkBasalt inschakelen" GUI_ALTEXEPATH="Alternatieve spel exe path" DESC_ALTEXEPATH="Alternatieve spel exe path (f.e. for ReShade instalatie en de game launcher is in een extra folder)" GUI_CHOOSESHADERS="Shader menu" @@ -1211,3 +1209,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/english.txt b/lang/english.txt index 34c633aa..da6dbb2a 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -257,9 +257,7 @@ GUI_DLSHADER="Shader download" DESC_DLSHADER="Allow pulling and updating shaders if required" GUI_SHADERDIALOG="Checked shader repos will be installed into the 'XXX' gamedir and unchecked will be removed from it" DESC_USERESHADE="Start game with ReShade enabled, downloading the default or overridden version before game launch" -DESC_ENABLE_VKBASALT="Start game with vkBasalt enabled" GUI_USERESHADE="Use ReShade" -GUI_ENABLE_VKBASALT="vkBasalt enable" GUI_ALTEXEPATH="Alternative game exe path" DESC_ALTEXEPATH="Alternative game exe path (f.e. for ReShade installation and the game launcher is in an extra directory)" GUI_CHOOSESHADERS="Shader menu" @@ -1212,3 +1210,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index 9267860f..84d7a91c 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Shader download" DESC_DLSHADER="Allow pulling and updating shaders if required" GUI_SHADERDIALOG="Checked shader repos will be installed into the 'XXX' gamedir and unchecked will be removed from it" DESC_USERESHADE="Start game with ReShade enabled, downloading the default or overridden version before game launch" -DESC_ENABLE_VKBASALT="Start game with vkBasalt enabled" GUI_USERESHADE="Use ReShade" -GUI_ENABLE_VKBASALT="vkBasalt enable" GUI_ALTEXEPATH="Alternative game exe path" DESC_ALTEXEPATH="Alternative game exe path (f.e. for ReShade installation and the game launcher is in an extra directory)" GUI_CHOOSESHADERS="Shader menu" @@ -1211,3 +1209,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/french.txt b/lang/french.txt index e40bfa79..db11956f 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -252,10 +252,7 @@ GUI_DLSHADER="Téléchargement du shader" DESC_DLSHADER="Autoriser à puller et mettre à jour les shaders si nécessaire" GUI_SHADERDIALOG="Les shader repos cochés seront installés dans le répertoire de jeu 'XXX' et les shaders non cochés seront supprimés" DESC_USERESHADE="Démarrer le jeu avec ReShade activé" -DESC_ENABLE_VKBASALT=" -Démarrer le jeu avec vkBasalt activé" GUI_USERESHADE="Activer ReShade" -GUI_ENABLE_VKBASALT="Activer vkBasalt" GUI_ALTEXEPATH="Chemin alternatif de l'exe du jeu" DESC_ALTEXEPATH="Chemin alternatif de l'exe du jeu (par exemple pour l'installation de ReShade lorsque le lanceur du jeu est dans un répertoire supplémentaire)" GUI_CHOOSESHADERS="Menu du shader" @@ -1211,3 +1208,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/german.txt b/lang/german.txt index b9a5fea3..8b61860f 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Shader Download" DESC_DLSHADER="Erlauben, dass Shader heruntergeladen und aktualisiert werden dürfen" GUI_SHADERDIALOG="Ausgewählte Shader Repos werden in das 'XXX' Spieleverzeichnis\n installiert und nicht selektierte werden daraus entfernt" DESC_USERESHADE="Starte das Spiel mit aktiviertem ReShade" -DESC_ENABLE_VKBASALT="Starte das Spiel mit aktiviertem vkBasalt" GUI_USERESHADE="ReShade aktivieren" -GUI_ENABLE_VKBASALT="vkBasalt aktivieren" GUI_ALTEXEPATH="Alternativer Spiele Exe Pfad" DESC_ALTEXEPATH="Alternativer Spiele Exe Pfad (z.B. für die ReShade Installation und der Spiele Launcher in einem anderen Verzeichnis liegt)" GUI_CHOOSESHADERS="Shader Menü" @@ -1213,3 +1211,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/italian.txt b/lang/italian.txt index 3aab88d5..4b1d4f79 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Clona shader tramite URL git" DESC_DLSHADER="Consenti di scaricare e aggiornare una copia dello shader se richiesto" GUI_SHADERDIALOG="Gli Shader repos selezionati saranno installati in 'XXX' gamedir quelli deselezionati saranno rimossi" DESC_USERESHADE="Avvia il gioco con ReShade abilitato" -DESC_ENABLE_VKBASALT="Avvia il gioco con vkBasalt abilitato" GUI_USERESHADE="Abilita ReShade" -GUI_ENABLE_VKBASALT="Abilita vkBasalt" GUI_ALTEXEPATH="Alternativa Game Exe Path" DESC_ALTEXEPATH="Alternativa Game Exe Path (f.e. per l'installazione ReShade e per il Game Launcher c'è una cartella extra)" GUI_CHOOSESHADERS="Scegli Shaders" @@ -1211,3 +1209,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/polish.txt b/lang/polish.txt index f34e2c1e..34e037c8 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Pobieraj shadery" DESC_DLSHADER="Pozwól na pobieranie i aktualizowanie shaderów jeśli jest to wymagane" GUI_SHADERDIALOG="Zaznaczone shadery repos będą instalowane w katalogu gry 'XXX' i odznaczenie będzie je z niego usuwać" DESC_USERESHADE="Uruchom grę z włączonym ReShade" -DESC_ENABLE_VKBASALT="Uruchom grę z włączonym vkBasalt" GUI_USERESHADE="Włącz ReShade" -GUI_ENABLE_VKBASALT="Włącz vkBasalt" GUI_ALTEXEPATH="Alternatywna ścieżka pliku wykonywalnego gry" DESC_ALTEXEPATH="Alternatywna ścieżka pliku wykonywalnego gry (np. dla instalacji ReShade i launcher gry jest w dodatkowym folderze)" GUI_CHOOSESHADERS="Menu shadera" @@ -1211,3 +1209,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/lang/russian.txt b/lang/russian.txt index c71a1bd2..aa9a6839 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -253,9 +253,7 @@ GUI_DLSHADER="Клонирование shader из git" DESC_DLSHADER="Разрешить загрузку и обновление копии shader если необходимо" GUI_SHADERDIALOG="Отмеченные Шейдеры будут установлены в каталог игры 'XXX', а неотмеченные будут удалены из него" DESC_USERESHADE="Запуск игры с включеным ReShade" -DESC_ENABLE_VKBASALT="Запуск игры с включеным vkBasalt" GUI_USERESHADE="Включить ReShade" -GUI_ENABLE_VKBASALT="Включить vkBasalt" GUI_ALTEXEPATH="Alternative Game Exe Path" DESC_ALTEXEPATH="Alternative Game Exe Path (f.e. for ReShade installation and the Game Launcher is in an extra directory)" GUI_CHOOSESHADERS="Shader Menu" @@ -1211,3 +1209,5 @@ GUI_NOSTGGAMEART="Game Art" GUI_NOSTGPROPS="Game Properties" GUI_NOSTGCOMPATTOOL="Compatibility Tool" DESC_NOSTGCOMPATTOOL="Compatibility Tool to use with the Non-Steam Game - Default is 'none', meaning no tool will be used" +GUI_VULKANPOSTPROCESSOR="Vulkan Post-Processor" +DESC_VULKANPOSTPROCESSOR="select a Vulkan Post-Processor for use with a Vulkan title (Native Linux or Proton compatible) - This option SHOULD NOT be used with ReShade enabled" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 745fcfc9..c68c2a5b 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230919-2" +PROGVERS="v14.0.20230921-1" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -2858,7 +2858,7 @@ function setDefaultCfgValues { if [ -z "$LDPMAHU" ] ; then LDPMAHU="0"; fi if [ -z "$MAHUVAR" ] ; then MAHUVAR="0"; fi if [ -z "$USEMANGOHUDSTLCFG" ] ; then USEMANGOHUDSTLCFG="0"; fi - if [ -z "$ENABLE_VKBASALT" ] ; then ENABLE_VKBASALT="0"; fi + if [ -z "$VULKANPOSTPROCESSOR" ] ; then VULKANPOSTPROCESSOR="$NON"; fi if [ -z "$RUN_NYRNA" ] ; then RUN_NYRNA="0"; fi if [ -z "$RUN_REPLAY" ] ; then RUN_REPLAY="0"; fi if [ -z "$RUN_X64DBG" ] ; then RUN_X64DBG="0"; fi @@ -3411,8 +3411,8 @@ function saveCfg { echo "MAHUVAR=\"$MAHUVAR\"" echo "## $DESC_USEMANGOHUDSTLCFG" echo "USEMANGOHUDSTLCFG=\"$USEMANGOHUDSTLCFG\"" - echo "## $DESC_ENABLE_VKBASALT" - echo "ENABLE_VKBASALT=\"$ENABLE_VKBASALT\"" + echo "## $DESC_VULKANPOSTPROCESSOR" + echo "VULKANPOSTPROCESSOR=\"$VULKANPOSTPROCESSOR\"" echo "## $DESC_RUN_NYRNA" echo "RUN_NYRNA=\"$RUN_NYRNA\"" echo "## $DESC_RUN_REPLAY" @@ -5327,8 +5327,8 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_RESHADE_DEPTH3D!$DESC_RESHADE_DEPTH3D ('RESHADE_DEPTH3D')":CHK "${RESHADE_DEPTH3D/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_DLSHADER!$DESC_DLSHADER ('DLSHADER')":CHK "${DLSHADER/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GLOBAL` \ --field=" $GUI_CHOOSESHADERS!$DESC_CHOOSESHADERS ('CHOOSESHADERS')":CHK "${CHOOSESHADERS/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GAME` \ ---field=" $GUI_ENABLE_VKBASALT!$DESC_ENABLE_VKBASALT ('ENABLE_VKBASALT')":CHK "${ENABLE_VKBASALT/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_SBSRS!$DESC_SBSRS ('SBSRS')":CHK "${SBSRS/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#SUB_ReShade` `#MENU_GAME` \ +--field=" $GUI_VULKANPOSTPROCESSOR!$DESC_VULKANPOSTPROCESSOR ('VULKANPOSTPROCESSOR')":CB "$( cleanDropDown "${VULKANPOSTPROCESSOR/#-/ -}" "$NON!vkBasalt" )" `#CAT_Shader` `#MENU_GAME` \ --field="$(spanFont "$PROGNAME $GUI_PATHS" "H")":LBL "SKIP" `#CAT_Paths` `#HEAD_Stl` `#MENU_GLOBAL` \ --field=" $GUI_GLOBALCOLLECTIONDIR!$DESC_GLOBALCOLLECTIONDIR ('GLOBALCOLLECTIONDIR')":DIR "${GLOBALCOLLECTIONDIR/#-/ -}" `#CAT_Paths` `#SUB_Directories` `#MENU_GLOBAL` \ --field=" $GUI_GLOBALMISCDIR!$DESC_GLOBALMISCDIR ('GLOBALMISCDIR')":DIR "${GLOBALMISCDIR/#-/ -}" `#CAT_Paths` `#SUB_Directories` `#MENU_GLOBAL` \ @@ -11287,6 +11287,17 @@ function setOPCustPath { fi } +# Build a string like 'export ENABLE_VKBASALT=1' and evaluate that string as code +# Allows us to more flexibly enable vkBasalt forks in future like vkShade +function setVulkanPostProcessor { + if [ ! "$VULKANPOSTPROCESSOR" = "$NON" ]; then + VULKANPOSTPROCESSOREXPORTVAR="ENABLE_${VULKANPOSTPROCESSOR^^}" + + writelog "INFO" "${FUNCNAME[0]} - Enabling Vulkan Post-Processor '$VULKANPOSTPROCESSOR' with environment with '$VULKANPOSTPROCESSOREXPORTVAR'" + eval "export ${VULKANPOSTPROCESSOREXPORTVAR}=1" + fi +} + function setCommandLaunchVars { if [ "$USEGAMEMODERUN" -eq 1 ]; then GMR="$(command -v "$GAMEMODERUN")" @@ -11349,6 +11360,8 @@ function setCommandLaunchVars { writelog "INFO" "${FUNCNAME[0]} - STLRADV_PFTST is not empty or none - Exporting RADV_PERFTEST=$STLRAD_PFTST" export RADV_PERFTEST=$STLRAD_PFTST fi + + setVulkanPostProcessor } # Used to create the launch command for games and custom commands so they can use various program functions i.e. GameScope @@ -17245,14 +17258,16 @@ function prepareProton { export RUNSBSVR=1 export RESHADE_DEPTH3D=1 export USERESHADE=1 - export ENABLE_VKBASALT=0 + + setVulkanPostProcessor fi if [ "$SBSRS" -eq 1 ]; then writelog "INFO" "${FUNCNAME[0]} - $PROGNAME - SBSRS enabled - starting game in SBS using ${RESH}" export RESHADE_DEPTH3D=1 export USERESHADE=1 - export ENABLE_VKBASALT=0 + + setVulkanPostProcessor fi else writelog "SKIP" "${FUNCNAME[0]} - No Proton game"