Commit 4cb08424 authored by Tk-Glitch's avatar Tk-Glitch

proton-tkg: Don't include d3d10 and d3d10_1 DXVK dlls when using a Wine 5.3 base or newer

See https://github.com/doitsujin/dxvk/releases/tag/v1.6
parent 184c7805
......@@ -377,6 +377,13 @@ else
rm -f dxvk-*.tar.*
mv "$_nowhere"/dxvk-* "$_nowhere"/dxvk
fi
# Remove d3d10.dll and d3d10_1.dll when using a 5.3 base or newer - https://github.com/doitsujin/dxvk/releases/tag/v1.6
if [ "$_dxvk_minimald3d10" == "true" ]; then
rm dxvk/x64/d3d10.dll
rm dxvk/x64/d3d10_1.dll
rm dxvk/x32/d3d10.dll
rm dxvk/x32/d3d10_1.dll
fi
cp -v dxvk/x64/* proton_dist_tmp/lib64/wine/dxvk/
cp -v dxvk/x32/* proton_dist_tmp/lib/wine/dxvk/
fi
......@@ -409,6 +416,13 @@ else
cd "$_nowhere"
fi
# Patch our proton script to handle minimal d3d10 implementation for dxvk on Wine 5.3+
if [ "$_dxvk_minimald3d10" == "true" ]; then
cd "$_nowhere/proton_tkg_$_protontkg_version"
patch -Np1 < "$_nowhere/proton_template/dxvk_minimald3d10.patch" && rm -f proton.orig
cd "$_nowhere"
fi
# Patch our makepkg version of the proton script to not create default prefix and use /tmp/dist.lock
if [ "$_ispkgbuild" == "true" ]; then
cd "$_nowhere/proton_tkg_$_protontkg_version"
......
From 1b6e416742d381d786c88603046a93feec261808 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sun, 22 Mar 2020 02:08:35 +0100
Subject: Remove d3d10 and d3d10_1 for dxvk 1.6 and wine 5.3+
diff --git a/proton b/proton
index be3586d..2d8a659 100755
--- a/proton
+++ b/proton
@@ -333,7 +333,7 @@ class CompatData:
os.remove(dstfile)
try_copy(steamdir + "/legacycompat/" + f, dstfile)
- dxvkfiles = ("d3d11", "d3d10", "d3d10core", "d3d10_1")
+ dxvkfiles = ("d3d11", "d3d10core")
def make_dxvk_links(dll_dir, link_dir):
for f in dxvkfiles:
dst = link_dir + "/" + f + ".dll"
......@@ -45,6 +45,9 @@ _exit_cleanup() {
echo "_steamvr_support='${_steamvr_support}'" >> "$_proton_tkg_path"/proton_tkg_token
echo "_NUKR='${_NUKR}'" >> "$_proton_tkg_path"/proton_tkg_token
echo "_winesrcdir='${_winesrcdir}'" >> "$_proton_tkg_path"/proton_tkg_token
if $(cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 1e478b804f72a9b5122fc6adafac5479b816885e HEAD); then
echo "_dxvk_minimald3d10='true'" >> "$_proton_tkg_path"/proton_tkg_token
fi
fi
rm -f "$_where"/BIG_UGLY_FROGMINER && msg2 'Removed BIG_UGLY_FROGMINER - Ribbit' # state tracker end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment