Merge pull request #7670 from ameerj/vsync-block

 gpu: Add shut down method to synchronize threads before destruction 

1 files changed, 4 insertions, 2 deletions

diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index cc65a7870..3188b83ed 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <stop_token>
 
 #include "common/bit_field.h"
 #include "common/common_types.h"
@@ -210,7 +209,7 @@ public:
     [[nodiscard]] const VideoCore::ShaderNotify& ShaderNotify() const;
 
     /// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame.
-    void WaitFence(u32 syncpoint_id, u32 value, std::stop_token stop_token = {});
+    void WaitFence(u32 syncpoint_id, u32 value);
 
     void IncrementSyncPoint(u32 syncpoint_id);
 
@@ -233,6 +232,9 @@ public:
     /// core timing events.
     void Start();
 
+    /// Performs any additional necessary steps to shutdown GPU emulation.
+    void NotifyShutdown();
+
     /// Obtain the CPU Context
     void ObtainContext();