1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: d3d12: Avoid 1 sec timeout when skipping present

Browse Source 
Follow the d3d11 change.

Pick-to: 6.8
Change-Id: I06ef9e64f37fba72c2ab6adc84ad9058f22ae1e4
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit d8fb42bb790f468ad1b5304b743dbff297582ddd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2025-03-21 14:13:03 +01:00 committed by Qt Cherry-pick Bot
parent f07a3e07d1
commit 7cd1dbce12
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/rhi/qrhid3d12.cpp
View File

@ -1647,8 +1647,13 @@ QRhi::FrameOpResult QRhiD3D12::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginF
for (QD3D12SwapChain *sc : std::as_const(swapchains)) for (QD3D12SwapChain *sc : std::as_const(swapchains))
sc->waitCommandCompletionForFrameSlot(currentFrameSlot); // note: swapChainD->currentFrameSlot, not sc's sc->waitCommandCompletionForFrameSlot(currentFrameSlot); // note: swapChainD->currentFrameSlot, not sc's
if (swapChainD->frameLatencyWaitableObject) if (swapChainD->frameLatencyWaitableObject) {
// only wait when endFrame() called Present(), otherwise this would become a 1 sec timeout
if (swapChainD->lastFrameLatencyWaitSlot != currentFrameSlot) {
WaitForSingleObjectEx(swapChainD->frameLatencyWaitableObject, 1000, true); WaitForSingleObjectEx(swapChainD->frameLatencyWaitableObject, 1000, true);
swapChainD->lastFrameLatencyWaitSlot = currentFrameSlot;
}
}
HRESULT hr = cmdAllocators[currentFrameSlot]->Reset(); HRESULT hr = cmdAllocators[currentFrameSlot]->Reset();
if (FAILED(hr)) { if (FAILED(hr)) {
@ -6759,6 +6764,7 @@ bool QD3D12SwapChain::createOrResize()
currentBackBufferIndex = swapChain->GetCurrentBackBufferIndex(); currentBackBufferIndex = swapChain->GetCurrentBackBufferIndex();
currentFrameSlot = 0; currentFrameSlot = 0;
lastFrameLatencyWaitSlot = -1; // wait already in the first frame, as instructed in the dxgi docs
rtWrapper.setRenderPassDescriptor(m_renderPassDesc); // for the public getter in QRhiRenderTarget rtWrapper.setRenderPassDescriptor(m_renderPassDesc); // for the public getter in QRhiRenderTarget
QD3D12SwapChainRenderTarget *rtD = QRHI_RES(QD3D12SwapChainRenderTarget, &rtWrapper); QD3D12SwapChainRenderTarget *rtD = QRHI_RES(QD3D12SwapChainRenderTarget, &rtWrapper);

1
src/gui/rhi/qrhid3d12_p.h
View File

@ -1079,6 +1079,7 @@ struct QD3D12SwapChain : public QRhiSwapChain
} frameRes[QD3D12_FRAMES_IN_FLIGHT]; } frameRes[QD3D12_FRAMES_IN_FLIGHT];
int currentFrameSlot = 0; // index in frameRes int currentFrameSlot = 0; // index in frameRes
int lastFrameLatencyWaitSlot = -1;
}; };
template<typename T, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type> template<typename T, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type>