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

[idd] project: organize source layout

Browse Source 
Move cadence and pipeline declarations under capture, and move local
named-pipe handling under ipc.

Flatten display contexts and rename files after their contained classes.
Keep transport headers limited to transport contracts and capabilities.

Consolidate CSwapChainProcessor definitions so each source file matches
the class it implements.
This commit is contained in:
Geoffrey McRae
2026-08-07 18:16:18 +10:00
parent 6725133375
commit 1de52f6e8a
34 changed files with 482 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
idd/LGIdd/Device.cpp
View File

@@ -34,10 +34,10 @@
#include "CDebug.h"
#include "display/CDisplayConfiguration.h"
#include "display/IddCxCompat.h"
#include "display/device/CDeviceContext.h"
#include "display/monitor/Context.h"
#include "display/CDeviceContext.h"
#include "display/CMonitorContext.h"
#include "transport/IControlTransport.h"
#include "transport/CPipeServer.h"
#include "ipc/CPipeServer.h"
#include "config/CSettings.h"
WDFDEVICE l_wdfDevice = nullptr;

2
idd/LGIdd/Driver.cpp
View File

@@ -24,7 +24,7 @@
#include "CDebug.h"
#include "platform/CPlatformInfo.h"
#include "VersionInfo.h"
#include "transport/CPipeServer.h"
#include "ipc/CPipeServer.h"
NTSTATUS DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPath)
{

23
idd/LGIdd/LGIdd.vcxproj
View File

@@ -27,20 +27,20 @@
<ClCompile Include="$(SolutionDir)LGCommon\*.cpp" />
<ClCompile Include="Device.cpp" />
<ClCompile Include="Driver.cpp" />
<ClCompile Include="ipc\CPipeServer.cpp" />
<ClCompile Include="display\CDisplayConfiguration.cpp" />
<ClCompile Include="display\CEdid.cpp" />
<ClCompile Include="display\CMonitorManager.cpp" />
<ClCompile Include="display\device\CDeviceContext.cpp" />
<ClCompile Include="display\monitor\Context.cpp" />
<ClCompile Include="display\CDeviceContext.cpp" />
<ClCompile Include="display\CMonitorContext.cpp" />
<ClCompile Include="capture\CFrameBufferPool.cpp" />
<ClCompile Include="capture\CFrameBufferResource.cpp" />
<ClCompile Include="capture\CFrameProcessor.cpp" />
<ClCompile Include="capture\CFrameProcessorUtil.cpp" />
<ClCompile Include="capture\CFrameScheduler.cpp" />
<ClCompile Include="capture\CHardwareFrameProcessor.cpp" />
<ClCompile Include="capture\CSoftwareFrameProcessor.cpp" />
<ClCompile Include="capture\CSwapChainCursor.cpp" />
<ClCompile Include="capture\CSwapChainProcessor.cpp" />
<ClCompile Include="capture\CSwapChainPublisher.cpp" />
<ClCompile Include="d3d\CD3D11Device.cpp" />
<ClCompile Include="d3d\CD3D12CommandQueue.cpp" />
<ClCompile Include="d3d\CD3D12Device.cpp" />
@@ -52,8 +52,6 @@
<ClCompile Include="postprocess\effect\CDownsampleEffect.cpp" />
<ClCompile Include="postprocess\effect\CHDR16to10Effect.cpp" />
<ClCompile Include="postprocess\effect\CRGB24Effect.cpp" />
<ClCompile Include="transport\CFrameScheduler.cpp" />
<ClCompile Include="transport\CPipeServer.cpp" />
<ClCompile Include="transport\TransportFactory.cpp" />
<ClCompile Include="transport\lgmp\CIVSHMEM.cpp" />
<ClCompile Include="transport\lgmp\CLGMPControl.cpp" />
@@ -69,16 +67,19 @@
<ClInclude Include="Driver.h" />
<ClInclude Include="Public.h" />
<ClInclude Include="Trace.h" />
<ClInclude Include="ipc\CPipeServer.h" />
<ClInclude Include="display\CDisplayConfiguration.h" />
<ClInclude Include="display\CEdid.h" />
<ClInclude Include="display\CMonitorManager.h" />
<ClInclude Include="display\IddCxCompat.h" />
<ClInclude Include="display\device\CDeviceContext.h" />
<ClInclude Include="display\monitor\Context.h" />
<ClInclude Include="display\CDeviceContext.h" />
<ClInclude Include="display\CMonitorContext.h" />
<ClInclude Include="capture\CFrameBufferPool.h" />
<ClInclude Include="capture\CFrameBufferResource.h" />
<ClInclude Include="capture\CFrameProcessor.h" />
<ClInclude Include="capture\CFrameProcessorUtil.h" />
<ClInclude Include="capture\CFrameScheduler.h" />
<ClInclude Include="capture\FramePipeline.h" />
<ClInclude Include="capture\CHardwareFrameProcessor.h" />
<ClInclude Include="capture\CSoftwareFrameProcessor.h" />
<ClInclude Include="capture\CSwapChainProcessor.h" />
@@ -94,15 +95,13 @@
<ClInclude Include="postprocess\effect\CDownsampleEffect.h" />
<ClInclude Include="postprocess\effect\CHDR16to10Effect.h" />
<ClInclude Include="postprocess\effect\CRGB24Effect.h" />
<ClInclude Include="transport\CFrameScheduler.h" />
<ClInclude Include="transport\CPipeServer.h" />
<ClInclude Include="transport\FrameBufferTypes.h" />
<ClInclude Include="transport\DirectFrameBufferMemory.h" />
<ClInclude Include="transport\FrameMemoryLimits.h" />
<ClInclude Include="transport\IControlTransport.h" />
<ClInclude Include="transport\IFrameTransport.h" />
<ClInclude Include="transport\ITransport.h" />
<ClInclude Include="transport\PreparedFrameBuffer.h" />
<ClInclude Include="transport\TransportFactory.h" />
<ClInclude Include="transport\TransportTypes.h" />
<ClInclude Include="transport\lgmp\CIVSHMEM.h" />
<ClInclude Include="transport\lgmp\CLGMPControl.h" />
<ClInclude Include="transport\lgmp\CLGMPFrameTransport.h" />

64
idd/LGIdd/LGIdd.vcxproj.filters
View File

@@ -5,15 +5,12 @@
<Filter Include="Driver">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
</Filter>
<Filter Include="IPC">
<UniqueIdentifier>{6A9D97A5-1A6C-4A95-A2D0-A7C2D6BE459D}</UniqueIdentifier>
</Filter>
<Filter Include="Display">
<UniqueIdentifier>{D2C16E51-6087-4E08-8DA4-5AD1A60EF58E}</UniqueIdentifier>
</Filter>
<Filter Include="Display\Device">
<UniqueIdentifier>{83AAC4D0-9E4C-4B25-BD54-9186713B2010}</UniqueIdentifier>
</Filter>
<Filter Include="Display\Monitor">
<UniqueIdentifier>{3AF4227D-EBC0-45FB-9670-192E371313D5}</UniqueIdentifier>
</Filter>
<Filter Include="Capture">
<UniqueIdentifier>{202B79B2-5CCF-4AD4-B4C5-F5602419683D}</UniqueIdentifier>
</Filter>
@@ -70,6 +67,9 @@
<ClInclude Include="Trace.h">
<Filter>Driver</Filter>
</ClInclude>
<ClInclude Include="ipc\CPipeServer.h">
<Filter>IPC</Filter>
</ClInclude>
<ClInclude Include="display\CDisplayConfiguration.h">
<Filter>Display</Filter>
</ClInclude>
@@ -82,11 +82,11 @@
<ClInclude Include="display\IddCxCompat.h">
<Filter>Display</Filter>
</ClInclude>
<ClInclude Include="display\device\CDeviceContext.h">
<Filter>Display\Device</Filter>
<ClInclude Include="display\CDeviceContext.h">
<Filter>Display</Filter>
</ClInclude>
<ClInclude Include="display\monitor\Context.h">
<Filter>Display\Monitor</Filter>
<ClInclude Include="display\CMonitorContext.h">
<Filter>Display</Filter>
</ClInclude>
<ClInclude Include="capture\CFrameBufferPool.h">
<Filter>Capture</Filter>
@@ -100,6 +100,12 @@
<ClInclude Include="capture\CFrameProcessorUtil.h">
<Filter>Capture</Filter>
</ClInclude>
<ClInclude Include="capture\CFrameScheduler.h">
<Filter>Capture</Filter>
</ClInclude>
<ClInclude Include="capture\FramePipeline.h">
<Filter>Capture</Filter>
</ClInclude>
<ClInclude Include="capture\CHardwareFrameProcessor.h">
<Filter>Capture</Filter>
</ClInclude>
@@ -145,13 +151,7 @@
<ClInclude Include="postprocess\effect\CRGB24Effect.h">
<Filter>Post-processing\Effects</Filter>
</ClInclude>
<ClInclude Include="transport\CFrameScheduler.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\CPipeServer.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\FrameBufferTypes.h">
<ClInclude Include="transport\DirectFrameBufferMemory.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\FrameMemoryLimits.h">
@@ -166,10 +166,10 @@
<ClInclude Include="transport\ITransport.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\TransportFactory.h">
<ClInclude Include="transport\PreparedFrameBuffer.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\TransportTypes.h">
<ClInclude Include="transport\TransportFactory.h">
<Filter>Transport</Filter>
</ClInclude>
<ClInclude Include="transport\lgmp\CIVSHMEM.h">
@@ -207,6 +207,9 @@
<ClCompile Include="Device.cpp">
<Filter>Driver</Filter>
</ClCompile>
<ClCompile Include="ipc\CPipeServer.cpp">
<Filter>IPC</Filter>
</ClCompile>
<ClCompile Include="display\CDisplayConfiguration.cpp">
<Filter>Display</Filter>
</ClCompile>
@@ -216,11 +219,11 @@
<ClCompile Include="display\CMonitorManager.cpp">
<Filter>Display</Filter>
</ClCompile>
<ClCompile Include="display\device\CDeviceContext.cpp">
<Filter>Display\Device</Filter>
<ClCompile Include="display\CDeviceContext.cpp">
<Filter>Display</Filter>
</ClCompile>
<ClCompile Include="display\monitor\Context.cpp">
<Filter>Display\Monitor</Filter>
<ClCompile Include="display\CMonitorContext.cpp">
<Filter>Display</Filter>
</ClCompile>
<ClCompile Include="capture\CFrameBufferPool.cpp">
<Filter>Capture</Filter>
@@ -234,21 +237,18 @@
<ClCompile Include="capture\CFrameProcessorUtil.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CFrameScheduler.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CHardwareFrameProcessor.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CSoftwareFrameProcessor.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CSwapChainCursor.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CSwapChainProcessor.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="capture\CSwapChainPublisher.cpp">
<Filter>Capture</Filter>
</ClCompile>
<ClCompile Include="d3d\CD3D11Device.cpp">
<Filter>D3D</Filter>
</ClCompile>
@@ -282,12 +282,6 @@
<ClCompile Include="postprocess\effect\CRGB24Effect.cpp">
<Filter>Post-processing\Effects</Filter>
</ClCompile>
<ClCompile Include="transport\CFrameScheduler.cpp">
<Filter>Transport</Filter>
</ClCompile>
<ClCompile Include="transport\CPipeServer.cpp">
<Filter>Transport</Filter>
</ClCompile>
<ClCompile Include="transport\TransportFactory.cpp">
<Filter>Transport</Filter>
</ClCompile>

6
idd/LGIdd/capture/CFrameBufferPool.h
View File

@@ -21,8 +21,8 @@
#pragma once
#include "capture/CFrameBufferResource.h"
#include "transport/FrameBufferTypes.h"
#include "transport/TransportTypes.h"
#include "capture/FramePipeline.h"
#include "transport/PreparedFrameBuffer.h"
struct CD3D12Device;
class IFrameTransport;
@@ -33,7 +33,7 @@ private:
IFrameTransport * m_transport = nullptr;
CD3D12Device * m_dx12 = nullptr;
CFrameBufferResource m_buffers[TRANSPORT_FRAME_BUFFER_COUNT];
CFrameBufferResource m_buffers[CAPTURE_FRAME_BUFFERS];
public:
void Init(IFrameTransport * transport, CD3D12Device * dx12);

2
idd/LGIdd/capture/CFrameBufferResource.h
View File

@@ -27,7 +27,7 @@
#include <atomic>
#include <stdint.h>
#include "transport/CFrameScheduler.h"
#include "capture/CFrameScheduler.h"
#include "d3d/CInteropResource.h"
struct CD3D12Device;

4
idd/LGIdd/capture/CFrameProcessor.cpp
View File

@@ -29,7 +29,7 @@
CFrameProcessor::CFrameProcessor(IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent) :
m_transport(transport),
m_dx12(std::move(dx12)),
@@ -156,7 +156,7 @@ void CFrameProcessor::GetPreviousDamage(
std::unique_ptr<CFrameProcessor> CreateFrameProcessor(
bool software, IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent)
{
std::unique_ptr<CFrameProcessor> processor;

8
idd/LGIdd/capture/CFrameProcessor.h
View File

@@ -24,8 +24,8 @@
#include "capture/CFrameBufferPool.h"
#include "d3d/CInteropResource.h"
#include "postprocess/CPostProcessor.h"
#include "transport/CFrameScheduler.h"
#include "transport/TransportTypes.h"
#include "capture/CFrameScheduler.h"
#include "capture/FramePipeline.h"
#include <Windows.h>
#include <memory>
@@ -76,7 +76,7 @@ protected:
public:
CFrameProcessor(IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent);
virtual ~CFrameProcessor() = default;
@@ -98,5 +98,5 @@ public:
std::unique_ptr<CFrameProcessor> CreateFrameProcessor(
bool software, IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent);

10
idd/LGIdd/transport/CFrameScheduler.cpp → idd/LGIdd/capture/CFrameScheduler.cpp
View File

@@ -18,7 +18,7 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "transport/CFrameScheduler.h"
#include "capture/CFrameScheduler.h"
#include "CDebug.h"
@@ -288,10 +288,10 @@ void CFrameScheduler::UpdateSubscribers(const uint32_t * clientIDs,
{
AcquireSRWLockExclusive(&m_lock);
uint32_t oldClientIDs [TRANSPORT_MAX_CLIENTS] = {};
bool wasSubscribed [TRANSPORT_MAX_CLIENTS] = {};
bool wasOwnerCapable[TRANSPORT_MAX_CLIENTS] = {};
unsigned clientIndex = 0;
uint32_t oldClientIDs [MAX_CLIENTS] = {};
bool wasSubscribed [MAX_CLIENTS] = {};
bool wasOwnerCapable[MAX_CLIENTS] = {};
unsigned clientIndex = 0;
for (const Client& client : m_clients)
{
oldClientIDs[clientIndex] = client.clientID;

36
idd/LGIdd/transport/CFrameScheduler.h → idd/LGIdd/capture/CFrameScheduler.h
View File

@@ -23,11 +23,33 @@
#include <Windows.h>
#include <stdint.h>
#include "transport/TransportTypes.h"
enum : uint32_t
{
FRAME_SCHEDULE_ACTIVE = 0x1,
FRAME_SCHEDULE_RELEASE = 0x2,
FRAME_SCHEDULE_RESET = 0x4,
FRAME_SCHEDULE_IMMEDIATE = 0x8,
};
struct FrameScheduleUpdate
{
uint32_t clientID;
uint32_t generation;
uint32_t flags;
uint64_t period;
uint64_t targetSlack;
int64_t phaseError;
uint32_t feedbackFrameSerial;
uint32_t feedbackScheduleEpoch;
uint32_t feedbackDeadlineSerial;
uint32_t lease;
};
class CFrameScheduler
{
public:
static const unsigned MAX_CLIENTS = 8;
struct Schedule
{
uint32_t clientID;
@@ -78,12 +100,12 @@ private:
static const unsigned PUBLICATION_HISTORY_SIZE = 128;
static const unsigned WORK_TIMING_HISTORY_SIZE = 32;
mutable SRWLOCK m_lock = SRWLOCK_INIT;
HANDLE m_wakeEvent = nullptr;
Client m_clients[TRANSPORT_MAX_CLIENTS] = {};
Schedule m_schedule = {};
bool m_scheduling = false;
uint32_t m_epoch = 0;
mutable SRWLOCK m_lock = SRWLOCK_INIT;
HANDLE m_wakeEvent = nullptr;
Client m_clients[MAX_CLIENTS] = {};
Schedule m_schedule = {};
bool m_scheduling = false;
uint32_t m_epoch = 0;
// A result acknowledges only the request tickets captured by its attempt.
uint64_t m_forceRequestTicket = 0;

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

@@ -29,7 +29,7 @@
using namespace Microsoft::WRL;
static_assert(TRANSPORT_FRAME_QUEUE_LENGTH == 2,
static_assert(CAPTURE_PIPELINE_SLOTS == 2,
"IDD candidate pipeline assumes two slots");
class CPublishPending
@@ -72,7 +72,7 @@ public:
CHardwareFrameProcessor::CHardwareFrameProcessor(
IFrameTransport * transport, std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent) :
CFrameProcessor(transport, std::move(dx12), postProcessors,
pipelineLock, terminateEvent)

6
idd/LGIdd/capture/CHardwareFrameProcessor.h
View File

@@ -65,8 +65,8 @@ private:
bool active = false;
};
FrameCandidate m_candidates[TRANSPORT_FRAME_QUEUE_LENGTH];
CandidateDamageTail m_candidateDamageTail[TRANSPORT_FRAME_QUEUE_LENGTH];
FrameCandidate m_candidates[CAPTURE_PIPELINE_SLOTS];
CandidateDamageTail m_candidateDamageTail[CAPTURE_PIPELINE_SLOTS];
mutable SRWLOCK m_candidateLock = SRWLOCK_INIT;
SRWLOCK m_copySubmitLock = SRWLOCK_INIT;
uint64_t m_candidateSequence = 0;
@@ -91,7 +91,7 @@ private:
public:
CHardwareFrameProcessor(IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent);
bool IsValid() const override;

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

@@ -20,7 +20,7 @@
#include "capture/CSoftwareFrameProcessor.h"
#include "capture/CFrameProcessorUtil.h"
#include "transport/TransportTypes.h"
#include "capture/FramePipeline.h"
#include "transport/IFrameTransport.h"
#include "util/CSRWLock.h"
#include "CDebug.h"
@@ -29,7 +29,7 @@
CSoftwareFrameProcessor::CSoftwareFrameProcessor(
IFrameTransport * transport, std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent) :
CFrameProcessor(transport, std::move(dx12), postProcessors,
pipelineLock, terminateEvent),

2
idd/LGIdd/capture/CSoftwareFrameProcessor.h
View File

@@ -33,7 +33,7 @@ private:
public:
CSoftwareFrameProcessor(IFrameTransport * transport,
std::shared_ptr<CD3D12Device> dx12,
CPostProcessor postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH],
CPostProcessor postProcessors[CAPTURE_PIPELINE_SLOTS],
SRWLOCK * pipelineLock, HANDLE terminateEvent);
bool Submit(const FrameSubmission& submission) override;

122
idd/LGIdd/capture/CSwapChainCursor.cpp
View File

@@ -1,122 +0,0 @@
/**
* Looking Glass
* Copyright © 2017-2026 The Looking Glass Authors
* https://looking-glass.io
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., 59
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "capture/CSwapChainProcessor.h"
#include "display/IddCxCompat.h"
#include "display/device/CDeviceContext.h"
#include "transport/IControlTransport.h"
#include "CDebug.h"
DWORD CALLBACK CSwapChainProcessor::_CursorThread(LPVOID arg)
{
reinterpret_cast<CSwapChainProcessor*>(arg)->CursorThread();
return 0;
}
bool CSwapChainProcessor::QueryHWCursor()
{
IDARG_IN_QUERY_HWCURSOR in = {};
in.LastShapeId = m_lastShapeId;
in.pShapeBuffer = m_shapeBuffer;
in.ShapeBufferSizeInBytes = 512 * 512 * 4;
IDARG_OUT_QUERY_HWCURSOR out = {};
UINT cursorWhiteLevel = m_sdrWhiteLevel.load(std::memory_order_relaxed);
NTSTATUS status;
#ifdef HAS_IDDCX_110
if (m_devContext->HasIddCx110DDIs())
{
IDARG_OUT_QUERY_HWCURSOR3 out3 = {};
status = IddCxMonitorQueryHardwareCursor3(m_monitor, &in, &out3);
out.IsCursorVisible = out3.IsCursorVisible;
out.X = out3.X;
out.Y = out3.Y;
out.IsCursorShapeUpdated = out3.IsCursorShapeUpdated;
out.CursorShapeInfo = out3.CursorShapeInfo;
if (out3.SdrWhiteLevel)
cursorWhiteLevel = out3.SdrWhiteLevel;
}
else
#endif
{
status = IddCxMonitorQueryHardwareCursor(m_monitor, &in, &out);
}
if (FAILED(status))
{
// this occurs if the display went away (ie, screen blanking or disabled)
if (status == STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY)
{
SetEvent(m_terminateEvent.Get());
return false;
}
DEBUG_ERROR("IddCxMonitorQueryHardwareCursor failed (0x%08x)", status);
return false;
}
if (out.IsCursorShapeUpdated)
m_lastShapeId = out.CursorShapeInfo.ShapeId;
m_control.SendCursor(out, m_shapeBuffer, cursorWhiteLevel);
return true;
}
void CSwapChainProcessor::CursorThread()
{
HRESULT hr = 0;
bool running = true;
while (running)
{
HANDLE waitHandles[] =
{
m_cursorDataEvent.Get(),
m_terminateEvent.Get()
};
DWORD waitResult = WaitForMultipleObjects(
ARRAYSIZE(waitHandles), waitHandles, FALSE, 100);
switch (waitResult)
{
case WAIT_TIMEOUT:
continue;
// cursorDataEvent
case WAIT_OBJECT_0:
if (!QueryHWCursor())
return;
continue;
// terminateEvent
case WAIT_OBJECT_0 + 1:
running = false;
continue;
default:
hr = HRESULT_FROM_WIN32(waitResult);
DEBUG_ERROR_HR(hr, "WaitForMultipleObjects");
return;
}
}
}

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

@@ -21,8 +21,8 @@
#include "capture/CSwapChainProcessor.h"
#include "capture/CFrameProcessorUtil.h"
#include "display/IddCxCompat.h"
#include "display/device/CDeviceContext.h"
#include "display/monitor/Context.h"
#include "display/CDeviceContext.h"
#include "display/CMonitorContext.h"
#include "platform/CPlatformInfo.h"
#include "transport/IFrameTransport.h"
#include "transport/IControlTransport.h"
@@ -31,7 +31,7 @@
#include <avrt.h>
#include <new>
#include "CDebug.h"
#include "transport/CPipeServer.h"
#include "ipc/CPipeServer.h"
#ifndef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
#define CREATE_WAITABLE_TIMER_HIGH_RESOLUTION 0x00000002
@@ -737,3 +737,340 @@ bool CSwapChainProcessor::SwapChainNewFrame(ComPtr<IDXGIResource> acquiredBuffer
};
return m_frameProcessor->Submit(submission);
}
static const uint64_t PUBLISH_RETRY_NS = 1000000ULL;
static bool ArmPublishTimer(HANDLE timer, uint64_t delay)
{
if (!timer)
return false;
LARGE_INTEGER due = {};
due.QuadPart = -static_cast<LONGLONG>((delay + 99) / 100);
if (!due.QuadPart)
due.QuadPart = -1;
return SetWaitableTimer(timer, &due, 0, nullptr, nullptr, FALSE) != FALSE;
}
DWORD CALLBACK CSwapChainProcessor::_PublisherThread(LPVOID arg)
{
reinterpret_cast<CSwapChainProcessor *>(arg)->PublisherThread();
return 0;
}
void CSwapChainProcessor::PublisherThread()
{
DWORD avTask = 0;
HANDLE avTaskHandle = AvSetMmThreadCharacteristicsW(L"Distribution", &avTask);
if (avTaskHandle &&
!AvSetMmThreadPriority(avTaskHandle, AVRT_PRIORITY_HIGH))
DEBUG_WARN("Failed to raise publisher MMCSS priority: %lu",
GetLastError());
const HANDLE scheduleEvent = m_transport.GetFrameScheduleEvent();
HANDLE idleHandles[] =
{
m_terminateEvent.Get(),
m_frameProcessor->GetReadyEvent(),
scheduleEvent,
};
HANDLE timerHandles[] =
{
m_terminateEvent.Get(),
m_frameProcessor->GetReadyEvent(),
scheduleEvent,
m_publishTimer.Get(),
};
const bool cadenceEnabled = m_frameProcessor->UsesCadence();
for (;;)
{
const uint64_t now = CFrameScheduler::Nanotime();
uint64_t target;
CFrameScheduler::Schedule schedule;
bool periodic;
bool republish;
m_transport.GetPublishTarget(
now, target, schedule, periodic, republish);
const bool ready = m_frameProcessor->HasReadyFrame();
if (!ready)
{
m_transport.ProcessDeliveries();
if (m_frameProcessor->HasReadyFrame())
continue;
uint64_t current = CFrameScheduler::Nanotime();
uint64_t cadenceTarget = 0;
if (cadenceEnabled && schedule.deliveryDeadlineSerial && periodic)
{
if (schedule.deadline <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
cadenceTarget = schedule.deadline;
}
if (republish && m_transport.HasPublishedFrame())
{
if (m_transport.RepublishFrameBuffer(schedule))
continue;
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
uint64_t retryTarget = current + PUBLISH_RETRY_NS;
if (cadenceTarget)
retryTarget = min(retryTarget, cadenceTarget);
ArmPublishTimer(m_publishTimer.Get(), retryTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
uint64_t replayTarget;
if (m_transport.GetPendingDeliveryTarget(current, replayTarget))
{
bool retry = false;
if (replayTarget <= current)
{
if (m_transport.RetryPendingDelivery(current, retry))
continue;
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
if (retry)
replayTarget = current + PUBLISH_RETRY_NS;
else
{
if (cadenceTarget)
replayTarget = cadenceTarget;
else
{
if (m_publishTimer.Get())
CancelWaitableTimer(m_publishTimer.Get());
if (WaitForMultipleObjects(
ARRAYSIZE(idleHandles), idleHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
}
}
if (cadenceTarget)
replayTarget = min(replayTarget, cadenceTarget);
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
if (replayTarget <= current)
continue;
ArmPublishTimer(m_publishTimer.Get(), replayTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
if (cadenceTarget)
{
current = CFrameScheduler::Nanotime();
if (cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
ArmPublishTimer(m_publishTimer.Get(), cadenceTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
if (m_publishTimer.Get())
CancelWaitableTimer(m_publishTimer.Get());
if (WaitForMultipleObjects(
ARRAYSIZE(idleHandles), idleHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
uint64_t current = CFrameScheduler::Nanotime();
uint64_t replayTarget;
if (m_transport.GetPendingDeliveryTarget(current, replayTarget) &&
replayTarget < target)
{
if (replayTarget <= current)
{
m_transport.ProcessDeliveries();
current = CFrameScheduler::Nanotime();
bool retry = false;
if (m_transport.RetryPendingDelivery(current, retry))
continue;
current = CFrameScheduler::Nanotime();
if (retry)
replayTarget = current + PUBLISH_RETRY_NS;
else
replayTarget = target;
}
replayTarget = min(replayTarget, target);
current = CFrameScheduler::Nanotime();
if (target > current)
{
if (replayTarget <= current)
continue;
ArmPublishTimer(m_publishTimer.Get(), replayTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
}
current = CFrameScheduler::Nanotime();
if (target > current)
{
ArmPublishTimer(m_publishTimer.Get(), target - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
const uint64_t publishStart = CFrameScheduler::Nanotime();
m_transport.ProcessDeliveries();
if (!m_transport.FrameBufferAvailable(schedule) ||
!m_frameProcessor->Publish(schedule, periodic, publishStart))
{
ArmPublishTimer(m_publishTimer.Get(), PUBLISH_RETRY_NS);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
}
}
if (avTaskHandle)
AvRevertMmThreadCharacteristics(avTaskHandle);
}
DWORD CALLBACK CSwapChainProcessor::_CursorThread(LPVOID arg)
{
reinterpret_cast<CSwapChainProcessor*>(arg)->CursorThread();
return 0;
}
bool CSwapChainProcessor::QueryHWCursor()
{
IDARG_IN_QUERY_HWCURSOR in = {};
in.LastShapeId = m_lastShapeId;
in.pShapeBuffer = m_shapeBuffer;
in.ShapeBufferSizeInBytes = 512 * 512 * 4;
IDARG_OUT_QUERY_HWCURSOR out = {};
UINT cursorWhiteLevel = m_sdrWhiteLevel.load(std::memory_order_relaxed);
NTSTATUS status;
#ifdef HAS_IDDCX_110
if (m_devContext->HasIddCx110DDIs())
{
IDARG_OUT_QUERY_HWCURSOR3 out3 = {};
status = IddCxMonitorQueryHardwareCursor3(m_monitor, &in, &out3);
out.IsCursorVisible = out3.IsCursorVisible;
out.X = out3.X;
out.Y = out3.Y;
out.IsCursorShapeUpdated = out3.IsCursorShapeUpdated;
out.CursorShapeInfo = out3.CursorShapeInfo;
if (out3.SdrWhiteLevel)
cursorWhiteLevel = out3.SdrWhiteLevel;
}
else
#endif
{
status = IddCxMonitorQueryHardwareCursor(m_monitor, &in, &out);
}
if (FAILED(status))
{
// this occurs if the display went away (ie, screen blanking or disabled)
if (status == STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY)
{
SetEvent(m_terminateEvent.Get());
return false;
}
DEBUG_ERROR("IddCxMonitorQueryHardwareCursor failed (0x%08x)", status);
return false;
}
if (out.IsCursorShapeUpdated)
m_lastShapeId = out.CursorShapeInfo.ShapeId;
m_control.SendCursor(out, m_shapeBuffer, cursorWhiteLevel);
return true;
}
void CSwapChainProcessor::CursorThread()
{
HRESULT hr = 0;
bool running = true;
while (running)
{
HANDLE waitHandles[] =
{
m_cursorDataEvent.Get(),
m_terminateEvent.Get()
};
DWORD waitResult = WaitForMultipleObjects(
ARRAYSIZE(waitHandles), waitHandles, FALSE, 100);
switch (waitResult)
{
case WAIT_TIMEOUT:
continue;
// cursorDataEvent
case WAIT_OBJECT_0:
if (!QueryHWCursor())
return;
continue;
// terminateEvent
case WAIT_OBJECT_0 + 1:
running = false;
continue;
default:
hr = HRESULT_FROM_WIN32(waitResult);
DEBUG_ERROR_HR(hr, "WaitForMultipleObjects");
return;
}
}
}

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

@@ -56,7 +56,7 @@ private:
HANDLE m_newFrameEvent;
CInteropResourcePool m_resPool;
CPostProcessor m_postProcessors[TRANSPORT_FRAME_QUEUE_LENGTH];
CPostProcessor m_postProcessors[CAPTURE_PIPELINE_SLOTS];
std::unique_ptr<CFrameProcessor> m_frameProcessor;
// Reconfiguration is exclusive while per-candidate recording is shared.
SRWLOCK m_pipelineLock = SRWLOCK_INIT;

268
idd/LGIdd/capture/CSwapChainPublisher.cpp
View File

@@ -1,268 +0,0 @@
/**
* Looking Glass
* Copyright © 2017-2026 The Looking Glass Authors
* https://looking-glass.io
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., 59
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "capture/CSwapChainProcessor.h"
#include "transport/IFrameTransport.h"
#include <avrt.h>
#include "CDebug.h"
static const uint64_t PUBLISH_RETRY_NS = 1000000ULL;
static bool ArmPublishTimer(HANDLE timer, uint64_t delay)
{
if (!timer)
return false;
LARGE_INTEGER due = {};
due.QuadPart = -static_cast<LONGLONG>((delay + 99) / 100);
if (!due.QuadPart)
due.QuadPart = -1;
return SetWaitableTimer(timer, &due, 0, nullptr, nullptr, FALSE) != FALSE;
}
DWORD CALLBACK CSwapChainProcessor::_PublisherThread(LPVOID arg)
{
reinterpret_cast<CSwapChainProcessor *>(arg)->PublisherThread();
return 0;
}
void CSwapChainProcessor::PublisherThread()
{
DWORD avTask = 0;
HANDLE avTaskHandle = AvSetMmThreadCharacteristicsW(L"Distribution", &avTask);
if (avTaskHandle &&
!AvSetMmThreadPriority(avTaskHandle, AVRT_PRIORITY_HIGH))
DEBUG_WARN("Failed to raise publisher MMCSS priority: %lu",
GetLastError());
const HANDLE scheduleEvent = m_transport.GetFrameScheduleEvent();
HANDLE idleHandles[] =
{
m_terminateEvent.Get(),
m_frameProcessor->GetReadyEvent(),
scheduleEvent,
};
HANDLE timerHandles[] =
{
m_terminateEvent.Get(),
m_frameProcessor->GetReadyEvent(),
scheduleEvent,
m_publishTimer.Get(),
};
const bool cadenceEnabled = m_frameProcessor->UsesCadence();
for (;;)
{
const uint64_t now = CFrameScheduler::Nanotime();
uint64_t target;
CFrameScheduler::Schedule schedule;
bool periodic;
bool republish;
m_transport.GetPublishTarget(
now, target, schedule, periodic, republish);
const bool ready = m_frameProcessor->HasReadyFrame();
if (!ready)
{
m_transport.ProcessDeliveries();
if (m_frameProcessor->HasReadyFrame())
continue;
uint64_t current = CFrameScheduler::Nanotime();
uint64_t cadenceTarget = 0;
if (cadenceEnabled && schedule.deliveryDeadlineSerial && periodic)
{
if (schedule.deadline <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
cadenceTarget = schedule.deadline;
}
if (republish && m_transport.HasPublishedFrame())
{
if (m_transport.RepublishFrameBuffer(schedule))
continue;
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
uint64_t retryTarget = current + PUBLISH_RETRY_NS;
if (cadenceTarget)
retryTarget = min(retryTarget, cadenceTarget);
ArmPublishTimer(m_publishTimer.Get(), retryTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
uint64_t replayTarget;
if (m_transport.GetPendingDeliveryTarget(current, replayTarget))
{
bool retry = false;
if (replayTarget <= current)
{
if (m_transport.RetryPendingDelivery(current, retry))
continue;
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
if (retry)
replayTarget = current + PUBLISH_RETRY_NS;
else
{
if (cadenceTarget)
replayTarget = cadenceTarget;
else
{
if (m_publishTimer.Get())
CancelWaitableTimer(m_publishTimer.Get());
if (WaitForMultipleObjects(
ARRAYSIZE(idleHandles), idleHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
}
}
if (cadenceTarget)
replayTarget = min(replayTarget, cadenceTarget);
current = CFrameScheduler::Nanotime();
if (cadenceTarget && cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
if (replayTarget <= current)
continue;
ArmPublishTimer(m_publishTimer.Get(), replayTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
if (cadenceTarget)
{
current = CFrameScheduler::Nanotime();
if (cadenceTarget <= current)
{
m_transport.FrameMissed(schedule, current, periodic);
continue;
}
ArmPublishTimer(m_publishTimer.Get(), cadenceTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
if (m_publishTimer.Get())
CancelWaitableTimer(m_publishTimer.Get());
if (WaitForMultipleObjects(
ARRAYSIZE(idleHandles), idleHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
uint64_t current = CFrameScheduler::Nanotime();
uint64_t replayTarget;
if (m_transport.GetPendingDeliveryTarget(current, replayTarget) &&
replayTarget < target)
{
if (replayTarget <= current)
{
m_transport.ProcessDeliveries();
current = CFrameScheduler::Nanotime();
bool retry = false;
if (m_transport.RetryPendingDelivery(current, retry))
continue;
current = CFrameScheduler::Nanotime();
if (retry)
replayTarget = current + PUBLISH_RETRY_NS;
else
replayTarget = target;
}
replayTarget = min(replayTarget, target);
current = CFrameScheduler::Nanotime();
if (target > current)
{
if (replayTarget <= current)
continue;
ArmPublishTimer(m_publishTimer.Get(), replayTarget - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
}
current = CFrameScheduler::Nanotime();
if (target > current)
{
ArmPublishTimer(m_publishTimer.Get(), target - current);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
continue;
}
const uint64_t publishStart = CFrameScheduler::Nanotime();
m_transport.ProcessDeliveries();
if (!m_transport.FrameBufferAvailable(schedule) ||
!m_frameProcessor->Publish(schedule, periodic, publishStart))
{
ArmPublishTimer(m_publishTimer.Get(), PUBLISH_RETRY_NS);
if (WaitForMultipleObjects(
ARRAYSIZE(timerHandles), timerHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
break;
}
}
if (avTaskHandle)
AvRevertMmThreadCharacteristics(avTaskHandle);
}

27
idd/LGIdd/capture/FramePipeline.h Normal file
View File

@@ -0,0 +1,27 @@
/**
* Looking Glass
* Copyright © 2017-2026 The Looking Glass Authors
* https://looking-glass.io
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., 59
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#pragma once
enum : unsigned
{
CAPTURE_PIPELINE_SLOTS = 2,
CAPTURE_FRAME_BUFFERS = 3,
};

2
idd/LGIdd/d3d/CD3D12Device.h
View File

@@ -27,7 +27,7 @@
#include <d3d12.h>
#include "d3d/CD3D12CommandQueue.h"
#include "transport/TransportTypes.h"
#include "transport/DirectFrameBufferMemory.h"
using namespace Microsoft::WRL;

4
idd/LGIdd/display/device/CDeviceContext.cpp → idd/LGIdd/display/CDeviceContext.cpp
View File

@@ -18,10 +18,10 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "display/device/CDeviceContext.h"
#include "display/CDeviceContext.h"
#include "display/IddCxCompat.h"
#include "transport/CPipeServer.h"
#include "ipc/CPipeServer.h"
#include "transport/IFrameTransport.h"
#include "transport/TransportFactory.h"
#include "CDebug.h"

0
idd/LGIdd/display/device/CDeviceContext.h → idd/LGIdd/display/CDeviceContext.h
View File

4
idd/LGIdd/display/monitor/Context.cpp → idd/LGIdd/display/CMonitorContext.cpp
View File

@@ -18,8 +18,8 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "display/monitor/Context.h"
#include "display/device/CDeviceContext.h"
#include "display/CMonitorContext.h"
#include "display/CDeviceContext.h"
#include "capture/CSwapChainProcessor.h"
#include "d3d/CD3D11Device.h"
#include "CDebug.h"

0
idd/LGIdd/display/monitor/Context.h → idd/LGIdd/display/CMonitorContext.h
View File

2
idd/LGIdd/display/CMonitorManager.cpp
View File

@@ -20,7 +20,7 @@
#include "display/CMonitorManager.h"
#include "display/monitor/Context.h"
#include "display/CMonitorContext.h"
#include "CDebug.h"
void CMonitorManager::Create(UINT connectorIndex, IDDCX_ADAPTER adapter,

4
idd/LGIdd/transport/CPipeServer.cpp → idd/LGIdd/ipc/CPipeServer.cpp
View File

@@ -18,9 +18,9 @@
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "transport/CPipeServer.h"
#include "ipc/CPipeServer.h"
#include "CDebug.h"
#include "display/device/CDeviceContext.h"
#include "display/CDeviceContext.h"
CPipeServer g_pipe;

0
idd/LGIdd/transport/CPipeServer.h → idd/LGIdd/ipc/CPipeServer.h
View File

4
idd/LGIdd/postprocess/effect/CRGB24Effect.cpp
View File

@@ -22,7 +22,7 @@
#include "CDebug.h"
#include "config/CSettings.h"
#include "transport/TransportTypes.h"
#include "capture/FramePipeline.h"
#include <algorithm>
#include <climits>
@@ -61,7 +61,7 @@ struct CRGB24Effect::State
std::shared_ptr<const D12ColorTransform> colorTransform;
};
static const unsigned WarmupCount = TRANSPORT_FRAME_QUEUE_LENGTH;
static const unsigned WarmupCount = CAPTURE_PIPELINE_SLOTS;
static const unsigned SampleCount = 64;
static const unsigned TrimCount = SampleCount / 8;

30
idd/LGIdd/transport/TransportTypes.h → idd/LGIdd/transport/DirectFrameBufferMemory.h
View File

@@ -21,36 +21,6 @@
#pragma once
#include <stddef.h>
#include <stdint.h>
enum : unsigned
{
TRANSPORT_FRAME_QUEUE_LENGTH = 2,
TRANSPORT_FRAME_BUFFER_COUNT = 3,
TRANSPORT_MAX_CLIENTS = 8,
};
enum : uint32_t
{
FRAME_SCHEDULE_ACTIVE = 0x1,
FRAME_SCHEDULE_RELEASE = 0x2,
FRAME_SCHEDULE_RESET = 0x4,
FRAME_SCHEDULE_IMMEDIATE = 0x8,
};
struct FrameScheduleUpdate
{
uint32_t clientID;
uint32_t generation;
uint32_t flags;
uint64_t period;
uint64_t targetSlack;
int64_t phaseError;
uint32_t feedbackFrameSerial;
uint32_t feedbackScheduleEpoch;
uint32_t feedbackDeadlineSerial;
uint32_t lease;
};
struct DirectFrameBufferMemory
{

5
idd/LGIdd/transport/IFrameTransport.h
View File

@@ -21,9 +21,8 @@
#pragma once
#include "postprocess/D12FrameFormat.h"
#include "transport/CFrameScheduler.h"
#include "transport/FrameBufferTypes.h"
#include "transport/TransportTypes.h"
#include "capture/CFrameScheduler.h"
#include "transport/PreparedFrameBuffer.h"
#include <Windows.h>
#include <stddef.h>

2
idd/LGIdd/transport/ITransport.h
View File

@@ -20,8 +20,8 @@
#pragma once
#include "transport/DirectFrameBufferMemory.h"
#include "transport/FrameMemoryLimits.h"
#include "transport/TransportTypes.h"
#include <stddef.h>
#include <stdint.h>

0
idd/LGIdd/transport/FrameBufferTypes.h → idd/LGIdd/transport/PreparedFrameBuffer.h
View File

6
idd/LGIdd/transport/lgmp/CLGMPFrameTransport.cpp
View File

@@ -35,11 +35,11 @@ struct LGMPBuffer
};
#pragma warning(pop)
static_assert(TRANSPORT_FRAME_QUEUE_LENGTH == LGMP_Q_FRAME_LEN,
static_assert(CAPTURE_PIPELINE_SLOTS == LGMP_Q_FRAME_LEN,
"The capture pipeline must match the LGMP frame queue");
static_assert(TRANSPORT_FRAME_BUFFER_COUNT == LGMP_Q_FRAME_BUFFER_LEN,
static_assert(CAPTURE_FRAME_BUFFERS == LGMP_Q_FRAME_BUFFER_LEN,
"The capture buffer pool must match the LGMP frame buffers");
static_assert(TRANSPORT_MAX_CLIENTS == LGMP_MAX_CLIENTS,
static_assert(CFrameScheduler::MAX_CLIENTS == LGMP_MAX_CLIENTS,
"The scheduler must support every LGMP client");
static const struct LGMPQueueConfig FRAME_QUEUE_CONFIG =

3
idd/LGIdd/transport/lgmp/CLGMPFrameTransport.h
View File

@@ -29,7 +29,8 @@ extern "C" {
}
#include "common/KVMFR.h"
#include "transport/CFrameScheduler.h"
#include "capture/CFrameScheduler.h"
#include "capture/FramePipeline.h"
#include "transport/FrameMemoryLimits.h"
#include "transport/IFrameTransport.h"