async patch fails to apply after today's rebase.

[GloriousEggroll]

Looks like more rebasing upstream was done after f1aad6c, the async patch no longer applies

[Sporif]

I updated the patch yesterday, dxvk-async.patch works with f1aad6c onwards. dxvk-async-f1aad6c.patch is the old patch.

[GloriousEggroll]

I'm saying more changes were made after that which broke it again.

Here's my patch script, only applying the async patch:

    cd dxvk
    git reset --hard HEAD
    git clean -xdf

#    echo "add valve dxvk patches"
#    patch -Np1 < ../patches/dxvk/proton-dxvk_avoid_spamming_log_with_requests_for_IWineD3D11Texture2D.patch
#    patch -Np1 < ../patches/dxvk/proton-dxvk_add_new_dxvk_config_library.patch

    # this needs to be the last patch in the list.. because reasons?
    echo "add dxvk async patch"
    patch -Np1 < ../patches/dxvk/dxvk-async.patch
    cd ..

Here's the error output:

$ grep -i fail log.txt 
Hunk #1 FAILED at 1159.
1 out of 2 hunks FAILED -- saving rejects to file src/dxvk/dxvk_context.h.rej
Hunk #1 FAILED at 62.
1 out of 4 hunks FAILED -- saving rejects to file src/dxvk/dxvk_graphics.cpp.rej
Hunk #1 FAILED at 185.
Hunk #2 FAILED at 198.
Hunk #4 FAILED at 249.
3 out of 4 hunks FAILED -- saving rejects to file src/dxvk/dxvk_graphics.h.rej
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file src/dxvk/dxvk_pipemanager.cpp.rej

Here's the latest git commit I'm using:

$ git log | head

commit 12249fd330218b693a5b5c959f9bb552cb1db6ec
Author: Georg Lehmann <dadschoorse@gmail.com>
Date:   Thu Nov 11 23:03:37 2021 +0100

    [dxso] Fix constant buffer debug names

[GloriousEggroll]

-edit-

I have no idea what happened with copy/paste, I guess I need coffee. I did a wget and now it's working fine. Sigh. Sorry for the commotion.

[tcrider@starplatinum proton-ge-custom]$ cd patches/dxvk/
[tcrider@starplatinum dxvk]$ rm dxvk-async.patch 
[tcrider@starplatinum dxvk]$ wget https://raw.githubusercontent.com/Sporif/dxvk-async/master/dxvk-async.patch
--2021-11-12 12:24:24--  https://raw.githubusercontent.com/Sporif/dxvk-async/master/dxvk-async.patch
Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.110.133, 185.199.111.133, ...
Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 16104 (16K) [text/plain]
Saving to: ‘dxvk-async.patch’

dxvk-async.patch                                                                                                       100%[===========================================================================================================================================================================================================================================================================================================================>]  15.73K  --.-KB/s    in 0s      

2021-11-12 12:24:24 (78.4 MB/s) - ‘dxvk-async.patch’ saved [16104/16104]

[tcrider@starplatinum dxvk]$ cd ../../

[tcrider@starplatinum proton-ge-custom]$ ./patches/protonprep.sh &> log.txt 
[tcrider@starplatinum proton-ge-custom]$ grep -i malf log.txt 
[tcrider@starplatinum proton-ge-custom]$ grep -i fail log.txt | grep dxvk