Major changes and fixes

data_from_portwine/port_on

@@ -236,13 +236,13 @@ class CompatData:
 
             if "wined3d" in g_session.compat_config:
                 dxvkfiles = ["dxvk_config"]
-                wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9", "dxgi"]
+                wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
             else:
                 dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
                 wined3dfiles = []
 
             #if the user asked for dxvk's dxgi (dxgi=n), then copy it into place
-            if "WINEDLLOVERRIDES" in os.environ and "dxgi=n" in os.environ["WINEDLLOVERRIDES"]:
+            if "PW_DXGI_NATIVE" in os.environ and "1" in os.environ["PW_DXGI_NATIVE"]:
                 dxvkfiles.append("dxgi")
             else:
                 wined3dfiles.append("dxgi")
@@ -259,7 +259,11 @@ class CompatData:
                 try_copy(g_proton.lib_dir + "wine/dxvk/" + f + ".dll",
                         self.prefix_dir + "drive_c/windows/syswow64/" + f + ".dll")
                 g_session.dlloverrides[f] = "n"
-
+            
+            try_copy(g_proton.lib64_dir + "wine/vkd3d-proton/d3d12.dll",
+                self.prefix_dir + "drive_c/windows/system32/d3d12.dll")
+            try_copy(g_proton.lib_dir + "wine/vkd3d-proton/d3d12.dll",
+                self.prefix_dir + "drive_c/windows/syswow64/d3d12.dll")
 
 def comma_escaped(s):
     escaped = False

data_from_portwine/scripts/runlib

@@ -23,8 +23,8 @@ if [ ! -d "${config_path}" ]; then
 	mkdir -p "${config_path}"
 fi
 if [ ! -e "${config_path}/${portname}_loc" ]; then
-	SET_LANG=`zenity --title  "Install $portname" --text "Select the language\nВыберите язык" --list --radiolist \
-	--column="Set (Выбор)" --column "Language (Язык):" \
+	SET_LANG=`zenity --title  "Install $portname" --text "Select the language" --list --radiolist \
+	--column="Set" --column "Language:" \
 	TRUE "RUS" \
 	FALSE "ENG" `
 	echo "${SET_LANG}" > "${config_path}/${portname}_loc"
@@ -66,8 +66,10 @@ if [ -d "${WINELIB}" ]; then
     else
         export LD_LIBRARY_PATH="$portwine_runtime_libs_paths"
     fi
+    echo "########################"
     echo "runtime libs is enabled"
 else
+    echo "########################"
     echo "runtime libs is disabled"
 fi
 ########################################################################
@@ -142,7 +144,7 @@ export PW_NVIDIA="$(lspci | grep NVIDIA)"
 if [ -x "`which optimus-manager 2>/dev/null`" ]; then
     export check_optimus_manager=`optimus-manager --status | grep Current | cut -f 2 -d':' | sed -e 's/^[[:space:]]*//'`
 fi
-if [ ! -z $PW_NVIDIA ] && [ "${check_optimus_manager}" != "intel" ]; then
+if [ ! -z "${PW_NVIDIA}" ] && [ "${check_optimus_manager}" != "intel" ]; then
     if [ "${check_optimus_manager}" = "nvidia" ]; then
         export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
     elif [ -x "`which primusrun 2>/dev/null`" ]; then
@@ -166,8 +168,8 @@ if [ ! -z $PW_NVIDIA ] && [ "${check_optimus_manager}" != "intel" ]; then
 else
     export DRI_PRIME=1
     export vblank_mode=0
-    export MESA_GLSL_CACHE_DIR="${PATH_TO_GAME}"
-    export mesa_glthread=true
+#    export MESA_GLSL_CACHE_DIR="${PATH_TO_GAME}"
+#    export mesa_glthread=true
     export PW_AMD_ATI="$(lspci | grep AMD/ATI)" 
     if [ ! -z "${PW_AMD_ATI}" ]; then
         if [ "${PW_ACO}" = "1" ]; then
@@ -179,6 +181,7 @@ else
     fi
 fi
 export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
+echo "########################"
 ########################################################################
 export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/"
 if [ ! -d "${def_pfx}" ]; then

data_from_portwine/scripts/start

@@ -4,7 +4,7 @@
 # "${WINESERVER}" -k
 START_PORTWINE
 
-if [ ! -z $1 ]; then
+if [ ! -z "$1" ]; then
     if [ ! -z $optirun_on ]; then
         ${optirun_on} "${port_on_run}" "run" "$1"
     else

data_from_portwine/scripts/vars

@@ -21,6 +21,7 @@ export PW_NO_FSYNC=0
 export PW_NO_ESYNC=1
 export PW_FILELOCK=1
 export PW_DXVK_ASYNC=0
+export PW_DXGI_NATIVE=0
 export PW_USE_SECCOMP=0
 export PW_NO_WINEMFPLAY=1
 export PW_NVAPI_DISABLE=1

portwine_install_script/PortNAME-XX

@@ -36,8 +36,8 @@ ARCH_NAME="${setup_script}.tar.xz"
 deflink="/home/${USER}/PortWINE/${portname}"
 [ $(id -u) -eq 0 ] && echo "Do not run the script from the superuser!" && zenity --error --text "Do not run the script from the superuser!" 2> /dev/null  && exit 1
 ########################################################################
-SET_LANG=`zenity --title  "Install $portname" --text "Select the installation language \nВыберите язык установки" --list --radiolist \
---column="Set (Выбор)" --column "Language (Язык):" \
+SET_LANG=`zenity --title  "Install $portname" --text "Select the installation language" --list --radiolist \
+--column="Set" --column "Language:" \
 TRUE "Russian" \
 FALSE "English" ` 2> /dev/null  
 if [ $? -eq 1 ];then exit 1; fi