Update to 1.11.2

src/video/video_driver.cpp

@@ -97,27 +97,6 @@ void VideoDriver::StopGameThread()
 	this->game_thread.join();
 }
 
-void VideoDriver::RealChangeBlitter(const char *repl_blitter)
-{
-	const char *cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName();
-
-	DEBUG(driver, 1, "Switching blitter from '%s' to '%s'... ", cur_blitter, repl_blitter);
-	Blitter *new_blitter = BlitterFactory::SelectBlitter(repl_blitter);
-	if (new_blitter == nullptr) NOT_REACHED();
-	DEBUG(driver, 1, "Successfully switched to %s.", repl_blitter);
-
-	if (!this->AfterBlitterChange()) {
-		/* Failed to switch blitter, let's hope we can return to the old one. */
-		if (BlitterFactory::SelectBlitter(cur_blitter) == nullptr || !this->AfterBlitterChange()) usererror("Failed to reinitialize video driver. Specify a fixed blitter in the config");
-	}
-
-	/* Clear caches that might have sprites for another blitter. */
-	this->ClearSystemSprites();
-	ClearFontCache();
-	GfxClearSpriteCache();
-	ReInitAllWindows();
-}
-
 void VideoDriver::Tick()
 {
 	if (!this->is_game_threaded && std::chrono::steady_clock::now() >= this->next_game_tick) {
@@ -152,17 +131,15 @@ void VideoDriver::Tick()
 			this->fast_forward_via_key = false;
 		}
 
+		/* 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);
 			std::lock_guard<std::mutex> lock_state(this->game_state_mutex);
 
-			this->LockVideoBuffer();
-
-			if (this->change_blitter != nullptr) {
-				this->RealChangeBlitter(this->change_blitter);
-				this->change_blitter = nullptr;
-			}
+			this->DrainCommandQueue();
 
 			while (this->PollEvent()) {}
 			::InputLoop();