From b47a9307849734fbeba65eead1ff25d4792be387 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 6 Jul 2022 08:44:01 +0200 Subject: [PATCH] early-access version 2818 --- README.md | 2 +- src/video_core/gpu_thread.cpp | 3 +-- src/video_core/gpu_thread.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6861f9958..4963189dd 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2817. +This is the source code for early-access 2818. ## Legal Notice diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 778d6554e..0ee17779b 100755 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -32,8 +32,7 @@ static void RunThread(std::stop_token stop_token, Core::System& system, VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); while (!stop_token.stop_requested()) { - CommandDataContainer next; - state.queue.Pop(next, stop_token); + CommandDataContainer next = state.queue.PopWait(stop_token); if (stop_token.stop_requested()) { break; } diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index ac9c0405c..64628d3e3 100755 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -10,7 +10,7 @@ #include #include -#include "common/bounded_threadsafe_queue.h" +#include "common/threadsafe_queue.h" #include "video_core/framebuffer_config.h" namespace Tegra { @@ -100,7 +100,7 @@ struct CommandDataContainer { /// Struct used to synchronize the GPU thread struct SynchState final { - using CommandQueue = Common::MPSCQueue; + using CommandQueue = Common::MPSCQueue; std::mutex write_lock; CommandQueue queue; u64 last_fence{};