diff options
author | bunnei <bunneidev@gmail.com> | 2018-04-21 03:26:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-21 03:26:27 +0200 |
commit | 2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1 (patch) | |
tree | eb3a8d9007462f1864174ea4ffe9e5a80d56c9d5 /src/core/core.h | |
parent | Merge pull request #340 from mailwl/vi-update (diff) | |
parent | core: Relocate g_service_manager to the System class (diff) | |
download | yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar.gz yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar.bz2 yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar.lz yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar.xz yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.tar.zst yuzu-2e7ce96b1d55df535ab7e16efb711d9bdf82cfd1.zip |
Diffstat (limited to 'src/core/core.h')
-rw-r--r-- | src/core/core.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/core/core.h b/src/core/core.h index f497dc022..f81cbfb3c 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -19,10 +19,16 @@ class EmuWindow; class ARM_Interface; +namespace Service::SM { +class ServiceManager; +} + namespace Core { class System { public: + ~System(); + /** * Gets the instance of the System singleton class. * @returns Reference to the instance of the System singleton class. @@ -137,6 +143,9 @@ public: return *app_loader; } + Service::SM::ServiceManager& ServiceManager(); + const Service::SM::ServiceManager& ServiceManager() const; + void SetGPUDebugContext(std::shared_ptr<Tegra::DebugContext> context) { debug_context = std::move(context); } @@ -171,6 +180,9 @@ private: /// When true, signals that a reschedule should happen bool reschedule_pending{}; + /// Service manager + std::shared_ptr<Service::SM::ServiceManager> service_manager; + /// Telemetry session for this emulation session std::unique_ptr<Core::TelemetrySession> telemetry_session; |