diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-01 03:50:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-01 03:50:12 +0200 |
commit | 1c05c06e048c0471653275dcb00f391acbfd6324 (patch) | |
tree | 8eda46d4aac083d23a52223e1a3fc46bc6690a6c /src/core/core.cpp | |
parent | Merge pull request #1205 from bunnei/improve-rasterizer-cache-2 (diff) | |
parent | core/core: Replace includes with forward declarations where applicable (diff) | |
download | yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar.gz yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar.bz2 yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar.lz yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar.xz yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.tar.zst yuzu-1c05c06e048c0471653275dcb00f391acbfd6324.zip |
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 75c259068..2cfae18df 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -2,24 +2,35 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <array> +#include <map> #include <memory> +#include <thread> #include <utility> + #include "common/logging/log.h" #include "common/string_util.h" +#include "core/arm/exclusive_monitor.h" #include "core/core.h" +#include "core/core_cpu.h" #include "core/core_timing.h" #include "core/gdbstub/gdbstub.h" #include "core/hle/kernel/client_port.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/process.h" +#include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/controller.h" #include "core/hle/service/sm/sm.h" #include "core/loader/loader.h" +#include "core/perf_stats.h" #include "core/settings.h" +#include "core/telemetry_session.h" #include "file_sys/vfs_concat.h" #include "file_sys/vfs_real.h" +#include "video_core/debug_utils/debug_utils.h" +#include "video_core/gpu.h" #include "video_core/renderer_base.h" #include "video_core/video_core.h" @@ -258,7 +269,7 @@ struct System::Impl { } } - PerfStats::Results GetAndResetPerfStats() { + PerfStatsResults GetAndResetPerfStats() { return perf_stats.GetAndResetStats(CoreTiming::GetGlobalTimeUs()); } @@ -326,7 +337,7 @@ void System::PrepareReschedule() { CurrentCpuCore().PrepareReschedule(); } -PerfStats::Results System::GetAndResetPerfStats() { +PerfStatsResults System::GetAndResetPerfStats() { return impl->GetAndResetPerfStats(); } @@ -433,11 +444,11 @@ std::shared_ptr<Tegra::DebugContext> System::GetGPUDebugContext() const { return impl->debug_context; } -void System::SetFilesystem(FileSys::VirtualFilesystem vfs) { +void System::SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs) { impl->virtual_filesystem = std::move(vfs); } -FileSys::VirtualFilesystem System::GetFilesystem() const { +std::shared_ptr<FileSys::VfsFilesystem> System::GetFilesystem() const { return impl->virtual_filesystem; } |