summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2022-01-04 02:31:51 +0100
committerameerj <52414509+ameerj@users.noreply.github.com>2022-01-04 02:47:26 +0100
commitc17938f96ba9a3f2571387b21328743db8050250 (patch)
tree23c8280d1aaf458a1abbad272e8facc3bd58eb36 /src
parentRevert "Merge pull request #7668 from ameerj/fence-stop-token" (diff)
downloadyuzu-c17938f96ba9a3f2571387b21328743db8050250.tar
yuzu-c17938f96ba9a3f2571387b21328743db8050250.tar.gz
yuzu-c17938f96ba9a3f2571387b21328743db8050250.tar.bz2
yuzu-c17938f96ba9a3f2571387b21328743db8050250.tar.lz
yuzu-c17938f96ba9a3f2571387b21328743db8050250.tar.xz
yuzu-c17938f96ba9a3f2571387b21328743db8050250.tar.zst
yuzu-c17938f96ba9a3f2571387b21328743db8050250.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/core.cpp2
-rw-r--r--src/video_core/gpu.cpp10
-rw-r--r--src/video_core/gpu.h3
3 files changed, 15 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index aa96f709b..3f9a7f44b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -317,6 +317,8 @@ struct System::Impl {
is_powered_on = false;
exit_lock = false;
+ gpu_core->NotifyShutdown();
+
services.reset();
service_manager.reset();
cheat_engine.reset();
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index 8788f5148..44fda27ef 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -312,6 +312,12 @@ struct GPU::Impl {
cpu_context->MakeCurrent();
}
+ void NotifyShutdown() {
+ std::unique_lock lk{sync_mutex};
+ shutting_down.store(true, std::memory_order::relaxed);
+ sync_cv.notify_all();
+ }
+
/// Obtain the CPU Context
void ObtainContext() {
cpu_context->MakeCurrent();
@@ -859,6 +865,10 @@ void GPU::Start() {
impl->Start();
}
+void GPU::NotifyShutdown() {
+ impl->NotifyShutdown();
+}
+
void GPU::ObtainContext() {
impl->ObtainContext();
}
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index 500411176..3188b83ed 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -232,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();