diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b880fbdc..aed3cfd5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3512,8 +3512,8 @@ start_portwine () { fi # install/remove new optiscaler - FAKE_DLSS_3_PATH="$PW_PLUGINS_PATH/fake_dlss/optiscaler-$PW_FAKE_DLSS_3_VER" - FAKE_DLSS_3_FILES="dxgi.dll amd_fidelityfx_dx12.dll amd_fidelityfx_vk.dll libxess.dll \ + OPTISCALER_PATH="$PW_PLUGINS_PATH/fake_dlss/optiscaler-$PW_OPTISCALER_VER" + OPTISCALER_FILES="dxgi.dll amd_fidelityfx_dx12.dll amd_fidelityfx_vk.dll libxess.dll \ libxess_dx11.dll dlssg_to_fsr3_amd_is_better.dll fakenvapi.ini \ OptiScaler.ini dxvk.conf" ORIGINAL_GAME_DLLS="amd_fidelityfx_dx12.dll amd_fidelityfx_vk.dll libxess.dll nvapi64.dll" @@ -3521,7 +3521,7 @@ start_portwine () { if [[ "${PW_USE_OPTISCALER}" != "1" ]] \ && [[ -f "$PATH_TO_GAME/dlssg_to_fsr3_amd_is_better.dll" ]] then - for dll in $FAKE_DLSS_3_FILES ; do + for dll in $OPTISCALER_FILES ; do try_remove_file "$PATH_TO_GAME/$dll" done for dll in $ORIGINAL_GAME_DLLS ; do @@ -3532,13 +3532,13 @@ start_portwine () { fi if [[ "${PW_USE_OPTISCALER}" == "1" ]] ; then - if [[ ! -d "$FAKE_DLSS_3_PATH" ]] ; then - if try_download "github.com/Castro-Fidel/vulkan/releases/download/optiscaler-$PW_FAKE_DLSS_3_VER/optiscaler-$PW_FAKE_DLSS_3_VER.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_FAKE_DLSS_3_VER.tar.xz" ; then - if ! unpack "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_FAKE_DLSS_3_VER.tar.xz" "$PW_PLUGINS_PATH/fake_dlss/" - then try_remove_dir "$FAKE_DLSS_3_PATH" + if [[ ! -d "$OPTISCALER_PATH" ]] ; then + if try_download "github.com/Castro-Fidel/vulkan/releases/download/optiscaler-$PW_OPTISCALER_VER/optiscaler-$PW_OPTISCALER_VER.tar.xz" \ + "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_OPTISCALER_VER.tar.xz" ; then + if ! unpack "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_OPTISCALER_VER.tar.xz" "$PW_PLUGINS_PATH/fake_dlss/" + then try_remove_dir "$OPTISCALER_PATH" fi - try_remove_file "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_FAKE_DLSS_3_VER.tar.xz" + try_remove_file "${PORT_WINE_PATH}/data/tmp/optiscaler-$PW_OPTISCALER_VER.tar.xz" fi fi @@ -3558,8 +3558,8 @@ start_portwine () { mv -f "$PATH_TO_GAME/$dll" "$PATH_TO_GAME/${dll}.b" 2>/dev/null fi done - for dll in $FAKE_DLSS_3_FILES ; do - try_force_link_file "$FAKE_DLSS_3_PATH/$dll" "$PATH_TO_GAME/$dll" + for dll in $OPTISCALER_FILES ; do + try_force_link_file "$OPTISCALER_PATH/$dll" "$PATH_TO_GAME/$dll" done fi for rm_dll in "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 9199f8ff..ace84b08 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -47,8 +47,7 @@ export WINEUSERNAME="steamuser" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v20" -export PW_FAKE_DLSS_VER="230506" -export PW_FAKE_DLSS_3_VER="v1" +export PW_OPTISCALER_VER="v1" export PW_GALLIUM_NINE_VER="0.10" export PW_LSFG_VK_VER="3.1-cebe5e2" ###WINE_AND_PROTON_LG###