Преглед на файлове

Merge pull request #8542 from Morph1984/gpu-use-old-q

gpu_thread: Use the previous MPSCQueue implementation
liamwhite преди 4 години
родител
ревизия
ea861cc1c4
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 1 2
      src/video_core/gpu_thread.cpp
  2. 2 2
      src/video_core/gpu_thread.h

+ 1 - 2
src/video_core/gpu_thread.cpp

@@ -31,8 +31,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;
         }

+ 2 - 2
src/video_core/gpu_thread.h

@@ -10,7 +10,7 @@
 #include <thread>
 #include <variant>
 
-#include "common/bounded_threadsafe_queue.h"
+#include "common/threadsafe_queue.h"
 #include "video_core/framebuffer_config.h"
 
 namespace Tegra {
@@ -96,7 +96,7 @@ struct CommandDataContainer {
 
 /// Struct used to synchronize the GPU thread
 struct SynchState final {
-    using CommandQueue = Common::MPSCQueue<CommandDataContainer>;
+    using CommandQueue = Common::MPSCQueue<CommandDataContainer, true>;
     std::mutex write_lock;
     CommandQueue queue;
     u64 last_fence{};