diff options
| author | 2020-09-10 02:28:54 +0000 | |
|---|---|---|
| committer | 2020-09-10 02:28:54 +0000 | |
| commit | 663ea382dae4b0a8d958753fb370416b1602c55e (patch) | |
| tree | 74db3117e649cb5ae1a265c69f68d2bb03b9d542 /src/yuzu_cmd/yuzu.cpp | |
| parent | Merge pull request #4635 from lioncash/gc-adap (diff) | |
| parent | video_core: Remove all Core::System references in renderer (diff) | |
| download | yuzu-663ea382dae4b0a8d958753fb370416b1602c55e.tar.gz yuzu-663ea382dae4b0a8d958753fb370416b1602c55e.tar.xz yuzu-663ea382dae4b0a8d958753fb370416b1602c55e.zip | |
Merge pull request #4633 from ReinUsesLisp/gpu-init
video_core: Remove all Core::System references in renderer
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 4f00c804d..e960b5413 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include "core/file_sys/registered_cache.h" | 26 | #include "core/file_sys/registered_cache.h" |
| 27 | #include "core/file_sys/vfs_real.h" | 27 | #include "core/file_sys/vfs_real.h" |
| 28 | #include "core/gdbstub/gdbstub.h" | 28 | #include "core/gdbstub/gdbstub.h" |
| 29 | #include "core/hle/kernel/process.h" | ||
| 29 | #include "core/hle/service/filesystem/filesystem.h" | 30 | #include "core/hle/service/filesystem/filesystem.h" |
| 30 | #include "core/loader/loader.h" | 31 | #include "core/loader/loader.h" |
| 31 | #include "core/settings.h" | 32 | #include "core/settings.h" |
| @@ -235,7 +236,9 @@ int main(int argc, char** argv) { | |||
| 235 | // Core is loaded, start the GPU (makes the GPU contexts current to this thread) | 236 | // Core is loaded, start the GPU (makes the GPU contexts current to this thread) |
| 236 | system.GPU().Start(); | 237 | system.GPU().Start(); |
| 237 | 238 | ||
| 238 | system.Renderer().Rasterizer().LoadDiskResources(); | 239 | system.Renderer().Rasterizer().LoadDiskResources( |
| 240 | system.CurrentProcess()->GetTitleID(), false, | ||
| 241 | [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); | ||
| 239 | 242 | ||
| 240 | std::thread render_thread([&emu_window] { emu_window->Present(); }); | 243 | std::thread render_thread([&emu_window] { emu_window->Present(); }); |
| 241 | system.Run(); | 244 | system.Run(); |