yindo/archived-duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-01-31 02:05:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

VideoThread: Avoid possible null presentation in PresentFrameAndRestoreContext()

Browse Source
This commit is contained in:
Stenzek
2026-01-27 22:46:45 +10:00
parent 5516f7a2f1
commit 335145b54b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/video_presenter.cpp
View File

@@ -1439,6 +1439,8 @@ bool VideoPresenter::PresentFrame(GPUBackend* backend, u64 present_time)
}
GPUSwapChain* const swap_chain = g_gpu_device->GetMainSwapChain();
DebugAssert(swap_chain);
const GPUDevice::PresentResult pres =
((backend && !FullscreenUI::IsTransitionActive()) ? RenderDisplay(nullptr, swap_chain->GetSizeVec(), true, true) :
g_gpu_device->BeginPresent(swap_chain));

11
src/core/video_thread.cpp
View File

@@ -1014,11 +1014,14 @@ bool VideoThread::Internal::PresentFrameAndRestoreContext()
if (s_state.gpu_backend)
s_state.gpu_backend->FlushRender();
if (!VideoPresenter::PresentFrame(s_state.gpu_backend.get(), 0))
return false;
if (g_gpu_device->HasMainSwapChain())
{
if (!VideoPresenter::PresentFrame(s_state.gpu_backend.get(), 0))
return false;
if (s_state.gpu_backend)
s_state.gpu_backend->RestoreDeviceContext();
if (s_state.gpu_backend)
s_state.gpu_backend->RestoreDeviceContext();
}
return true;
}