summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorGravatar lat9nq2021-07-25 15:31:33 -0400
committerGravatar GitHub2021-07-25 15:31:33 -0400
commit09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch)
tree72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/yuzu_cmd/yuzu.cpp
parentconfiguration: Use combobox apply template where possible (diff)
parentMerge pull request #6575 from FernandoS27/new_settings (diff)
downloadyuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.gz
yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.xz
yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.zip
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r--src/yuzu_cmd/yuzu.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index ac4ea88d3..35ce23696 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -218,9 +218,11 @@ int main(int argc, char** argv) {
218 // Core is loaded, start the GPU (makes the GPU contexts current to this thread) 218 // Core is loaded, start the GPU (makes the GPU contexts current to this thread)
219 system.GPU().Start(); 219 system.GPU().Start();
220 220
221 system.Renderer().ReadRasterizer()->LoadDiskResources( 221 if (Settings::values.use_disk_shader_cache.GetValue()) {
222 system.CurrentProcess()->GetTitleID(), std::stop_token{}, 222 system.Renderer().ReadRasterizer()->LoadDiskResources(
223 [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); 223 system.CurrentProcess()->GetTitleID(), std::stop_token{},
224 [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
225 }
224 226
225 void(system.Run()); 227 void(system.Run());
226 while (emu_window->IsOpen()) { 228 while (emu_window->IsOpen()) {