diff options
| author | 2018-08-09 19:22:06 -0400 | |
|---|---|---|
| committer | 2018-08-09 19:22:06 -0400 | |
| commit | 96ef22d3d0f7e75d1ad5d1351cd26db8c835f6ca (patch) | |
| tree | 4f18d020eb3de30a55053c3367cd0cc6049b31d6 /src/core/core.h | |
| parent | Merge pull request #991 from bunnei/ignore-mac (diff) | |
| parent | vfs: Fix documentation (diff) | |
| download | yuzu-96ef22d3d0f7e75d1ad5d1351cd26db8c835f6ca.tar.gz yuzu-96ef22d3d0f7e75d1ad5d1351cd26db8c835f6ca.tar.xz yuzu-96ef22d3d0f7e75d1ad5d1351cd26db8c835f6ca.zip | |
Merge pull request #897 from DarkLordZach/vfs-accuracy-2
vfs: Add VfsFilesystem and fix RealVfs* implementations
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 c8ca4b247..7cf7ea4e1 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | #include "core/memory.h" | 17 | #include "core/memory.h" |
| 18 | #include "core/perf_stats.h" | 18 | #include "core/perf_stats.h" |
| 19 | #include "core/telemetry_session.h" | 19 | #include "core/telemetry_session.h" |
| 20 | #include "file_sys/vfs_real.h" | ||
| 21 | #include "hle/service/filesystem/filesystem.h" | ||
| 20 | #include "video_core/debug_utils/debug_utils.h" | 22 | #include "video_core/debug_utils/debug_utils.h" |
| 21 | #include "video_core/gpu.h" | 23 | #include "video_core/gpu.h" |
| 22 | 24 | ||
| @@ -211,6 +213,14 @@ public: | |||
| 211 | return debug_context; | 213 | return debug_context; |
| 212 | } | 214 | } |
| 213 | 215 | ||
| 216 | void SetFilesystem(FileSys::VirtualFilesystem vfs) { | ||
| 217 | virtual_filesystem = std::move(vfs); | ||
| 218 | } | ||
| 219 | |||
| 220 | FileSys::VirtualFilesystem GetFilesystem() const { | ||
| 221 | return virtual_filesystem; | ||
| 222 | } | ||
| 223 | |||
| 214 | private: | 224 | private: |
| 215 | System(); | 225 | System(); |
| 216 | 226 | ||
| @@ -225,6 +235,8 @@ private: | |||
| 225 | */ | 235 | */ |
| 226 | ResultStatus Init(EmuWindow& emu_window); | 236 | ResultStatus Init(EmuWindow& emu_window); |
| 227 | 237 | ||
| 238 | /// RealVfsFilesystem instance | ||
| 239 | FileSys::VirtualFilesystem virtual_filesystem; | ||
| 228 | /// AppLoader used to load the current executing application | 240 | /// AppLoader used to load the current executing application |
| 229 | std::unique_ptr<Loader::AppLoader> app_loader; | 241 | std::unique_ptr<Loader::AppLoader> app_loader; |
| 230 | std::unique_ptr<VideoCore::RendererBase> renderer; | 242 | std::unique_ptr<VideoCore::RendererBase> renderer; |