From 27d22b4cd1bf92b64a5196e4547726fa94d8d4fd Mon Sep 17 00:00:00 2001 From: cdozdil Date: Sat, 9 Mar 2024 00:26:18 +0300 Subject: [PATCH] conflict fix --- CyberXeSS/FSR2Feature_Dx12.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CyberXeSS/FSR2Feature_Dx12.cpp b/CyberXeSS/FSR2Feature_Dx12.cpp index 05395797..4c4291cb 100644 --- a/CyberXeSS/FSR2Feature_Dx12.cpp +++ b/CyberXeSS/FSR2Feature_Dx12.cpp @@ -49,7 +49,7 @@ bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, const N (D3D12_RESOURCE_STATES)Config::Instance()->ColorResourceBarrier.value(), D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - params.color = ffxGetResourceDX12(paramColor, GetFfxResourceDescriptionDX12(paramColor), (wchar_t*)L"FSR3Upscale_Color", FFX_RESOURCE_STATE_COMPUTE_READ); + params.color = ffxGetResourceDX12(&_context, paramColor, (wchar_t*)L"FSR3Upscale_Color", FFX_RESOURCE_STATE_COMPUTE_READ); } else {