Added DONT_USE_XMX define

Author: cdozdil

OptiScaler/SysUtils.h

@@ -64,6 +64,10 @@
 // Use vkQueueSubmit2KHR instead of vkQueueSubmit for testing Linux issue
 // #define USE_QUEUE_SUBMIT_2_KHR
 
+// Don't skip spoofing for XeSS features
+// Which would ONLY disable XMX when using spoofing
+// #define DONT_USE_XMX
+
 inline HMODULE dllModule = nullptr;
 inline HMODULE exeModule = nullptr;
 inline HMODULE originalModule = nullptr;

OptiScaler/framegen/xefg/XeFG_Dx12.cpp

@@ -44,7 +44,9 @@ bool XeFG_Dx12::CreateSwapchainContext(ID3D12Device* device)
 
     auto createResult = false;
 
+#ifndef DONT_USE_XMX
     ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
 
     do
     {
@@ -386,8 +388,11 @@ bool XeFG_Dx12::CreateSwapchain(IDXGIFactory* factory, ID3D12CommandQueue* cmdQu
     if (Config::Instance()->FGXeFGHighResMV.value_or_default())
         _constants.flags |= FG_Flags::DisplayResolutionMVs;
 
-    xefg_swapchain_result_t result;
+#ifndef DONT_USE_XMX
     ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
+
+    xefg_swapchain_result_t result;
     result = XeFGProxy::D3D12InitFromSwapChainDesc()(_swapChainContext, hwnd, &scDesc, &fsDesc, realQueue, factory12,
                                                      &params);
 
@@ -547,8 +552,11 @@ bool XeFG_Dx12::CreateSwapchain1(IDXGIFactory* factory, ID3D12CommandQueue* cmdQ
 
     State::Instance().skipSpoofing = true;
 
-    xefg_swapchain_result_t result;
+#ifndef DONT_USE_XMX
     ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
+
+    xefg_swapchain_result_t result;
     result = XeFGProxy::D3D12InitFromSwapChainDesc()(_swapChainContext, hwnd, desc, pFullscreenDesc, realQueue,
                                                      factory12, &params);
 
@@ -723,7 +731,10 @@ bool XeFG_Dx12::Dispatch()
         auto uiState =
             _uiComposition ? XEFG_SWAPCHAIN_UI_COMPOSITION_STATE_ENABLED : XEFG_SWAPCHAIN_UI_COMPOSITION_STATE_DISABLED;
 
+#ifndef DONT_USE_XMX
         ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
+
         auto uiResult = XeFGProxy::SetUiCompositionState()(_swapChainContext, uiState);
 
         if (uiResult != XEFG_SWAPCHAIN_RESULT_SUCCESS)
@@ -747,7 +758,9 @@ bool XeFG_Dx12::Dispatch()
 
             state.WAR_xefgRequestFGToggle = true;
 
+#ifndef DONT_USE_XMX
             ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
 
             auto intResult = XeFGProxy::SetNumInterpolatedFrames()(
                 _swapChainContext, Config::Instance()->FGXeFGInterpolationCount.value_or_default());

OptiScaler/proxies/XeLL_Proxy.h

@@ -329,7 +329,10 @@ class XeLLProxy
 
         xell_result_t xellResult;
         {
+#ifndef DONT_USE_XMX
             ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
+
             xellResult = _xellD3D12CreateContext(device, &_xellContext);
         }
 

OptiScaler/upscalers/xess/XeSSFeature.cpp

@@ -33,7 +33,9 @@ bool XeSSFeature::InitXeSS(ID3D12Device* device, const NVSDK_NGX_Parameter* InPa
     }
 
     {
+#ifndef DONT_USE_XMX
         ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
 
         auto ret = XeSSProxy::D3D12CreateContext()(device, &_xessContext);
 

OptiScaler/upscalers/xess/XeSSFeature_Dx11.cpp

@@ -74,7 +74,9 @@ bool XeSSFeature_Dx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InConte
     DeviceContext = InContext;
 
     {
+#ifndef DONT_USE_XMX
         ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
 
         auto ret = XeSSProxy::D3D11CreateContext()(InDevice, &_xessContext);
 

OptiScaler/upscalers/xess/XeSSFeature_Vk.cpp

@@ -108,7 +108,10 @@ bool XeSSFeature_Vk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice
     }
 
     {
+#ifndef DONT_USE_XMX
         ScopedSkipSpoofing skipSpoofing {};
+#endif // !DONT_USE_XMX
+
         auto ret = XeSSProxy::VKCreateContext()(InInstance, InPD, InDevice, &_xessContext);
 
         if (ret != XESS_RESULT_SUCCESS)