Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-22 15:11:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[idd] postprocess: centralize frame format utilities

Browse Source
This commit is contained in:
Geoffrey McRae
2026-08-13 20:01:44 +10:00
parent 34835dd1af
commit 3d7df86a01
11 changed files with 150 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
idd/LGIdd/capture/CFrameProcessorUtil.cpp
View File

@@ -41,39 +41,6 @@ bool CFrameProcessorUtil::FrameMetadataChanged(
previous.maxFrameAverageLightLevel != current.maxFrameAverageLightLevel));
}
FrameType CFrameProcessorUtil::GetFrameType(DXGI_FORMAT format)
{
switch (format)
{
case DXGI_FORMAT_B8G8R8A8_UNORM : return FRAME_TYPE_BGRA;
case DXGI_FORMAT_R8G8B8A8_UNORM : return FRAME_TYPE_RGBA;
case DXGI_FORMAT_R10G10B10A2_UNORM : return FRAME_TYPE_RGBA10;
case DXGI_FORMAT_R16G16B16A16_FLOAT: return FRAME_TYPE_RGBA16F;
default : return FRAME_TYPE_INVALID;
}
}
bool CFrameProcessorUtil::ResourceDescMatches(
const D3D12_RESOURCE_DESC& left, const D3D12_RESOURCE_DESC& right,
bool compareAlignment)
{
// GetDesc may report a resolved alignment when resource creation requested
// automatic alignment, so callers comparing creation descriptors can omit
// this allocation metadata.
return
left.Dimension == right.Dimension &&
(!compareAlignment || left.Alignment == right.Alignment) &&
left.Width == right.Width &&
left.Height == right.Height &&
left.DepthOrArraySize == right.DepthOrArraySize &&
left.MipLevels == right.MipLevels &&
left.Format == right.Format &&
left.SampleDesc.Count == right.SampleDesc.Count &&
left.SampleDesc.Quality == right.SampleDesc.Quality &&
left.Layout == right.Layout &&
left.Flags == right.Flags;
}
static bool IsFullDamage(const RECT * dirtyRects, unsigned nbDirtyRects,
unsigned width, unsigned height)
{

3
idd/LGIdd/capture/CFrameProcessorUtil.h
View File

@@ -29,9 +29,6 @@ class CFrameProcessorUtil
public:
static bool FrameMetadataChanged(const D12FrameFormat& previous,
const D12FrameFormat& current);
static FrameType GetFrameType(DXGI_FORMAT format);
static bool ResourceDescMatches(const D3D12_RESOURCE_DESC& left,
const D3D12_RESOURCE_DESC& right, bool compareAlignment = true);
static void ClipDirtyRects(RECT dirtyRects[], unsigned * nbDirtyRects,
unsigned width, unsigned height);
static bool BuildCopyDamage(const CPostProcessor& postProcessor,

3
idd/LGIdd/capture/CHardwareFrameProcessor.cpp
View File

@@ -290,8 +290,7 @@ bool CHardwareFrameProcessor::EnsureCandidateResource(
desc.Flags = D3D12_RESOURCE_FLAG_NONE;
if (candidate.resource &&
CFrameProcessorUtil::ResourceDescMatches(
candidate.resource->GetDesc(), desc, false))
D12::Same(candidate.resource->GetDesc(), desc, D12::DescCmp::CREATE))
return true;
candidate.resource.Reset();

3
idd/LGIdd/capture/CSoftwareFrameProcessor.cpp
View File

@@ -263,8 +263,7 @@ bool CSoftwareFrameProcessor::EnsureProductResource(
desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
if (product.resource &&
CFrameProcessorUtil::ResourceDescMatches(
product.resource->GetDesc(), desc, false))
D12::Same(product.resource->GetDesc(), desc, D12::DescCmp::CREATE))
return true;
product.resource.Reset();

2
idd/LGIdd/capture/CSwapChainProcessor.cpp
View File

@@ -572,7 +572,7 @@ bool CSwapChainProcessor::SwapChainNewFrame(ComPtr<IDXGIResource> acquiredBuffer
srcFormat.desc = srcDesc;
srcFormat.width = (unsigned)srcDesc.Width;
srcFormat.height = srcDesc.Height;
srcFormat.format = CFrameProcessorUtil::GetFrameType(srcDesc.Format);
srcFormat.format = D12::Type(srcDesc.Format);
srcFormat.sdrWhiteLevel = sdrWhiteLevel;
srcFormat.colorTransform = m_control.GetColorTransform();