Add support for installing and enabling DXVK-NVAPI #2567

Etaash-mathamsetty · 2023-03-25T01:27:51Z

Things that have been properly tested:

I used nvapi-test to make sure that the dlls are installed in the prefix
downloading to tools folder (fixed)
it works with games :O

NOTE: This PR is not yet ready to be merged since we still need to copy nvngx.dll from the nvidia drivers on the host system, this relies on a separate helper binary that I have created in rust
https://github.com/Etaash-mathamsetty/nvngx-finder

Use the following Checklist if you have changed something on the Backend or Frontend:

Tested the feature and it's working on a current and clean install.
Tested the main App features and they are still working on a current and clean install. (Login, Install, Play, Uninstall, Move games, etc.)
Created / Updated Tests (If necessary)
Created / Updated documentation (If necessary)

YousofMersal · 2023-04-01T14:59:18Z

I've installed this version and tried to test it out with control.
I can't seem to get it to work.

I've used the following env variables and a lot of combination of them:

PROTON_ENABLE_NVAPI=1
DXVK_ENABLE_NVAPI=1
PROTON_HIDE_NVIDIA_GPU=0
VKD3D_FEATURE_LEVEL=12_1
VKD3D_CONFIG=dxr11
PROTON_CONFIG=dxr12
WINEDLLOVERRIDES=dxgi,nvapi,nvapi64=n

nvpai64.dll seems to correctly be in system32 of the prefix and nvapi.dll in syswow64 folder

EDIT: Running the nvapi64-tests.exe prefix belonging to the game with i get 63 passes but 1 fail for the assertions being the following:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nvapi64-tests.exe is a Catch2 v3.3.1 host application.
Run with -? for options

-------------------------------------------------------------------------------
Sysinfo methods succeed against local system
-------------------------------------------------------------------------------
../../../tests/nvapi_system.cpp:78
...............................................................................

../../../tests/nvapi_system.cpp:159: FAILED:
  REQUIRE( nvAPI_GetInterfaceVersionString(desc) == NVAPI_OK )
with expansion:
  -1 == 0

===============================================================================
test cases:  1 |  0 passed | 1 failed
assertions: 64 | 63 passed | 1 failed

Etaash-mathamsetty · 2023-04-01T21:00:17Z

I've installed this version and tried to test it out with control.
I can't seem to get it to work.

I've used the following env variables and a lot of combination of them:

PROTON_ENABLE_NVAPI=1
DXVK_ENABLE_NVAPI=1
PROTON_HIDE_NVIDIA_GPU=0
VKD3D_FEATURE_LEVEL=12_1
VKD3D_CONFIG=dxr11
PROTON_CONFIG=dxr12
WINEDLLOVERRIDES=dxgi,nvapi,nvapi64=n

nvpai64.dll seems to correctly be in system32 of the prefix and nvapi.dll in syswow64 folder

EDIT: Running the nvapi64-tests.exe prefix belonging to the game with i get 63 passes but 1 fail for the assertions being the following:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nvapi64-tests.exe is a Catch2 v3.3.1 host application.
Run with -? for options

-------------------------------------------------------------------------------
Sysinfo methods succeed against local system
-------------------------------------------------------------------------------
../../../tests/nvapi_system.cpp:78
...............................................................................

../../../tests/nvapi_system.cpp:159: FAILED:
  REQUIRE( nvAPI_GetInterfaceVersionString(desc) == NVAPI_OK )
with expansion:
  -1 == 0

===============================================================================
test cases:  1 |  0 passed | 1 failed
assertions: 64 | 63 passed | 1 failed

Strange because it works for me with AMD
Remove all those other junk env variables, I think they are causing the issue
Heroic handles it now

If nvapi is actually working you should get at least above 500 passes

YousofMersal · 2023-04-01T21:07:50Z

I first tried it without the env variables. I only added then in an attempt to make it work.

Etaash-mathamsetty · 2023-04-02T00:18:03Z

I first tried it without the env variables. I only added then in an attempt to make it work.

did you make sure DXVK is installed?
are you using proton or wine?

YousofMersal · 2023-04-02T00:31:47Z

did you make sure DXVK is installed? are you using proton or wine?

DXVK is installed and working.
Wine-GE-Proton7-41

Etaash-mathamsetty · 2023-04-02T00:40:19Z

did you make sure DXVK is installed? are you using proton or wine?

DXVK is installed and working. Wine-GE-Proton7-41

run winecfg, does it show nvapi64 as native?

YousofMersal · 2023-04-02T00:55:48Z

run winecfg, does it show nvapi64 as native?

nvapi64 is not listed as an existing override for the default settings (for this prefix)

Etaash-mathamsetty · 2023-04-02T01:05:34Z

run winecfg, does it show nvapi64 as native?

nvapi64 is not listed as an existing override for the default settings (for this prefix)

strange, that part works fine for me, could you see what happens if you set it to native yourself?

YousofMersal · 2023-04-02T01:14:57Z

run winecfg, does it show nvapi64 as native?

nvapi64 is not listed as an existing override for the default settings (for this prefix)

strange, that part works fine for me, could you see what happens if you set it to native yourself?

added nvapi64 as native to the overrides, nothing changes. Also tried to add nvapi as native afterwards still nothing.

And just double checked that dxgi is already set as native

EDIT: it did change nvapi-tests.exe output

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nvapi64-tests.exe is a Catch2 v3.3.1 host application.
Run with -? for options

-------------------------------------------------------------------------------
Sysinfo methods succeed against local system
-------------------------------------------------------------------------------
../../../tests/nvapi_system.cpp:78
...............................................................................

../../../tests/nvapi_system.cpp:81: FAILED:
  REQUIRE( nvapiModule )
with expansion:
  nullptr

===============================================================================
test cases: 1 | 1 failed
assertions: 1 | 1 failed

Etaash-mathamsetty · 2023-04-02T01:31:40Z

run winecfg, does it show nvapi64 as native?

nvapi64 is not listed as an existing override for the default settings (for this prefix)

strange, that part works fine for me, could you see what happens if you set it to native yourself?

added nvapi64 as native to the overrides, nothing changes. Also tried to add nvapi as native afterwards still nothing.

And just double checked that dxgi is already set as native

EDIT: it did change nvapi-tests.exe output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nvapi64-tests.exe is a Catch2 v3.3.1 host application.
Run with -? for options

-------------------------------------------------------------------------------
Sysinfo methods succeed against local system
-------------------------------------------------------------------------------
../../../tests/nvapi_system.cpp:78
...............................................................................

../../../tests/nvapi_system.cpp:81: FAILED:
  REQUIRE( nvapiModule )
with expansion:
  nullptr

===============================================================================
test cases: 1 | 1 failed
assertions: 1 | 1 failed

this means that nvapi64 didn't install correctly and it's still using the builtin one to whatever wine version you are using

YousofMersal · 2023-04-02T01:35:01Z

added nvapi64 as native to the overrides, nothing changes. Also tried to add nvapi as native afterwards still nothing.
And just double checked that dxgi is already set as native
EDIT: it did change nvapi-tests.exe output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nvapi64-tests.exe is a Catch2 v3.3.1 host application.
Run with -? for options

-------------------------------------------------------------------------------
Sysinfo methods succeed against local system
-------------------------------------------------------------------------------
../../../tests/nvapi_system.cpp:78
...............................................................................

../../../tests/nvapi_system.cpp:81: FAILED:
  REQUIRE( nvapiModule )
with expansion:
  nullptr

===============================================================================
test cases: 1 | 1 failed
assertions: 1 | 1 failed
this means that nvapi64 didn't install correctly and it's still using the builtin one to whatever wine version you are using

Yeah i realised the same thing, i then tried downloading dxvk-nvapi directly from the repo and replace the files in system32 and syswow64 manually and now the same tests all pass

Etaash-mathamsetty · 2023-04-02T01:35:46Z

what is inside /home/$USER/.config/heroic/tools/dxvk-nvapi/ for you?

YousofMersal · 2023-04-02T01:39:24Z

what is inside /home/$USER/.config/heroic/tools/dxvk-nvapi/ for you?

Seems to be the exact same thing i downloaded from the repo

Etaash-mathamsetty · 2023-04-02T01:39:55Z

what is inside /home/$USER/.config/heroic/tools/dxvk-nvapi/ for you?

Seems to be the exact same thing i downloaded from the repo

just tell me the file/folder names inside

YousofMersal · 2023-04-02T01:40:53Z

what is inside /home/$USER/.config/heroic/tools/dxvk-nvapi/ for you?

Seems to be the exact same thing i downloaded from the repo

just tell me the file/folder names inside

4.0K   ┌── LICENSE
4.0K   ├── latest_dxvk-nvapi
 12K   ├── README.md
1.7M   │ ┌── nvapi.dll
1.7M   ├─┴ x32
1.4M   │ ┌── nvapi64.dll
4.7M   │ ├── nvapi64-tests.exe
6.1M   ├─┴ x64
7.8M ┌─┴ dxvk-nvapi

Etaash-mathamsetty · 2023-04-02T01:41:25Z

what is inside /home/$USER/.config/heroic/tools/dxvk-nvapi/ for you?

Seems to be the exact same thing i downloaded from the repo

just tell me the file/folder names inside
4.0K   ┌── LICENSE
4.0K   ├── latest_dxvk-nvapi
 12K   ├── README.md
1.7M   │ ┌── nvapi.dll
1.7M   ├─┴ x32
1.4M   │ ┌── nvapi64.dll
4.7M   │ ├── nvapi64-tests.exe
6.1M   ├─┴ x64
7.8M ┌─┴ dxvk-nvapi

yeah that's what I suspected, it's being extracted wrong, thanks
path should be dxvk-nvapi/dxvk-nvapi-v0.6.2/x64,x32,etc

Etaash-mathamsetty · 2023-08-07T03:51:04Z

ok made some fixes could you send both the heroic log and the game log once you retest?

AllyTheProtogen · 2023-08-07T20:29:46Z

Alright, just tested both games again and DLSS still doesn't work for either. I deleted the prefixes for both of the games to make wine regenerate them with NVAPI, but this also did nothing, leading to Control still having it's DLSS option blocked. I did manage to get Horizon ZD working because I didn't have mfc140 installed on the prefix but DLSS didn't show up in there either.
1209025141-lastPlay.log
heroic-2023-08-07T20_13_28.668Z.log
2049187585-lastPlay.log

Etaash-mathamsetty · 2023-08-07T22:06:38Z

Alright, just tested both games again and DLSS still doesn't work for either. I deleted the prefixes for both of the games to make wine regenerate them with NVAPI, but this also did nothing, leading to Control still having it's DLSS option blocked. I did manage to get Horizon ZD working because I didn't have mfc140 installed on the prefix but DLSS didn't show up in there either. 1209025141-lastPlay.log heroic-2023-08-07T20_13_28.668Z.log 2049187585-lastPlay.log

do you have the nvidia drivers properly installed in flatpak? also could you retest the proper logging wasn't in place when nvngx.dll (the dll with dlss) is not found

it would also be nice if you could find the path of nvngx.dll in flatpak for me :)

imLinguin · 2023-08-07T22:08:04Z

I tested with Horizon just now and I seem to be able to select DLSS in game settings just fine

Etaash-mathamsetty · 2023-08-07T22:08:43Z

I tested with Horizon just now and I seem to be able to select DLSS in game settings just fine

with flatpak?

imLinguin · 2023-08-07T22:09:16Z

no, AppImage

Etaash-mathamsetty · 2023-08-07T22:10:23Z

I specifically wanted flatpak tested since paths would be different, and maybe LD_LIBRARY_PATH is not set properly in there

Etaash-mathamsetty · 2023-08-07T22:27:46Z

I can't get it to show up in the flatpak filesystem since I am on AMD unfortunately

AllyTheProtogen · 2023-08-08T04:28:03Z

do you have the nvidia drivers properly installed in flatpak? also could you retest the proper logging wasn't in place when nvngx.dll (the dll with dlss) is not found

it would also be nice if you could find the path of nvngx.dll in flatpak for me :)

afaik, I do have the drivers installed correctly because whenever I install flatpak for the first time on a new linux install, it says it's downloading Nvidia drivers.

I did manage to find nvngx.dll in (what I assume is) flatpaks global install. Here is the path: /var/lib/flatpak/runtime/org.freedesktop.Platform.GL.nvidia-535-86-05/x86_64/1.4/active/files/extra/nvidia/wine/nvngx.dll

I also retested with the new build that has Heroic reporting if it cannot find nvngx.dll (which it's sadly reporting) with both Control and HZD and the logs are provided.

Again, I hope this helps!
heroic-2023-08-08T04_13_10.730Z.log
1209025141-lastPlay.log
2049187585-lastPlay.log

Etaash-mathamsetty · 2023-08-08T16:44:37Z

/var/lib/flatpak/runtime/org.freedesktop.Platform.GL.nvidia-535-86-05/x86_64/1.4/active/files/extra/nvidia/wine/nvngx.dll

unfortnuately heroic cannot access that path (as far as I know) it would be nice if you could flatpak run --command=/bin/bash com.heroicgameslauncher.hgl and figure out where the .so file is in the flatpak's filesystem using the bash prompt this command returns (probably by using the find command)

it would also be helpful if you could find where libGLX_nvidia.so.0 is as well

imLinguin · 2023-08-08T16:50:35Z

@Etaash-mathamsetty /usr/lib/x86_64-linux-gnu/GL/nvidia-535-86-05/extra/nvidia/wine/nvngx.dll
I feel like this is the place where proper nvngx finder would be helpful

Etaash-mathamsetty · 2023-08-08T16:56:30Z

@Etaash-mathamsetty /usr/lib/x86_64-linux-gnu/GL/nvidia-535-86-05/extra/nvidia/wine/nvngx.dll I feel like this is the place where proper nvngx finder would be helpful

yep, flatpak uses ld.so to set the paths and stuff, that's why lutris uses dlopen, but it's kinda overkill to have a binary for this one function, I will add this path in... wait it's going to change with driver versions...

is that the only path with nvidia-xxx-xx-xx

imLinguin · 2023-08-08T16:57:53Z

Yes, the version is dynamic, that's why dlopen is a solution. We can add it into vulkan-helper cli I guess

Etaash-mathamsetty · 2023-08-08T16:58:10Z

Yes, the version is dynamic, that's why dlopen is a solution. We can add it into vulkan-helper cli I guess

lgtm to me

Etaash-mathamsetty · 2023-08-08T21:17:03Z

new stuff is ready to be tested once more :)

AllyTheProtogen · 2023-08-08T22:21:54Z

I just tested the build and and DLSS works! It shows up in both games and improves performance like it's supposed to! I searched for libGLX_nvidia.so.0, and found it in multiple places. And turns out it's the same way for nvngx.dll. Since I don't know what directory you're specifically looking for, I'll send screenshots of Nautilus' search results. If you'd prefer to have the directories and not the screenshots, I'll type them out but for the time being, this just makes things a bit easier. Sorry if the screenshots make things take longer.
heroic-2023-08-08T19_04_08.258Z.log
2049187585-lastPlay.log
1209025141-lastPlay.log

flavioislima

Looks good. Left some small questions and also need to test it and also test on macOS since there were some changes on the dxvk installation in general. But the code looks good 👍

.github/workflows/flatpak-build.yml

src/backend/config.ts

imLinguin

looks good, small translation thing

src/frontend/screens/Settings/components/AutoDXVKNVAPI.tsx

Etaash-mathamsetty added 4 commits March 24, 2023 21:24

initial implementation of dxvk-nvapi installation

ae40ebd

Update translation.json

13fbf05

bugfix

94162ae

remove duplicate code

ccc8a41

Etaash-mathamsetty mentioned this pull request Mar 29, 2023

Add option to enable DXVK NVAPI/DLSS #699

Closed

flavioislima requested review from a team, arielj, flavioislima, CommandMC, Nocccer, imLinguin and redromnon and removed request for a team March 31, 2023 20:08

flavioislima added the pr:ready-for-review Feature-complete, ready for the grind! :P label Mar 31, 2023

log when nvngx.dll is not found

590ddea

Update AutoDXVKNVAPI.tsx

a81cc88

Etaash-mathamsetty added 4 commits August 8, 2023 14:29

fix flatpak nvapi

42502bb

Update index.ts

f14ffcd

Merge remote-tracking branch 'upstream/main' into dxvk-nvapi

c9cd515

Update vulkan-helper

6c19108

flavioislima approved these changes Aug 10, 2023

View reviewed changes

.github/workflows/flatpak-build.yml Outdated Show resolved Hide resolved

src/backend/config.ts Show resolved Hide resolved

Etaash-mathamsetty added 2 commits August 9, 2023 20:39

Update flatpak-build.yml

50d8ec3

Merge remote-tracking branch 'upstream/main' into dxvk-nvapi

22c6ecc

imLinguin approved these changes Aug 10, 2023

View reviewed changes

src/frontend/screens/Settings/components/AutoDXVKNVAPI.tsx Outdated Show resolved Hide resolved

fix translation

3575ae9

imLinguin added pr:ready-to-merge This PR is fully ready for merge. and removed pr:wip WIP, don't merge. labels Aug 11, 2023

imLinguin merged commit 6fe831c into Heroic-Games-Launcher:main Aug 24, 2023
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for installing and enabling DXVK-NVAPI #2567

Add support for installing and enabling DXVK-NVAPI #2567

Etaash-mathamsetty commented Mar 25, 2023 •

edited

Loading

YousofMersal commented Apr 1, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 1, 2023 •

edited

Loading

YousofMersal commented Apr 1, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023 •

edited

Loading

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 7, 2023

AllyTheProtogen commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023 •

edited

Loading

imLinguin commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

imLinguin commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

AllyTheProtogen commented Aug 8, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading

imLinguin commented Aug 8, 2023

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading

imLinguin commented Aug 8, 2023

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 8, 2023

AllyTheProtogen commented Aug 8, 2023

flavioislima left a comment

imLinguin left a comment

Add support for installing and enabling DXVK-NVAPI #2567

Add support for installing and enabling DXVK-NVAPI #2567

Conversation

Etaash-mathamsetty commented Mar 25, 2023 • edited Loading

YousofMersal commented Apr 1, 2023 • edited Loading

Etaash-mathamsetty commented Apr 1, 2023 • edited Loading

YousofMersal commented Apr 1, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023 • edited Loading

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023 • edited Loading

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023 • edited Loading

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023

YousofMersal commented Apr 2, 2023

Etaash-mathamsetty commented Apr 2, 2023 • edited Loading

Etaash-mathamsetty commented Aug 7, 2023

AllyTheProtogen commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023 • edited Loading

imLinguin commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

imLinguin commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

Etaash-mathamsetty commented Aug 7, 2023

AllyTheProtogen commented Aug 8, 2023 • edited Loading

Etaash-mathamsetty commented Aug 8, 2023 • edited Loading

imLinguin commented Aug 8, 2023

Etaash-mathamsetty commented Aug 8, 2023 • edited Loading

imLinguin commented Aug 8, 2023

Etaash-mathamsetty commented Aug 8, 2023 • edited Loading

Etaash-mathamsetty commented Aug 8, 2023

AllyTheProtogen commented Aug 8, 2023

flavioislima left a comment

Choose a reason for hiding this comment

imLinguin left a comment

Choose a reason for hiding this comment

Etaash-mathamsetty commented Mar 25, 2023 •

edited

Loading

YousofMersal commented Apr 1, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 1, 2023 •

edited

Loading

YousofMersal commented Apr 2, 2023 •

edited

Loading

YousofMersal commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Apr 2, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 7, 2023 •

edited

Loading

AllyTheProtogen commented Aug 8, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading

Etaash-mathamsetty commented Aug 8, 2023 •

edited

Loading