mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d9] Use new presenter signal mechanism for frame pacing

This commit is contained in:
Philip Rebohle 2023-06-15 17:24:44 +02:00
parent e99bc591df
commit 7dbe4abb48
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/d3d9/d3d9_swapchain.cpp
View File

@ -754,9 +754,6 @@ namespace dxvk {
Rc<DxvkImage> swapImage = m_backBuffers[0]->GetCommonTexture()->GetImage(); Rc<DxvkImage> swapImage = m_backBuffers[0]->GetCommonTexture()->GetImage();
Rc<DxvkImageView> swapImageView = m_backBuffers[0]->GetImageView(false); Rc<DxvkImageView> swapImageView = m_backBuffers[0]->GetImageView(false);
// Bump our frame id.
++m_frameId;
for (uint32_t i = 0; i < SyncInterval || i < 1; i++) { for (uint32_t i = 0; i < SyncInterval || i < 1; i++) {
SynchronizePresent(); SynchronizePresent();
@ -798,9 +795,6 @@ namespace dxvk {
if (m_hud != nullptr) if (m_hud != nullptr)
m_hud->render(m_context, info.format, info.imageExtent); m_hud->render(m_context, info.format, info.imageExtent);
if (i + 1 >= SyncInterval)
m_context->signal(m_frameLatencySignal, m_frameId);
SubmitPresent(sync, i); SubmitPresent(sync, i);
} }
@ -815,25 +809,33 @@ namespace dxvk {
} }
void D3D9SwapChainEx::SubmitPresent(const PresenterSync& Sync, uint32_t FrameId) { void D3D9SwapChainEx::SubmitPresent(const PresenterSync& Sync, uint32_t Repeat) {
// Bump frame ID
if (!Repeat)
m_frameId += 1;
// Present from CS thread so that we don't // Present from CS thread so that we don't
// have to synchronize with it first. // have to synchronize with it first.
m_presentStatus.result = VK_NOT_READY; m_presentStatus.result = VK_NOT_READY;
m_parent->EmitCs([this, m_parent->EmitCs([this,
cFrameId = FrameId, cRepeat = Repeat,
cSync = Sync, cSync = Sync,
cHud = m_hud, cHud = m_hud,
cPresentMode = m_presenter->info().presentMode, cPresentMode = m_presenter->info().presentMode,
cFrameId = m_frameId,
cCommandList = m_context->endRecording() cCommandList = m_context->endRecording()
] (DxvkContext* ctx) { ] (DxvkContext* ctx) {
cCommandList->setWsiSemaphores(cSync); cCommandList->setWsiSemaphores(cSync);
m_device->submitCommandList(cCommandList, nullptr); m_device->submitCommandList(cCommandList, nullptr);
if (cHud != nullptr && !cFrameId) if (cHud != nullptr && !cRepeat)
cHud->update(); cHud->update();
m_device->presentImage(m_presenter, cPresentMode, 0, &m_presentStatus); uint64_t frameId = cRepeat ? 0 : cFrameId;
m_device->presentImage(m_presenter,
cPresentMode, frameId, &m_presentStatus);
}); });
m_parent->FlushCsChunk(); m_parent->FlushCsChunk();
@ -894,7 +896,7 @@ namespace dxvk {
presenterDesc.numFormats = PickFormats(EnumerateFormat(m_presentParams.BackBufferFormat), presenterDesc.formats); presenterDesc.numFormats = PickFormats(EnumerateFormat(m_presentParams.BackBufferFormat), presenterDesc.formats);
presenterDesc.fullScreenExclusive = PickFullscreenMode(); presenterDesc.fullScreenExclusive = PickFullscreenMode();
m_presenter = new Presenter(m_device, nullptr, presenterDesc); m_presenter = new Presenter(m_device, m_frameLatencySignal, presenterDesc);
m_presenter->setFrameRateLimit(m_parent->GetOptions()->maxFrameRate); m_presenter->setFrameRateLimit(m_parent->GetOptions()->maxFrameRate);
} }

2
src/d3d9/d3d9_swapchain.h
View File

@ -179,7 +179,7 @@ namespace dxvk {
void PresentImage(UINT PresentInterval); void PresentImage(UINT PresentInterval);
void SubmitPresent(const PresenterSync& Sync, uint32_t FrameId); void SubmitPresent(const PresenterSync& Sync, uint32_t Repeat);
void SynchronizePresent(); void SynchronizePresent();