artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gpu_thread: Use the previous MPSCQueue implementation

Browse source 
The bounded MPSCQueue implementation causes crashes in Fire Emblem Three Houses, use the previous implementation for now.
This commit is contained in:
Morph 2022-07-06 01:33:17 -04:00
parent 770611fdf3
commit fa09f7aa6c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/video_core/gpu_thread.cpp
View file

@ -31,8 +31,7 @@ static void RunThread(std::stop_token stop_token, Core::System& system,
VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer();
while (!stop_token.stop_requested()) { while (!stop_token.stop_requested()) {
CommandDataContainer next; CommandDataContainer next = state.queue.PopWait(stop_token);
state.queue.Pop(next, stop_token);
if (stop_token.stop_requested()) { if (stop_token.stop_requested()) {
break; break;
} }

4
src/video_core/gpu_thread.h
View file

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