nvapi-d3d: Drop LatencyFlex support

jp7677 · Feb 11, 2025 · 8887803 · 8887803
1 parent 26f54ab
commit 8887803
Show file tree

Hide file tree

Showing 27 changed files with 131 additions and 549 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -4,10 +4,8 @@ nvapi_src = files([
   'util/util_log.cpp',
   'shared/vk.cpp',
   'shared/resource_factory.cpp',
-  'nvapi/lfx.cpp',
   'nvapi/nvml.cpp',
   'nvapi/nvapi_resource_factory.cpp',
-  'nvapi/nvapi_d3d_instance.cpp',
   'nvapi/nvapi_d3d_low_latency_device.cpp',
   'nvapi/nvapi_vulkan_low_latency_device.cpp',
   'nvapi/nvapi_output.cpp',

diff --git a/src/nvapi.cpp b/src/nvapi.cpp
@@ -381,9 +381,6 @@ extern "C" {
             return NvidiaDeviceNotFound(n);
         }
 
-        nvapiD3dInstance = std::make_unique<NvapiD3dInstance>(*resourceFactory);
-        nvapiD3dInstance->Initialize();
-
         return Ok(n);
     }
 }
diff --git a/src/nvapi/lfx.cpp b/src/nvapi/lfx.cpp
diff --git a/src/nvapi/lfx.h b/src/nvapi/lfx.h
diff --git a/src/nvapi/nvapi_d3d_instance.cpp b/src/nvapi/nvapi_d3d_instance.cpp
diff --git a/src/nvapi/nvapi_d3d_instance.h b/src/nvapi/nvapi_d3d_instance.h
diff --git a/src/nvapi/nvapi_d3d_low_latency_device.cpp b/src/nvapi/nvapi_d3d_low_latency_device.cpp
@@ -78,7 +78,11 @@ namespace dxvk {
         if (d3dLowLatencyDevice == nullptr)
             return false;
 
-        return SUCCEEDED(d3dLowLatencyDevice->SetLatencySleepMode(lowLatencyMode, lowLatencyBoost, minimumIntervalUs));
+        auto success = SUCCEEDED(d3dLowLatencyDevice->SetLatencySleepMode(lowLatencyMode, lowLatencyBoost, minimumIntervalUs));
+        if (success)
+            m_lowLatencyMode = lowLatencyMode;
+
+        return success;
     }
 
     bool NvapiD3dLowLatencyDevice::GetLatencyInfo(IUnknown* device, D3D_LATENCY_RESULTS* latencyResults) {
@@ -127,6 +131,10 @@ namespace dxvk {
             frameIdGenerator->GetLowLatencyDeviceFrameId(frameID), markerType));
     }
 
+    bool NvapiD3dLowLatencyDevice::GetLowLatencyMode() {
+        return m_lowLatencyMode;
+    }
+
     std::optional<uint32_t> NvapiD3dLowLatencyDevice::ToMarkerType(NV_LATENCY_MARKER_TYPE markerType) {
         static_assert(static_cast<int>(SIMULATION_START) == static_cast<int>(VK_LATENCY_MARKER_SIMULATION_START_NV));
         static_assert(static_cast<int>(SIMULATION_END) == static_cast<int>(VK_LATENCY_MARKER_SIMULATION_END_NV));

diff --git a/src/nvapi/nvapi_d3d_low_latency_device.h b/src/nvapi/nvapi_d3d_low_latency_device.h
@@ -35,6 +35,7 @@ namespace dxvk {
         static bool GetLatencyInfo(IUnknown* device, D3D_LATENCY_RESULTS* latencyResults);
         static bool SetLatencyMarker(IUnknown* device, uint64_t frameID, uint32_t markerType);
         static bool SetLatencyMarker(ID3D12CommandQueue* commandQueue, uint64_t frameID, uint32_t markerType);
+        [[nodiscard]] static bool GetLowLatencyMode();
 
         [[nodiscard]] static std::optional<uint32_t> ToMarkerType(NV_LATENCY_MARKER_TYPE markerType);
 
@@ -47,6 +48,8 @@ namespace dxvk {
         inline static std::mutex m_lowLatencyDeviceMutex;
         inline static std::mutex m_lowLatencyFrameIdGeneratorMutex;
 
+        inline static bool m_lowLatencyMode;
+
         [[nodiscard]] static Com<ID3DLowLatencyDevice> GetLowLatencyDevice(IUnknown* device);
         [[nodiscard]] static Com<ID3DLowLatencyDevice> GetLowLatencyDevice(ID3D12CommandQueue* commandQueue);
         [[nodiscard]] static LowLatencyFrameIdGenerator* GetFrameIdGenerator(ID3DLowLatencyDevice* device);

diff --git a/src/nvapi/nvapi_resource_factory.cpp b/src/nvapi/nvapi_resource_factory.cpp
@@ -27,8 +27,4 @@ namespace dxvk {
     std::unique_ptr<Nvml> NvapiResourceFactory::CreateNvml() {
         return std::make_unique<Nvml>();
     }
-
-    std::unique_ptr<Lfx> NvapiResourceFactory::CreateLfx() {
-        return std::make_unique<Lfx>();
-    }
 }
diff --git a/src/nvapi/nvapi_resource_factory.h b/src/nvapi/nvapi_resource_factory.h
@@ -5,7 +5,6 @@
 #include "../shared/resource_factory.h"
 #include "../shared/vk.h"
 #include "nvml.h"
-#include "lfx.h"
 
 namespace dxvk {
     class NvapiResourceFactory : ResourceFactory {
@@ -15,6 +14,5 @@ namespace dxvk {
         virtual std::unique_ptr<Vk> CreateVulkan(Com<IDXGIFactory1>& dxgiFactory);
         virtual Com<IDXGIFactory1> CreateDXGIFactory1();
         virtual std::unique_ptr<Nvml> CreateNvml();
-        virtual std::unique_ptr<Lfx> CreateLfx();
     };
 }
diff --git a/src/nvapi_d3d.cpp b/src/nvapi_d3d.cpp
@@ -165,10 +165,10 @@ extern "C" {
         if (!pDevice)
             return InvalidArgument(n);
 
-        if (!nvapiD3dInstance->IsReflexAvailable(pDevice))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pDevice))
             return NoImplementation(n, alreadyLoggedNoReflex);
 
-        if (!nvapiD3dInstance->Sleep(pDevice))
+        if (!NvapiD3dLowLatencyDevice::LatencySleep(pDevice))
             return Error(n, alreadyLoggedError);
 
         return Ok(n, alreadyLoggedOk);
@@ -195,10 +195,10 @@ extern "C" {
         if (pSetSleepModeParams->version != NV_SET_SLEEP_MODE_PARAMS_VER1)
             return IncompatibleStructVersion(n, pSetSleepModeParams->version);
 
-        if (!nvapiD3dInstance->IsReflexAvailable(pDevice))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pDevice))
             return NoImplementation(n, alreadyLoggedNoReflex);
 
-        if (!nvapiD3dInstance->SetReflexMode(pDevice, pSetSleepModeParams->bLowLatencyMode, pSetSleepModeParams->bLowLatencyBoost, pSetSleepModeParams->minimumIntervalUs))
+        if (!NvapiD3dLowLatencyDevice::SetLatencySleepMode(pDevice, pSetSleepModeParams->bLowLatencyMode, pSetSleepModeParams->bLowLatencyBoost, pSetSleepModeParams->minimumIntervalUs))
             return Error(n, alreadyLoggedError);
 
         if (lastLowLatencyMode != pSetSleepModeParams->bLowLatencyMode || lastMinimumIntervalUs != pSetSleepModeParams->minimumIntervalUs) {
@@ -226,10 +226,10 @@ extern "C" {
         if (pGetSleepStatusParams->version != NV_GET_SLEEP_STATUS_PARAMS_VER1)
             return IncompatibleStructVersion(n, pGetSleepStatusParams->version);
 
-        if (!nvapiD3dInstance->IsReflexAvailable(pDevice))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pDevice))
             return NoImplementation(n, alreadyLoggedNoReflex);
 
-        pGetSleepStatusParams->bLowLatencyMode = nvapiD3dInstance->IsLowLatencyEnabled();
+        pGetSleepStatusParams->bLowLatencyMode = NvapiD3dLowLatencyDevice::GetLowLatencyMode();
 
         return Ok(n, alreadyLoggedOk);
     }
@@ -252,7 +252,7 @@ extern "C" {
         if (pGetLatencyParams->version != NV_LATENCY_RESULT_PARAMS_VER1)
             return IncompatibleStructVersion(n, pGetLatencyParams->version);
 
-        if (nvapiD3dInstance->IsUsingLfx() || !NvapiD3dLowLatencyDevice::SupportsLowLatency(pDev))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pDev))
             return NoImplementation(n, alreadyLoggedNoImpl);
 
         if (!NvapiD3dLowLatencyDevice::GetLatencyInfo(pDev, reinterpret_cast<D3D_LATENCY_RESULTS*>(pGetLatencyParams)))
@@ -280,7 +280,7 @@ extern "C" {
         if (pSetLatencyMarkerParams->version != NV_LATENCY_MARKER_PARAMS_VER1)
             return IncompatibleStructVersion(n, pSetLatencyMarkerParams->version);
 
-        if (nvapiD3dInstance->IsUsingLfx() || !NvapiD3dLowLatencyDevice::SupportsLowLatency(pDev))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pDev))
             return NoImplementation(n, alreadyLoggedNoImpl);
 
         auto markerType = NvapiD3dLowLatencyDevice::ToMarkerType(pSetLatencyMarkerParams->markerType);

diff --git a/src/nvapi_d3d12.cpp b/src/nvapi_d3d12.cpp
@@ -453,7 +453,7 @@ extern "C" {
         if (!pCommandQueue)
             return InvalidPointer(n);
 
-        if (nvapiD3dInstance->IsUsingLfx() || !NvapiD3dLowLatencyDevice::SupportsLowLatency(pCommandQueue))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pCommandQueue))
             return NoImplementation(n);
 
         if (cqType == OUT_OF_BAND_IGNORE && !std::exchange(alreadyLoggedTypeIgnore, true))
@@ -486,7 +486,7 @@ extern "C" {
         if (pSetAsyncFrameMarkerParams->version != NV_LATENCY_MARKER_PARAMS_VER1)
             return IncompatibleStructVersion(n, pSetAsyncFrameMarkerParams->version);
 
-        if (nvapiD3dInstance->IsUsingLfx() || !NvapiD3dLowLatencyDevice::SupportsLowLatency(pCommandQueue))
+        if (!NvapiD3dLowLatencyDevice::SupportsLowLatency(pCommandQueue))
             return NoImplementation(n);
 
         auto markerType = NvapiD3dLowLatencyDevice::ToMarkerType(pSetAsyncFrameMarkerParams->markerType);

diff --git a/src/nvapi_globals.cpp b/src/nvapi_globals.cpp
@@ -3,4 +3,3 @@
 uint64_t initializationCount = 0ULL;
 std::unique_ptr<dxvk::NvapiResourceFactory> resourceFactory;
 std::unique_ptr<dxvk::NvapiAdapterRegistry> nvapiAdapterRegistry;
-std::unique_ptr<dxvk::NvapiD3dInstance> nvapiD3dInstance;
diff --git a/src/nvapi_globals.h b/src/nvapi_globals.h
@@ -3,9 +3,7 @@
 #include "nvapi_private.h"
 #include "nvapi/nvapi_resource_factory.h"
 #include "nvapi/nvapi_adapter_registry.h"
-#include "nvapi/nvapi_d3d_instance.h"
 
 extern uint64_t initializationCount;
 extern std::unique_ptr<dxvk::NvapiResourceFactory> resourceFactory;
 extern std::unique_ptr<dxvk::NvapiAdapterRegistry> nvapiAdapterRegistry;
-extern std::unique_ptr<dxvk::NvapiD3dInstance> nvapiD3dInstance;
diff --git a/tests/meson.build b/tests/meson.build
@@ -6,10 +6,8 @@ nvapi_src = files([
   '../src/util/util_log.cpp',
   '../src/shared/vk.cpp',
   '../src/shared/resource_factory.cpp',
-  '../src/nvapi/lfx.cpp',
   '../src/nvapi/nvml.cpp',
   '../src/nvapi/nvapi_resource_factory.cpp',
-  '../src/nvapi/nvapi_d3d_instance.cpp',
   '../src/nvapi/nvapi_d3d_low_latency_device.cpp',
   '../src/nvapi/nvapi_vulkan_low_latency_device.cpp',
   '../src/nvapi/nvapi_output.cpp',

diff --git a/tests/mocks/lfx_mocks.h b/tests/mocks/lfx_mocks.h