Add support for Reflex #147

esullivan-nvidia · 2023-10-14T07:06:56Z

The intent of this PR is to enable Reflex for all D3D11, and D3D12 titles using dxvk-nvapi. It does this through a new device interface called ID3DLowLatencyDevice, which will be exposed from vkd3d-proton, and dxvk.

To provide compatibility with LatencyFleX this change will only use the ID3DLowLatencyDevice interface when LatencyFleX is not detected.

Saancreed

I have a few minor suggestions, see the comments. For now, tests can be fixed using a patch like this:

diff --git a/tests/nvapi_d3d.cpp b/tests/nvapi_d3d.cpp
index 2b32d69..a3d59e4 100644
--- a/tests/nvapi_d3d.cpp
+++ b/tests/nvapi_d3d.cpp
@@ -121,6 +121,9 @@ TEST_CASE("D3D Reflex/LatencyFleX depending methods succeed", "[.d3d]") {
 
     auto e = ConfigureDefaultTestEnvironment(*dxgiFactory, *vulkan, *nvml, *lfx, adapter, output);
 
+    ALLOW_CALL(unknown, QueryInterface(ID3DLowLatencyDevice::guid, _))
+        .RETURN(E_NOINTERFACE);
+
     ALLOW_CALL(*lfx, IsAvailable())
         .RETURN(false);
 
@@ -223,17 +226,17 @@ TEST_CASE("D3D Reflex/LatencyFleX depending methods succeed", "[.d3d]") {
         SECTION("Sleep returns NoImplementation") {
             REQUIRE(NvAPI_D3D_Sleep(&unknown) == NVAPI_NO_IMPLEMENTATION);
         }
-    }
 
-    SECTION("GetLatency returns no-implementation") {
-        NV_LATENCY_RESULT_PARAMS params;
-        params.version = NV_LATENCY_RESULT_PARAMS_VER;
-        REQUIRE(NvAPI_D3D_GetLatency(&unknown, &params) == NVAPI_NO_IMPLEMENTATION);
-    }
+        SECTION("GetLatency returns no-implementation") {
+            NV_LATENCY_RESULT_PARAMS params;
+            params.version = NV_LATENCY_RESULT_PARAMS_VER;
+            REQUIRE(NvAPI_D3D_GetLatency(&unknown, &params) == NVAPI_NO_IMPLEMENTATION);
+        }
 
-    SECTION("SetLatencyMarker returns no-implementation") {
-        NV_LATENCY_MARKER_PARAMS params;
-        params.version = NV_LATENCY_MARKER_PARAMS_VER;
-        REQUIRE(NvAPI_D3D_SetLatencyMarker(&unknown, &params) == NVAPI_NO_IMPLEMENTATION);
+        SECTION("SetLatencyMarker returns no-implementation") {
+            NV_LATENCY_MARKER_PARAMS params;
+            params.version = NV_LATENCY_MARKER_PARAMS_VER;
+            REQUIRE(NvAPI_D3D_SetLatencyMarker(&unknown, &params) == NVAPI_NO_IMPLEMENTATION);
+        }
     }
 }
diff --git a/tests/nvapi_tests_private.h b/tests/nvapi_tests_private.h
index e126e61..ff1856a 100644
--- a/tests/nvapi_tests_private.h
+++ b/tests/nvapi_tests_private.h
@@ -2,6 +2,7 @@
 
 #include "../src/nvapi_private.h"
 #include "../src/nvapi_globals.h"
+#include "../src/d3d/nvapi_d3d_low_latency_device.h"
 #include "../src/d3d11/nvapi_d3d11_device.h"
 #include "../src/d3d12/nvapi_d3d12_device.h"
 #include "../inc/catch_amalgamated.hpp"

Having new tests for covering case where VK_NV_ll2 is supported would be nice but perhaps Jens will be okay with us writing them later 🙂

src/nvapi_d3d.cpp

Saancreed · 2023-10-14T23:07:04Z

src/vkd3d-proton/vkd3d-proton_interfaces.h

@@ -29,7 +29,13 @@

 enum D3D12_VK_EXTENSION : uint32_t {
    D3D12_VK_NVX_BINARY_IMPORT = 0x1,
-    D3D12_VK_NVX_IMAGE_VIEW_HANDLE = 0x2
+    D3D12_VK_NVX_IMAGE_VIEW_HANDLE = 0x2,
+    D3D12_VK_NV_LOW_LATENCY_2 = 0x3


This seems to be both unused and unnecessary, seeing as we can already query extension support via ID3DLowLatencyDevice::SupportsLowLatency. But I guess the validity of this comment depends on whether maintainers of DXVK and vkd3d-proton agree that ID3DLowLatencyDevice::SupportsLowLatency is the way to go.

I only added this to have a complete list of supported NV extensions. Agreed that it isn't necessary though. I will wait for the vkd3d-proton feedback before removing it though.

jp7677

Thanks a lot for this PR, very cool! See my and Saancreed's comments for some smaller nits and suggestions. Overall this fits nicely into the existing code base.
Regarding the test suite, it would of course be cool if you could add representative tests. That said the testing setup is not that accessible with all the mocking and probably requires a deep dive. If your time is limited, I'm fine if you just follow Saancreed's suggestion to make CI happy and we will take care of the tests afterwards.

src/d3d/nvapi_d3d_instance.cpp

src/nvapi_d3d.cpp

src/d3d/nvapi_d3d_low_latency_device.h

src/d3d/nvapi_d3d_low_latency_device.cpp

src/nvapi_d3d.cpp

src/d3d/nvapi_d3d_instance.h

adamnv · 2023-10-17T21:12:03Z

Support for the low-latency extensions just got released in the 545.23.06 NVIDIA driver so this is usable/testable now. (Propagating this note to all three project PRs, apologies for any duplication! 😸 )

src/nvapi_d3d.cpp

esullivan-nvidia · 2023-10-24T07:30:46Z

Thanks for all of the review feedback, I really appreciate it. I have addressed most of the comments now, sorry for the delay. Additional comments should be resolved much faster. I will take a look at the tests tomorrow.

src/d3d/nvapi_d3d_instance.h

esullivan-nvidia · 2023-10-30T15:53:23Z

I have added tests for the D3DLowLatencyDevice path. Let me know if you have any changes you would like me to incorporate. Any feedback is appreciated.

jp7677 · 2023-10-30T18:32:03Z

@esullivan-nvidia Thanks a lot for including the feedback and also for taking the time to extend the tests. Perfectly and all good from my side! We can merge this as soon as the DXVK/VKD3D-Proton PRs are merged. Thanks a lot!

(Reminder to self to also adjust the readme when this PR has landed)

src/d3d/nvapi_d3d_low_latency_device.h

@ptr1337

Requires at least Nvidia 545.xx drivers. The patches are from the following pull requests: [wine](ValveSoftware/wine#200) [dxvk-nvapi](jp7677/dxvk-nvapi#147) [vkd3d-proton](HansKristian-Work/vkd3d-proton#1739) [dxvk](doitsujin/dxvk#3690) Thanks also goes to @ptr1337 for initially building and testing the patchset.

@ptr1337

Requires at least Nvidia 545.xx drivers. The patches are from the following pull requests: [wine](ValveSoftware/wine#200) [dxvk-nvapi](jp7677/dxvk-nvapi#147) [vkd3d-proton](HansKristian-Work/vkd3d-proton#1739) [dxvk](doitsujin/dxvk#3690) Thanks also goes to @ptr1337 for initially building and testing the patchset.

jp7677 · 2024-01-19T15:33:51Z

@esullivan-nvidia please see #151 (comment) when you have time to get back to this PR. Unfortunately the PR with the MSVC additions came in-between and now master conflicts with your work.

ishitatsuyuki · 2024-01-19T16:50:38Z

Since I also happen to be testing this patch I have a branch here with the necessary modifications for rebase applied. Please feel free to take it: https://github.com/ishitatsuyuki/dxvk-nvapi/tree/nv_low_latency2

@ptr1337

Requires at least Nvidia 545.xx drivers. The patches are from the following pull requests: [wine](ValveSoftware/wine#200) [dxvk-nvapi](jp7677/dxvk-nvapi#147) [vkd3d-proton](HansKristian-Work/vkd3d-proton#1739) [dxvk](doitsujin/dxvk#3690) Thanks also goes to @ptr1337 for initially building and testing the patchset.

iddm · 2024-02-01T13:19:46Z

Excuse me for jumping in like that, but are we still waiting for any changes? Can we fix the conflicts on our own? It doesn't look like the NVIDIA employees have all the time in the world to work on such Linux things as that, from my little understanding of time. Can I help with the rebase, or would it require the changes by the original author?

Thanks, just want to help finish this sooner rather than later.

ishitatsuyuki · 2024-02-01T13:21:06Z

Everything works if you compile it, there is even a rebase from myself up there. NVIDIA has their own timeline, it's fine, in the meantime just compile it by yourself.

The intent of this commit is to enable Reflex for all D3D11, and D3D12 titles using dxvk-nvapi. It does this through a new device interface called ID3DLowLatencyDevice. This interface will be implemented by ID3D12Device in vkd3d-proton, and ID3D11Device in dxvk. To provide compatibility with LatencyFleX this change will only use the ID3DLowLatencyDevice interface when LatencyFleX is not detected.

esullivan-nvidia · 2024-02-27T04:56:19Z

@ishitatsuyuki Thank you for doing that rebase, I really appreciate it. I have applied it to this branch now.

jp7677 · 2024-03-01T16:06:26Z

Thank a lot @esullivan-nvidia for your hard work on this one!

esullivan-nvidia · 2024-03-01T16:11:51Z

Thank a lot @esullivan-nvidia for your hard work on this one!

Thanks again to you and everyone else who helped review this PR!

* nvidia reflex merged jp7677/dxvk-nvapi#147 (comment) HansKristian-Work/vkd3d-proton#1739 (comment) Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>

esullivan-nvidia force-pushed the nv_low_latency2 branch 2 times, most recently from 0bc516f to a4a5e80 Compare October 14, 2023 07:33

Saancreed reviewed Oct 14, 2023

View reviewed changes

ivyl mentioned this pull request Oct 16, 2023

Support VK_NV_low_latency2 ValveSoftware/wine#200

Open

jp7677 requested changes Oct 16, 2023

View reviewed changes

ishitatsuyuki reviewed Oct 20, 2023

View reviewed changes

src/nvapi_d3d.cpp Outdated Show resolved Hide resolved

src/nvapi_d3d.cpp Outdated Show resolved Hide resolved

esullivan-nvidia force-pushed the nv_low_latency2 branch 2 times, most recently from b879770 to ca6092e Compare October 24, 2023 07:00

jp7677 reviewed Oct 29, 2023

View reviewed changes

src/d3d/nvapi_d3d_instance.h Outdated Show resolved Hide resolved

esullivan-nvidia force-pushed the nv_low_latency2 branch from ca6092e to 0738bfd Compare October 30, 2023 15:50

jp7677 approved these changes Oct 30, 2023

View reviewed changes

jp7677 reviewed Nov 5, 2023

View reviewed changes

src/d3d/nvapi_d3d_low_latency_device.h Show resolved Hide resolved

loathingKernel mentioned this pull request Nov 22, 2023

Add Nvidia Reflex patches. GloriousEggroll/proton-ge-custom#104

Merged

This comment was marked as off-topic.

Sign in to view

esullivan-nvidia force-pushed the nv_low_latency2 branch from 0738bfd to bf55bc6 Compare February 27, 2024 04:13

esullivan-nvidia force-pushed the nv_low_latency2 branch from bf55bc6 to 5ca994f Compare February 27, 2024 04:37

HansKristian-Work mentioned this pull request Mar 1, 2024

Add NV low latency support HansKristian-Work/vkd3d-proton#1739

Closed

Saancreed approved these changes Mar 1, 2024

View reviewed changes

jp7677 merged commit 53dfd10 into jp7677:master Mar 1, 2024
2 checks passed

Zenzi0 mentioned this pull request Mar 1, 2024

dlssg-to-fsr3 mod with Proton ValveSoftware/Proton#7361

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Reflex #147

Add support for Reflex #147

esullivan-nvidia commented Oct 14, 2023

Saancreed left a comment

Saancreed Oct 14, 2023

esullivan-nvidia Oct 24, 2023

jp7677 left a comment

adamnv commented Oct 17, 2023

esullivan-nvidia commented Oct 24, 2023

esullivan-nvidia commented Oct 30, 2023

jp7677 commented Oct 30, 2023

jp7677 commented Jan 19, 2024

ishitatsuyuki commented Jan 19, 2024

iddm commented Feb 1, 2024

ishitatsuyuki commented Feb 1, 2024

This comment was marked as off-topic.

This comment was marked as off-topic.

esullivan-nvidia commented Feb 27, 2024

jp7677 commented Mar 1, 2024

esullivan-nvidia commented Mar 1, 2024

Add support for Reflex #147

Add support for Reflex #147

Conversation

esullivan-nvidia commented Oct 14, 2023

Saancreed left a comment

Choose a reason for hiding this comment

Saancreed Oct 14, 2023

Choose a reason for hiding this comment

esullivan-nvidia Oct 24, 2023

Choose a reason for hiding this comment

jp7677 left a comment

Choose a reason for hiding this comment

adamnv commented Oct 17, 2023

esullivan-nvidia commented Oct 24, 2023

esullivan-nvidia commented Oct 30, 2023

jp7677 commented Oct 30, 2023

jp7677 commented Jan 19, 2024

ishitatsuyuki commented Jan 19, 2024

iddm commented Feb 1, 2024

ishitatsuyuki commented Feb 1, 2024

This comment was marked as off-topic.

This comment was marked as off-topic.

esullivan-nvidia commented Feb 27, 2024

jp7677 commented Mar 1, 2024

esullivan-nvidia commented Mar 1, 2024