From 165f66fcbcad65e722ea0b50ea0c0523d57e99f4 Mon Sep 17 00:00:00 2001
From: Castro-Fidel <tergoevm@gmail.com>
Date: Sun, 24 May 2020 21:18:31 +0300
Subject: [PATCH] Fix runtime libs and add ACO function

---
 data_from_portwine/scripts/runlib     | 42 ++++++++++++++++++---------
 data_from_portwine/scripts/vars       | 29 +++++-------------
 data_from_portwine/scripts/winetricks | 11 ++++---
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index e08ad784..5318eb38 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -77,21 +77,17 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
 export PATH="${WINEDIR}/bin":${PATH}
 export WINESTART="C:\\windows\\command\\start.exe"
 export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
-#if [ -d "${PORT_WINE_PATH}/libs" ]
-#then
+if [ -d "${WINELIB}" ]
+then
     export LD_LIBRARY_PATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/usr/lib/i386-linux-gnu:${WINELIB}/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/lib/i386-linux-gnu:${WINELIB}/lib/x86_64-linux-gnu:${WINELIB}/lib:${LD_LIBRARY_PATH}"
-#else
-#    export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}"
-#fi
+    echo "runtime libs is enabled"
+else
+    export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}"
+    echo "runtime libs is disabled"
+fi
 ########################################################################
 export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}"
 export DXVK_STATE_CACHE=1
-export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" 
-export __GL_SHADER_DISK_CACHE=1
-export __GL_SHADER_DISK_CACHE_SIZE=1000000000
-export __GL_THREADED_OPTIMIZATIONS=1
-export mesa_glthread=true
-export DRI_PRIME=1
 
 export urlg="http://portwine-linux.ru/donate"
 ########################################################################
@@ -99,10 +95,30 @@ START_PORTWINE ()
 {
 "${WINESERVER}" -k
 sh "${link}"/port_update 
+export PROTON_NO_FSYNC=0
 if [ -x "`which nvidia-settings 2>/dev/null`" ]
 then
-	nvidia-settings -a [gpu:"${gpu}"]/GPUPowerMizerMode=1 > /dev/null
-	export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
+    nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1 > /dev/null
+    export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
+    export __GL_SYNC_TO_VBLANK=1
+    export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" 
+    export __GL_SHADER_DISK_CACHE=1
+    export __GL_SHADER_DISK_CACHE_SIZE=1000000000
+    export __GL_THREADED_OPTIMIZATIONS=1
+    export __NV_PRIME_RENDER_OFFLOAD=1
+    export __GLX_VENDOR_LIBRARY_NAME=nvidia
+else
+    export DRI_PRIME=1
+    export vblank_mode=1
+    export mesa_glthread=true
+    local AMD_ATI="$(lspci | grep AMD/ATI)" 
+    if [ ! -z "${AMD_ATI}" ] && [ "${PORTWINE_ACO}" -eq "1" ] 
+    then
+        export RADV_PERFTEST=aco
+        echo "ACO is enabled"
+    else
+        echo "ACO is disabled"
+    fi
 fi
 if [ "${var_dxvk_on}" -eq "1" ] 
 then
diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars
index 3363da5f..c343172f 100755
--- a/data_from_portwine/scripts/vars
+++ b/data_from_portwine/scripts/vars
@@ -9,47 +9,34 @@ export porturl="http://portwine-linux.ru/"
 export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
 export gamestart="${PATH_TO_GAME}/.exe"
 ########################################################################
-#__NV_PRIME_RENDER_OFFLOAD=1
-#__GLX_VENDOR_LIBRARY_NAME=nvidia
-#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export STAGING_SHARED_MEMORY=1
-export PROTON_FORCE_LARGE_ADDRESS_AWARE=0
+export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
+export STAGING_SHARED_MEMORY=0
+export PROTON_FORCE_LARGE_ADDRESS_AWARE=1
 export PROTON_USE_SECCOMP=0
+export PROTON_NO_ESYNC=1
 export WINEDLLOVERRIDES="winemenubuilder.exe=d"
 export WINEDEBUG="-all"
-export DXVK_LOG_LEVEL=none
-export VKD3D_DEBUG=none
 export kill_winedevice=0
 export kill_explorer=0
+export PORTWINE_ACO=0
 ########################################################################
 ADD_IN_START_PORTWINE ()
 {
 if [ "${var_dxvk_on}" -eq "0" ]
 then        ###OPENGL###
-    export launch_parameters=""
-    export vblank_mode=0
-    export __GL_SYNC_TO_VBLANK=0
     export PROTON_USE_WINED3D=1
-    export PROTON_USE_VKD3D=0
-    export PROTON_USE_D9VK=0
+    export PROTON_NO_D9VK=0
     export PROTON_NO_D3D11=0
     export PROTON_NO_D3D10=0
     export PROTON_OLD_GL_STRING=0
 else        ###DXVK###
-    export launch_parameters=""
-    export vblank_mode=1
-    export __GL_SYNC_TO_VBLANK=1
     export PROTON_USE_WINED3D=0
-    export PROTON_USE_D9VK=1
-    export PROTON_USE_VKD3D=1
+    export PROTON_NO_D9VK=0
     export PROTON_NO_D3D11=0
     export PROTON_NO_D3D10=0
-    export PROTON_OLD_GL_STRING=0
     export DXVK_ASYNC=0
-#   export RADV_PERFTEST=aco
-#   export MESA_LOADER_DRIVER_OVERRIDE=zink
 fi
-########################################################################
+export launch_parameters=""
 cd "${PATH_TO_GAME}"
 }
 ########################################################################
diff --git a/data_from_portwine/scripts/winetricks b/data_from_portwine/scripts/winetricks
index 4abb30e6..ffeb9c0f 100755
--- a/data_from_portwine/scripts/winetricks
+++ b/data_from_portwine/scripts/winetricks
@@ -15702,11 +15702,11 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata qq apps \
-    title="QQ 8.9.1(Chinese chat app)" \
+    title="QQ 8.9.6(Chinese chat app)" \
     publisher="Tencent" \
     year="2017" \
     media="download" \
-    file1="QQ8.9.1.exe" \
+    file1="QQ8.9.6.exe" \
     file2="QQ.tar.gz"\
     installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \
     homepage="https://www.qq.com/" \
@@ -15714,7 +15714,7 @@ w_metadata qq apps \
 
 load_qq()
 {
-    w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.1/20437/QQ8.9.1.exe 8e0d3ff5264da2d77e2fc011c21048edeebcf082f55f68a301f763c3a15c0d3f
+    w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.6/22404/QQ8.9.6.exe d207f49a642be21c4e1b14fc9f4cf47a6a9a2718afbc8bd0685b607b65424ef6
     w_download https://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
 
     if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
@@ -15737,7 +15737,7 @@ load_qq()
         w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps
         w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps
         # shellcheck disable=SC1001
-        echo Exec=env WINEPREFIX="$WINEPREFIX" "$WINE" "$W_PROGRAMS_X86_WIN"\/Tencent\/QQ\/bin\/QQScLauncher.exe >> "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
+        echo Exec=env WINEPREFIX="$WINEPREFIX" "$WINE" \""$W_PROGRAMS_X86_WIN"/Tencent/QQ/bin/QQScLauncher.exe\" >> "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
     fi
 
     if w_workaround_wine_bug 39657 "Disable ntoskrnl.exe to work around can't be started bug"; then
@@ -15748,6 +15748,9 @@ load_qq()
         w_override_dlls disabled txplatform.exe
     fi
 
+    # Disable update, stay on the version.
+    w_override_dlls disabled txupd.exe
+
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1"
 }