From 6c55a71d0ac5b96586b38ee9f58e21a06efb390e Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Sat, 23 Sep 2023 16:56:10 +0600
Subject: [PATCH] Fixed reshade

---
 data_from_portwine/Reshade/ReShade.ini      | 88 ---------------------
 data_from_portwine/scripts/functions_helper | 25 ++----
 2 files changed, 7 insertions(+), 106 deletions(-)
 delete mode 100644 data_from_portwine/Reshade/ReShade.ini

diff --git a/data_from_portwine/Reshade/ReShade.ini b/data_from_portwine/Reshade/ReShade.ini
deleted file mode 100644
index f09544b0..00000000
--- a/data_from_portwine/Reshade/ReShade.ini
+++ /dev/null
@@ -1,88 +0,0 @@
-[DEPTH]
-DepthCopyAtClearIndex=0
-DepthCopyBeforeClears=0
-UseAspectRatioHeuristics=1
-
-[GENERAL]
-EffectSearchPaths=Z:\home\barry\.local\share\reshade\ReShade_shaders\Merged\Shaders
-IntermediateCachePath=C:\users\steamuser\Temp
-NoDebugInfo=1
-NoEffectCache=0
-NoReloadOnInit=0
-NoReloadOnInitForNonVR=0
-PerformanceMode=0
-PreprocessorDefinitions=
-PresetPath=.\.\ReShadePreset.ini
-PresetShortcutKeys=
-PresetShortcutPaths=
-PresetTransitionDelay=1000
-PresetTransitionDuration=1000
-SkipLoadingDisabledEffects=0
-StartupPresetPath=
-TextureSearchPaths=Z:\home\barry\.local\share\reshade\ReShade_shaders\Merged\Textures
-
-[INPUT]
-ForceShortcutModifiers=1
-InputProcessing=2
-KeyEffects=0,0,0,0
-KeyNextPreset=0,0,0,0
-KeyOverlay=36,0,0,0
-KeyPerformanceMode=0,0,0,0
-KeyPreviousPreset=0,0,0,0
-KeyReload=0,0,0,0
-KeyScreenshot=44,0,0,0
-
-[OVERLAY]
-AutoSavePreset=1
-ClockFormat=0
-Docking=[Docking][Data],DockSpace   ID=0x7E010B79 Window=0x995B0CF8 Pos=8,,8 Size=1904,,1064 Split=X,  DockNode  ID=0x00000001 Parent=0x7E010B79 SizeRef=671,,1080 Selected=0xAF9E06C0,  DockNode  ID=0x00000002 Parent=0x7E010B79 SizeRef=1247,,1080 CentralNode=1
-FPSPosition=1
-NoFontScaling=1
-SaveWindowState=0
-ShowClock=0
-ShowForceLoadEffectsButton=1
-ShowFPS=0
-ShowFrameTime=0
-ShowPresetTransitionMessage=1
-ShowScreenshotMessage=1
-TutorialProgress=4
-VariableListHeight=300.000000
-VariableListUseTabs=0
-Window=[Window][Home],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,0,[Window][Add-ons],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,1,[Window][Settings],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,2,[Window][Statistics],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,3,[Window][Log],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,4,[Window][About],Pos=8,,8,Size=671,,1064,Collapsed=0,DockId=0x00000001,,5,[Window][###editor],Collapsed=0,DockId=0x00000002,[Window][Viewport],Pos=0,,0,Size=1920,,1080,Collapsed=0,[Window][Debug##Default],Pos=60,,60,Size=400,,400,Collapsed=0
-
-[SCREENSHOT]
-ClearAlpha=1
-FileFormat=1
-FileNaming=%AppName% %Date% %Time%
-FileNamingFormat=0
-JPEGQuality=90
-PostSaveCommand=
-PostSaveCommandArguments="%TargetPath%"
-PostSaveCommandNoWindow=0
-PostSaveCommandWorkingDirectory=.\
-SaveBeforeShot=0
-SaveOverlayShot=0
-SavePath=
-SavePresetFile=0
-SoundPath=
-
-[STYLE]
-Alpha=1.000000
-ChildRounding=0.000000
-ColFPSText=1.000000,1.000000,0.784314,1.000000
-EditorFont=
-EditorFontSize=13
-EditorStyleIndex=0
-Font=
-FontSize=13
-FPSScale=1.000000
-FrameRounding=0.000000
-GrabRounding=0.000000
-HdrOverlayBrightness=203.000000
-HdrOverlayOverwriteColorSpaceTo=0
-PopupRounding=0.000000
-ScrollbarRounding=0.000000
-StyleIndex=2
-TabRounding=4.000000
-WindowRounding=0.000000
-
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 8bb32ce1..70b04a98 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -504,26 +504,16 @@ pw_mangohud_check () {
 }
 
 pw_reshade_check () {
-    if [[ "${ENABLE_RESHADE}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then
-       
-        if [[ $(file "$portwine_exe") =~ x86-64 ]]; then
-        	portwine_exe_arch=64
-        fi
-        if [[ "$portwine_exe_arch" == "64" ]] ; then
-            export needed_dll="dxgi.dll"
-        	#export WINEDLLOVERRIDES="d3dcompiler_47=n,dxgi=n,b"
-        	ln -is "${PORT_WINE_PATH}/data/Reshade/ReShade64.dll" "${PATH_TO_GAME}/$needed_dll"
-        else
-            export needed_dll="d3d9.dll"
-        	export WINEDLLOVERRIDES="d3dcompiler_47=n,d3d9=n.b"
-        	ln -is "${PORT_WINE_PATH}/data/Reshade/ReShade32.dll" "${PATH_TO_GAME}/$needed_dll"
-        fi
+    if [[ "${ENABLE_RESHADE}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then
+        ln -is "${PORT_WINE_PATH}/data/Reshade/ReShade64.dll" "${PATH_TO_GAME}/dxgi.dll"
+        ln -is "${PORT_WINE_PATH}/data/Reshade/ReShade32.dll" "${PATH_TO_GAME}/d3d9.dll"
+        var_winedlloverride_update "d3d9,dxgi=n,b"
 
-        LINKS="ReShade32.json  ReShade64.json ReShade.ini textures reshade $needed_dll"
+        LINKS="ReShade32.json ReShade64.json Shaders Textures"
 
 	for link in $LINKS; do
-	    if [[ -L "${PATH_TO_GAME}/$link" ]] ; then
-	        unlink "${PATH_TO_GAME}/$link"
+	    if [[ ! -L "${PATH_TO_GAME}/$link" ]] ; then
+	        ln -is "${PORT_WINE_PATH}/data/Reshade/$link" "${PATH_TO_GAME}/"
 	    fi
         done
         print_info "Reshade is enabled"
@@ -535,7 +525,6 @@ pw_reshade_check () {
 	        unlink "${PATH_TO_GAME}/$link"
 	    fi
         done
-        #unset WINEDLLOVERRIDES
         print_info "Reshade is disabled"
     fi
     return 0