diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-31 12:21:34 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-31 16:30:14 -0400 |
| commit | 4a587b81b285bcd41246329e89591be7cfe37c8a (patch) | |
| tree | 8eda46d4aac083d23a52223e1a3fc46bc6690a6c /src/core/core.h | |
| parent | 42588493d5ad5d824fc557ac936e64e5e7fd7e44 (diff) | |
core/core: Replace includes with forward declarations where applicable
The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which
replaces most of the includes in the core header with forward declarations.
This makes it so that if any of the headers the core header was
previously including change, then no one will need to rebuild the bulk
of the core, due to core.h being quite a prevalent inclusion.
This should make turnaround for changes much faster for developers.
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/src/core/core.h b/src/core/core.h index 984e8f94c1..eee1fecc15 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -4,41 +4,55 @@ #pragma once -#include <array> -#include <map> +#include <cstddef> #include <memory> #include <string> -#include <thread> + #include "common/common_types.h" -#include "core/arm/exclusive_monitor.h" -#include "core/core_cpu.h" -#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/object.h" -#include "core/hle/kernel/scheduler.h" -#include "core/loader/loader.h" -#include "core/memory.h" -#include "core/perf_stats.h" -#include "core/telemetry_session.h" -#include "file_sys/vfs_real.h" -#include "hle/service/filesystem/filesystem.h" -#include "video_core/debug_utils/debug_utils.h" -#include "video_core/gpu.h" namespace Core::Frontend { class EmuWindow; -} +} // namespace Core::Frontend + +namespace FileSys { +class VfsFilesystem; +} // namespace FileSys + +namespace Kernel { +class KernelCore; +class Process; +class Scheduler; +} // namespace Kernel + +namespace Loader { +class AppLoader; +enum class ResultStatus : u16; +} // namespace Loader namespace Service::SM { class ServiceManager; -} +} // namespace Service::SM + +namespace Tegra { +class DebugContext; +class GPU; +} // namespace Tegra namespace VideoCore { class RendererBase; -} +} // namespace VideoCore namespace Core { class ARM_Interface; +class Cpu; +class ExclusiveMonitor; +class FrameLimiter; +class PerfStats; +class TelemetrySession; + +struct PerfStatsResults; class System { public: @@ -125,7 +139,7 @@ public: void PrepareReschedule(); /// Gets and resets core performance statistics - PerfStats::Results GetAndResetPerfStats(); + PerfStatsResults GetAndResetPerfStats(); /// Gets an ARM interface to the CPU core that is currently running ARM_Interface& CurrentArmInterface(); @@ -197,9 +211,9 @@ public: std::shared_ptr<Tegra::DebugContext> GetGPUDebugContext() const; - void SetFilesystem(FileSys::VirtualFilesystem vfs); + void SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs); - FileSys::VirtualFilesystem GetFilesystem() const; + std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const; private: System(); |