diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index baf9937..7d1b810 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -135,7 +135,7 @@ if [ "${var_dxvk_on}" -eq "0" ]; then elif [ "${var_dxvk_on}" -eq "1" ]; then export DXVK_HUD=0 elif [ "${var_dxvk_on}" -eq "2" ]; then - export DXVK_HUD="fps,devinfo,version" + export DXVK_HUD="fps,devinfo,version,frametimes" fi export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/" if [ ! -d "${def_pfx}" ]; then @@ -175,18 +175,6 @@ while [ $(pgrep wineserver)>'0' ]; do done } ######################################################################## -KILL9_WINEDEVICE () -{ -if [ "${kill_winedevice}" -eq "1" ]; then - sleep 10 - killall -r -s9 winedevice -fi -if [ "${kill_explorer}" -eq "1" ]; then - sleep 10 - killall -r -s9 explorer -fi -} -######################################################################## STOP_PORTWINE () { #WAIT_WINESERVER diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars index f304ef8..717e980 100755 --- a/data_from_portwine/scripts/vars +++ b/data_from_portwine/scripts/vars @@ -22,7 +22,7 @@ ADD_IN_START_PORTWINE () if [ "${var_dxvk_on}" -eq "0" ] then ###OPENGL### export PROTON_USE_WINED3D=1 - export PW_DXGI_FOR_VKD3D=0 + export PW_DXGI_FOR_VKD3D=1 export PROTON_NO_D9VK=0 export PROTON_NO_D3D11=0 export PROTON_NO_D3D10=0 diff --git a/data_from_portwine/scripts/winefile b/data_from_portwine/scripts/winefile index a428a38..40cfd4f 100755 --- a/data_from_portwine/scripts/winefile +++ b/data_from_portwine/scripts/winefile @@ -5,8 +5,8 @@ START_PORTWINE export WINEDEBUG="fixme-all" if [ ! -z ${optirun_on} ] then - ${optirun_on} "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 + ${optirun_on} "${PROTONRUN}" "run" "explorer" else - "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 + "${PROTONRUN}" "run" "explorer" fi STOP_PORTWINE diff --git a/data_from_portwine/scripts/winetricks-q-force b/data_from_portwine/scripts/winetricks-q-force index 3e331dc..6960edd 100755 --- a/data_from_portwine/scripts/winetricks-q-force +++ b/data_from_portwine/scripts/winetricks-q-force @@ -8,5 +8,5 @@ chmod +x "${link}/winetricks" sed -i '2a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${PORT_WINE_PATH}/data/wine/bin/wine" ' "${link}/winetricks" sleep 1 export WINEDEBUG="" -"/usr/bin/xterm" -e "sh ${link}/winetricks -q" +"/usr/bin/xterm" -e "sh ${link}/winetricks -q --force" STOP_PORTWINE