lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-23 14:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use two buffers for the FSR 4 workaround

Browse Source 
Resolves a potential crash on state changes
This commit is contained in:
FakeMichau
2026-08-14 17:42:32 +02:00
parent 27ea21c1f7
commit 24df44bcd4
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp
+12 -7
View File
@@ -183,15 +183,18 @@ bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList,
if (validW && validH && isPadded)
{
CreateBufferResourceWithSize(Device, paramColor, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
&smallerColor, params.renderSize.width, params.renderSize.height);
static size_t count = 0;
const size_t index = count % 2;
if (smallerColor)
CreateBufferResourceWithSize(Device, paramColor, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
&smallerColor[index], params.renderSize.width, params.renderSize.height);
if (smallerColor[index])
{
ResourceBarrier(InCommandList, paramColor, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_STATE_COPY_SOURCE);
ResourceBarrier(InCommandList, smallerColor, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
ResourceBarrier(InCommandList, smallerColor[index], D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_STATE_COPY_DEST);
D3D12_BOX srcBox {};
@@ -203,7 +206,7 @@ bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList,
srcBox.back = 1;
D3D12_TEXTURE_COPY_LOCATION dstLocation {};
dstLocation.pResource = smallerColor;
dstLocation.pResource = smallerColor[index];
dstLocation.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
dstLocation.SubresourceIndex = 0;
@@ -214,11 +217,13 @@ bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList,
InCommandList->CopyTextureRegion(&dstLocation, 0, 0, 0, &srcLocation, &srcBox);
ResourceBarrier(InCommandList, smallerColor, D3D12_RESOURCE_STATE_COPY_DEST,
ResourceBarrier(InCommandList, smallerColor[index], D3D12_RESOURCE_STATE_COPY_DEST,
D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
paramColor = smallerColor;
paramColor = smallerColor[index];
}
count++;
}
}
OptiScaler/upscalers/ffx/FFXFeature_Dx12.h
+4 -2
View File
@@ -8,8 +8,9 @@
class FFXFeatureDx12 : public FFXFeature, public IFeature_Dx12
{
private:
ID3D12Resource* smallerColor[2];
NVSDK_NGX_Parameter* SetParameters(NVSDK_NGX_Parameter* InParameters);
ID3D12Resource* smallerColor;
protected:
bool InitFFX(const NVSDK_NGX_Parameter* InParameters);
@@ -34,6 +35,7 @@ class FFXFeatureDx12 : public FFXFeature, public IFeature_Dx12
if (_context != nullptr)
FfxApiProxy::D3D12_DestroyContext(&_context, NULL);
SAFE_RELEASE(smallerColor);
SAFE_RELEASE(smallerColor[0]);
SAFE_RELEASE(smallerColor[1]);
}
};