Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Acquire video buffer before taking game state lock to prevent erratic fast forward behaviour (#9140)

Browse Source 
(cherry picked from commit 20762f9117)
This commit is contained in:
Milek7 2021-05-02 20:10:07 +02:00 committed by Jonathan G Rennison
parent 01d40812fa
commit deb2ad8997
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/video_driver.cpp
View File

@ -127,6 +127,9 @@ void VideoDriver::Tick()
auto now = std::chrono::steady_clock::now();
if (this->HasGUI() && now >= this->next_draw_tick) {
/* Locking video buffer can block (especially with vsync enabled), do it before taking game state lock. */
this->LockVideoBuffer();
{
/* Tell the game-thread to stop so we can have a go. */
std::lock_guard<std::mutex> lock_wait(this->game_thread_wait_mutex);
@ -151,8 +154,6 @@ void VideoDriver::Tick()
* new values when-ever we can. */
InteractiveRandom();
this->LockVideoBuffer();
this->DrainCommandQueue();
while (this->PollEvent()) {}