search

pythonlover02 / Proton-Sarek

Compatibility tool for Steam Play based on Wine and additional components
Other
104 stars 1 forks source link

Use the old 1.10.X branch instead of 1.10.3 stable #6

Open Blisto91 opened 1 week ago

Blisto91 commented 1 week ago

Hi there.

Back when dxvk 2.0 was in development a 1.10.x branch was kept for backports to be used in Proton 7 stable releases (with no driver requirement bump). It have a bunch more commits with fixes than 1.10.3 which never got in to a stable dxvk release so it might be worth using that here instead. The branches in the main dxvk repo got a big cleanup not long ago and so it isn't present there, but i still have it in my own if it could be of interest https://github.com/Blisto91/dxvk/tree/1.10.x

Blisto91 commented 1 week ago

Ah i missed there is already a PR that mentions it https://github.com/pythonlover02/Proton-Sarek/pull/5

pythonlover02 commented 1 week ago

Hi there.

Back when dxvk 2.0 was in development a 1.10.x branch was kept for backports to be used in Proton 7 stable releases (with no driver requirement bump). It have a bunch more commits with fixes than 1.10.3 which never got in to a stable dxvk release so it might be worth using that here instead. The branches in the main dxvk repo got a big cleanup not long ago and so it isn't present there, but i still have it in my own if it could be of interest https://github.com/Blisto91/dxvk/tree/1.10.x

Ah i missed there is already a PR that mentions it https://github.com/pythonlover02/Proton-Sarek/pull/5

First of all, no problem at all, and thank you for keeping the 1.10.x branch :)! I’ve forked it from your repo so i have a backup just in case. I’m planning to work on it during my vacation when I can really focus as i will have more time. This its because i dont know much about the code of DXVK so i’d like to take that time to learn more about the project understand how it works, do a bit of reverse engineering and hopefully backport so me fixes from the newer versions. I’ll also look into adapting the DXVK async patch to make it compatible with this branch.

Edit:

I might need a little help for compiling the 1.10.x branch... as it fails to compile. The only modification I made was to change the version in the meson.build file. Specifically, I updated the first line from: project('dxvk', ['c', 'cpp'], version : 'v1.10.3', meson_version : '>= 0.49', default_options : [ 'cpp_std=c++17' ]) to: project('dxvk', ['c', 'cpp'], version : 'v1.10.4', meson_version : '>= 0.49', default_options : [ 'cpp_std=c++17' ]) I wanted to test if there would be any issues when increasing the version. However, the error also occurs even if I don’t make any changes. Any help its appreciated, and again thx errors.txt

AmerXz commented 1 day ago

I found out that @kevinwidjaja21 has a slightly updated dxvk 1.10.x branch than @Blisto91

Kevinwidjaja21's dxvk 1.10.x last commit was made on jan 19 2023

Blisto91's dxvk 1.10.x last commit was made 1 day before kevinwidjaja21's

Also I found on DXVK-macOS fork repo made by @Gcenx has a branch called '1.10.x-old-branch' which has the same last commit as kevinwidjaja21's on top of that it has other commits made specifically for mac and most importantly it has some other commits for compiling fixes / improvements

Take this as a suggestion because I'm not an expert and I hope this would be useful

Blisto91 commented 1 day ago

@AmerXz Thank you, yea i see that my branch was 1 commit outdated compared to the original upstream one. I have picked that one in now.

@pythonlover02 I didn't see your edit before now since those don't give a Github notification. I have now included a new commit in my 1.10.x branch that fixes the compilation error. It just needed a couple of extra includes to be able to compile with gcc 13.

pythonlover02 commented 1 day ago

Thanks for the help, @Blisto91, unfortunately, I'm still encountering some issues during compilation. I downloaded the 1.10.x branch from your repo, but I ran into errors, this time near the end of the compilation process. I’ll attach the log file for reference. It compiles well for you? Maybe i am missing a dependency this time or something

On the other side, the macOS version compiled without any issues. Thanks for the info, @AmerXz

logs.txt