summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBehunin <l3ehunin@gmail.com>2023-02-11 17:28:07 +0100
committerBehunin <l3ehunin@gmail.com>2023-03-04 02:20:56 +0100
commit44518b225cfeeeaab182592e7751874c46d18b82 (patch)
tree7c099f639daf36a9c55750a75956d3ab0b27f2b0
parentMerge pull request #9855 from liamwhite/kern-16-support (diff)
downloadyuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar.gz
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar.bz2
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar.lz
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar.xz
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.tar.zst
yuzu-44518b225cfeeeaab182592e7751874c46d18b82.zip
-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,
VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer();
while (!stop_token.stop_requested()) {
- CommandDataContainer next = state.queue.PopWait(stop_token);
+ CommandDataContainer next;
+ state.queue.Pop(next, 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 90bcb5958..43940bd6d 100644
--- a/src/video_core/gpu_thread.h
+++ b/src/video_core/gpu_thread.h
@@ -10,8 +10,8 @@
#include <thread>
#include <variant>
+#include "common/bounded_threadsafe_queue.h"
#include "common/polyfill_thread.h"
-#include "common/threadsafe_queue.h"
#include "video_core/framebuffer_config.h"
namespace Tegra {
@@ -97,7 +97,7 @@ struct CommandDataContainer {
/// Struct used to synchronize the GPU thread
struct SynchState final {
- using CommandQueue = Common::MPSCQueue<CommandDataContainer, true>;
+ using CommandQueue = Common::MPSCQueue<CommandDataContainer>;
std::mutex write_lock;
CommandQueue queue;
u64 last_fence{};