DisableReactiveMask change

Author: cdozdil

Diff for: CyberXeSS/CyberXeSS.vcxproj

@@ -82,7 +82,7 @@
     <IncludePath>$(SolutionDir)external\simpleini;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\ffx-sdk\sdk\include;$(SolutionDir)external\fmt\include;$(SolutionDir)external\spdlog\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)external\xess\lib;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath)</LibraryPath>
     <TargetName>nvngx</TargetName>
-    <OutDir>F:\Games\Steam\steamapps\common\Returnal\Returnal\Binaries\Win64</OutDir>
+    <OutDir>D:\Games\Stranger of Paradise - Final Fantasy Origin</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(SolutionDir)external\simpleini;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\ffx-sdk\sdk\include;$(SolutionDir)external\fmt\include;$(SolutionDir)external\spdlog\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>

Diff for: CyberXeSS/CyberXessDx11.cpp

@@ -192,18 +192,15 @@ NVSDK_NGX_Result NVSDK_NGX_D3D11_CreateFeature(ID3D11DeviceContext* InDevCtx, NV
 {
 	spdlog::info("NVSDK_NGX_D3D11_CreateFeature");
 
-	if (CyberXessContext::instance()->Dx11Device == nullptr)
-	{
-		ID3D11Device* device;
-		InDevCtx->GetDevice(&device);
+	ID3D11Device* device;
+	InDevCtx->GetDevice(&device);
 
-		auto result = device->QueryInterface(IID_PPV_ARGS(&CyberXessContext::instance()->Dx11Device));
+	auto dx11DeviceResult = device->QueryInterface(IID_PPV_ARGS(&CyberXessContext::instance()->Dx11Device));
 
-		if (result != S_OK)
-		{
-			spdlog::error("NVSDK_NGX_D3D11_CreateFeature QueryInterface ID3D11Device5 result: {0:x}", result);
-			return NVSDK_NGX_Result_Fail;
-		}
+	if (dx11DeviceResult != S_OK)
+	{
+		spdlog::error("NVSDK_NGX_D3D11_CreateFeature QueryInterface ID3D11Device5 result: {0:x}", dx11DeviceResult);
+		return NVSDK_NGX_Result_Fail;
 	}
 
 	if (CyberXessContext::instance()->Dx12Device == nullptr)
@@ -338,26 +335,6 @@ NVSDK_NGX_Result NVSDK_NGX_D3D11_EvaluateFeature(ID3D11DeviceContext* InDevCtx,
 			deviceContext->XeSSDestroy();
 	}
 
-	if (!CyberXessContext::instance()->MyConfig->DisableReactiveMaskSetFromIni)
-	{
-		ID3D11Resource* paramMask = nullptr;
-		if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, &paramMask) != NVSDK_NGX_Result_Success)
-			InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)&paramMask);
-
-		if (paramMask != nullptr && !deviceContext->XeSSMaskEnabled())
-		{
-			spdlog::debug("NVSDK_NGX_D3D11_EvaluateFeature bias mask exist, enabling reactive mask!");
-			CyberXessContext::instance()->MyConfig->DisableReactiveMask = false;
-			deviceContext->XeSSDestroy();
-		}
-		else if (paramMask == nullptr && deviceContext->XeSSMaskEnabled())
-		{
-			spdlog::debug("NVSDK_NGX_D3D11_EvaluateFeature bias mask does not exist, disabling reactive mask!");
-			CyberXessContext::instance()->MyConfig->DisableReactiveMask = true;
-			deviceContext->XeSSDestroy();
-		}
-	}
-
 	if (!deviceContext->XeSSIsInited())
 	{
 		deviceContext->XeSSInit(CyberXessContext::instance()->Dx12Device, InParameters);
@@ -368,7 +345,7 @@ NVSDK_NGX_Result NVSDK_NGX_D3D11_EvaluateFeature(ID3D11DeviceContext* InDevCtx,
 			return NVSDK_NGX_Result_Fail;
 		}
 	}
-	
+
 	NVSDK_NGX_Result evResult = NVSDK_NGX_Result_Success;
 	if (!deviceContext->XeSSExecuteDx11(instance->Dx12CommandList, instance->Dx12CommandQueue, instance->Dx11Device, InDevCtx, InParameters, deviceContext))
 		evResult = NVSDK_NGX_Result_Fail;

Diff for: CyberXeSS/CyberXessDx12.cpp

@@ -260,26 +260,6 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_EvaluateFeature(ID3D12GraphicsCom
 			deviceContext->XeSSDestroy();
 	}
 
-	if (!CyberXessContext::instance()->MyConfig->DisableReactiveMaskSetFromIni)
-	{
-		ID3D12Resource* paramMask = nullptr;
-		if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, &paramMask) != NVSDK_NGX_Result_Success)
-			InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)&paramMask);
-
-		if (paramMask != nullptr && (!deviceContext->XeSSMaskEnabled() || !deviceContext->XeSSIsInited()))
-		{
-			spdlog::error("NVSDK_NGX_D3D12_EvaluateFeature bias mask exist, enabling reactive mask!");
-			CyberXessContext::instance()->MyConfig->DisableReactiveMask = false;
-			deviceContext->XeSSDestroy();
-		}
-		else if (paramMask == nullptr && deviceContext->XeSSMaskEnabled())
-		{
-			spdlog::error("NVSDK_NGX_D3D12_EvaluateFeature bias mask does not exist, disabling reactive mask!");
-			CyberXessContext::instance()->MyConfig->DisableReactiveMask = true;
-			deviceContext->XeSSDestroy();
-		}
-	}
-
 	if (!deviceContext->XeSSIsInited())
 	{
 		deviceContext->XeSSInit(CyberXessContext::instance()->Dx12Device, InParameters);