summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/gpu_thread.cpp3
-rw-r--r--src/video_core/gpu_thread.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index 9c103c0d4..7cc5647e9 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -32,7 +32,8 @@ static void RunThread(std::stop_token stop_token, Core::System& system,
32 VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); 32 VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer();
33 33
34 while (!stop_token.stop_requested()) { 34 while (!stop_token.stop_requested()) {
35 CommandDataContainer next = state.queue.PopWait(stop_token); 35 CommandDataContainer next;
36 state.queue.Pop(next, stop_token);
36 if (stop_token.stop_requested()) { 37 if (stop_token.stop_requested()) {
37 break; 38 break;
38 } 39 }
diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h
index 90bcb5958..43940bd6d 100644
--- a/src/video_core/gpu_thread.h
+++ b/src/video_core/gpu_thread.h
@@ -10,8 +10,8 @@
10#include <thread> 10#include <thread>
11#include <variant> 11#include <variant>
12 12
13#include "common/bounded_threadsafe_queue.h"
13#include "common/polyfill_thread.h" 14#include "common/polyfill_thread.h"
14#include "common/threadsafe_queue.h"
15#include "video_core/framebuffer_config.h" 15#include "video_core/framebuffer_config.h"
16 16
17namespace Tegra { 17namespace Tegra {
@@ -97,7 +97,7 @@ struct CommandDataContainer {
97 97
98/// Struct used to synchronize the GPU thread 98/// Struct used to synchronize the GPU thread
99struct SynchState final { 99struct SynchState final {
100 using CommandQueue = Common::MPSCQueue<CommandDataContainer, true>; 100 using CommandQueue = Common::MPSCQueue<CommandDataContainer>;
101 std::mutex write_lock; 101 std::mutex write_lock;
102 CommandQueue queue; 102 CommandQueue queue;
103 u64 last_fence{}; 103 u64 last_fence{};