From f76165d8489ae9e88772e1a42839f4714b3327c2 Mon Sep 17 00:00:00 2001
From: GPUCode <47210458+GPUCode@users.noreply.github.com>
Date: Tue, 8 Aug 2023 04:21:28 +0300
Subject: [PATCH] frame_dumper: Use jthread (#6855)

---
 .../renderer_opengl/frame_dumper_opengl.cpp   | 19 +++++++++----------
 .../renderer_opengl/frame_dumper_opengl.h     | 15 +++++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/video_core/renderer_opengl/frame_dumper_opengl.cpp b/src/video_core/renderer_opengl/frame_dumper_opengl.cpp
index dd8720b10..7c9a52e07 100644
--- a/src/video_core/renderer_opengl/frame_dumper_opengl.cpp
+++ b/src/video_core/renderer_opengl/frame_dumper_opengl.cpp
@@ -5,6 +5,9 @@
 #include <glad/glad.h>
 
 #include <utility>
+
+#include "core/core.h"
+#include "core/dumping/backend.h"
 #include "core/frontend/emu_window.h"
 #include "video_core/renderer_opengl/frame_dumper_opengl.h"
 #include "video_core/renderer_opengl/gl_texture_mailbox.h"
@@ -12,13 +15,9 @@
 namespace OpenGL {
 
 FrameDumperOpenGL::FrameDumperOpenGL(Core::System& system_, Frontend::EmuWindow& emu_window)
-    : system(system_), context(emu_window.CreateSharedContext()) {}
+    : system{system_}, context{emu_window.CreateSharedContext()} {}
 
-FrameDumperOpenGL::~FrameDumperOpenGL() {
-    if (present_thread.joinable()) {
-        present_thread.join();
-    }
-}
+FrameDumperOpenGL::~FrameDumperOpenGL() = default;
 
 bool FrameDumperOpenGL::IsDumping() const {
     auto video_dumper = system.GetVideoDumper();
@@ -35,19 +34,19 @@ void FrameDumperOpenGL::StartDumping() {
         present_thread.join();
     }
 
-    present_thread = std::thread(&FrameDumperOpenGL::PresentLoop, this);
+    present_thread = std::jthread([this](std::stop_token stop_token) { PresentLoop(stop_token); });
 }
 
 void FrameDumperOpenGL::StopDumping() {
-    stop_requested.store(true, std::memory_order_relaxed);
+    present_thread.request_stop();
 }
 
-void FrameDumperOpenGL::PresentLoop() {
+void FrameDumperOpenGL::PresentLoop(std::stop_token stop_token) {
     const auto scope = context->Acquire();
     InitializeOpenGLObjects();
 
     const auto& layout = GetLayout();
-    while (!stop_requested.exchange(false)) {
+    while (!stop_token.stop_requested()) {
         auto frame = mailbox->TryGetPresentFrame(200);
         if (!frame) {
             continue;
diff --git a/src/video_core/renderer_opengl/frame_dumper_opengl.h b/src/video_core/renderer_opengl/frame_dumper_opengl.h
index bcd498094..7b02315bc 100644
--- a/src/video_core/renderer_opengl/frame_dumper_opengl.h
+++ b/src/video_core/renderer_opengl/frame_dumper_opengl.h
@@ -6,9 +6,8 @@
 
 #include <atomic>
 #include <memory>
-#include <thread>
-#include "core/core.h"
-#include "core/dumping/backend.h"
+
+#include "common/polyfill_thread.h"
 #include "core/frontend/framebuffer_layout.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
 
@@ -18,6 +17,10 @@ class GraphicsContext;
 class TextureMailbox;
 } // namespace Frontend
 
+namespace Core {
+class System;
+}
+
 namespace OpenGL {
 
 class RendererOpenGL;
@@ -42,12 +45,12 @@ public:
 private:
     void InitializeOpenGLObjects();
     void CleanupOpenGLObjects();
-    void PresentLoop();
+    void PresentLoop(std::stop_token stop_token);
 
+private:
     Core::System& system;
     std::unique_ptr<Frontend::GraphicsContext> context;
-    std::thread present_thread;
-    std::atomic_bool stop_requested{false};
+    std::jthread present_thread;
 
     // PBOs used to dump frames faster
     std::array<OGLBuffer, 2> pbos;