diff options
| author | 2019-02-06 21:47:20 -0500 | |
|---|---|---|
| committer | 2019-02-06 21:47:20 -0500 | |
| commit | e09f1c92fb6f0b061f875617196f2463b1937546 (patch) | |
| tree | dddd4ab0851516f67c11d1121e8f233c9f0bafd3 /src/core | |
| parent | Merge pull request #2042 from ReinUsesLisp/nouveau-tex (diff) | |
| parent | cmake: Fix title bar issue (diff) | |
| download | yuzu-e09f1c92fb6f0b061f875617196f2463b1937546.tar.gz yuzu-e09f1c92fb6f0b061f875617196f2463b1937546.tar.xz yuzu-e09f1c92fb6f0b061f875617196f2463b1937546.zip | |
Merge pull request #2021 from ReinUsesLisp/disk-cache
gl_shader_cache: Disk based shader cache
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 3 | ||||
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/core/telemetry_session.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 572814e4b..1dd576c26 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -123,7 +123,7 @@ struct System::Impl { | |||
| 123 | Service::Init(service_manager, *virtual_filesystem); | 123 | Service::Init(service_manager, *virtual_filesystem); |
| 124 | GDBStub::Init(); | 124 | GDBStub::Init(); |
| 125 | 125 | ||
| 126 | renderer = VideoCore::CreateRenderer(emu_window); | 126 | renderer = VideoCore::CreateRenderer(emu_window, system); |
| 127 | if (!renderer->Init()) { | 127 | if (!renderer->Init()) { |
| 128 | return ResultStatus::ErrorVideoCore; | 128 | return ResultStatus::ErrorVideoCore; |
| 129 | } | 129 | } |
| @@ -175,6 +175,7 @@ struct System::Impl { | |||
| 175 | return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) + | 175 | return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) + |
| 176 | static_cast<u32>(load_result)); | 176 | static_cast<u32>(load_result)); |
| 177 | } | 177 | } |
| 178 | |||
| 178 | status = ResultStatus::Success; | 179 | status = ResultStatus::Success; |
| 179 | return status; | 180 | return status; |
| 180 | } | 181 | } |
diff --git a/src/core/settings.h b/src/core/settings.h index c97387fc7..7e76e0466 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -391,6 +391,7 @@ struct Values { | |||
| 391 | float resolution_factor; | 391 | float resolution_factor; |
| 392 | bool use_frame_limit; | 392 | bool use_frame_limit; |
| 393 | u16 frame_limit; | 393 | u16 frame_limit; |
| 394 | bool use_disk_shader_cache; | ||
| 394 | bool use_accurate_gpu_emulation; | 395 | bool use_accurate_gpu_emulation; |
| 395 | 396 | ||
| 396 | float bg_red; | 397 | float bg_red; |
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 09ed74d78..58dfcc4df 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp | |||
| @@ -158,6 +158,8 @@ TelemetrySession::TelemetrySession() { | |||
| 158 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit", | 158 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit", |
| 159 | Settings::values.use_frame_limit); | 159 | Settings::values.use_frame_limit); |
| 160 | AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit); | 160 | AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit); |
| 161 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseDiskShaderCache", | ||
| 162 | Settings::values.use_disk_shader_cache); | ||
| 161 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateGpuEmulation", | 163 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateGpuEmulation", |
| 162 | Settings::values.use_accurate_gpu_emulation); | 164 | Settings::values.use_accurate_gpu_emulation); |
| 163 | AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode", | 165 | AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode", |