Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-12 17:38:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] d12: fix target for wait fence when effects are active

Browse Source
This commit is contained in:
Geoffrey McRae 2024-02-28 12:31:56 +11:00
parent a894348530
commit 2d41cda640
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
host/platform/Windows/capture/D12/d12.c
View File

@ -63,6 +63,7 @@ struct D12Interface
D12Backend * backend; D12Backend * backend;
Vector effects; Vector effects;
bool effectsActive;
// capture format tracking // capture format tracking
D12FrameFormat captureFormat; D12FrameFormat captureFormat;
@ -531,6 +532,7 @@ static CaptureResult d12_waitFrame(unsigned frameBufferIndex,
{ {
D12FrameFormat dstFormat = this->dstFormat; D12FrameFormat dstFormat = this->dstFormat;
this->captureFormat = srcFormat; this->captureFormat = srcFormat;
this->effectsActive = false;
D12Effect * effect; D12Effect * effect;
D12FrameFormat curFormat = srcFormat; D12FrameFormat curFormat = srcFormat;
@ -540,8 +542,9 @@ static CaptureResult d12_waitFrame(unsigned frameBufferIndex,
switch(d12_effectSetFormat(effect, *this->device, &curFormat, &dstFormat)) switch(d12_effectSetFormat(effect, *this->device, &curFormat, &dstFormat))
{ {
case D12_EFFECT_STATUS_OK: case D12_EFFECT_STATUS_OK:
curFormat = dstFormat; this->effectsActive = true;
effect->enabled = true; curFormat = dstFormat;
effect->enabled = true;
break; break;
case D12_EFFECT_STATUS_ERROR: case D12_EFFECT_STATUS_ERROR:
@ -656,7 +659,7 @@ static CaptureResult d12_getFrame(unsigned frameBufferIndex,
// place a fence into the queue // place a fence into the queue
result = d12_backendSync(this->backend, result = d12_backendSync(this->backend,
this->allowRGB24 ? *this->computeQueue : *this->copyQueue); this->effectsActive ? *this->computeQueue : *this->copyQueue);
if (result != CAPTURE_RESULT_OK) if (result != CAPTURE_RESULT_OK)
goto exit; goto exit;
@ -774,7 +777,7 @@ static CaptureResult d12_getFrame(unsigned frameBufferIndex,
} }
// execute the compute commands // execute the compute commands
if (next != *src) if (this->effectsActive)
{ {
d12_commandGroupExecute(*this->computeQueue, &this->computeCommand); d12_commandGroupExecute(*this->computeQueue, &this->computeCommand);
@ -794,9 +797,8 @@ static CaptureResult d12_getFrame(unsigned frameBufferIndex,
this->dstFormat.desc.Height * this->pitch); this->dstFormat.desc.Height * this->pitch);
// reset the command queues // reset the command queues
if (next != *src) if (this->effectsActive && !d12_commandGroupReset(&this->computeCommand))
if (!d12_commandGroupReset(&this->computeCommand)) goto exit;
goto exit;
if (!d12_commandGroupReset(&this->copyCommand)) if (!d12_commandGroupReset(&this->copyCommand))
goto exit; goto exit;