diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.h | 2 | ||||
| -rw-r--r-- | src/core/telemetry_session.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/rasterizer_cache.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.ui | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 83b9a04c8..8f2da01c8 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -136,7 +136,7 @@ struct Values { | |||
| 136 | float resolution_factor; | 136 | float resolution_factor; |
| 137 | bool use_frame_limit; | 137 | bool use_frame_limit; |
| 138 | u16 frame_limit; | 138 | u16 frame_limit; |
| 139 | bool use_accurate_framebuffers; | 139 | bool use_accurate_gpu_emulation; |
| 140 | 140 | ||
| 141 | float bg_red; | 141 | float bg_red; |
| 142 | float bg_green; | 142 | float bg_green; |
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 7b04792b5..0de13edd3 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp | |||
| @@ -163,8 +163,8 @@ TelemetrySession::TelemetrySession() { | |||
| 163 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit", | 163 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit", |
| 164 | Settings::values.use_frame_limit); | 164 | Settings::values.use_frame_limit); |
| 165 | AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit); | 165 | AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit); |
| 166 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateFramebuffers", | 166 | AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateGpuEmulation", |
| 167 | Settings::values.use_accurate_framebuffers); | 167 | Settings::values.use_accurate_gpu_emulation); |
| 168 | AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode", | 168 | AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode", |
| 169 | Settings::values.use_docked_mode); | 169 | Settings::values.use_docked_mode); |
| 170 | } | 170 | } |
diff --git a/src/video_core/rasterizer_cache.h b/src/video_core/rasterizer_cache.h index 3ec01b967..0a3b3951e 100644 --- a/src/video_core/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache.h | |||
| @@ -119,8 +119,8 @@ protected: | |||
| 119 | auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer(); | 119 | auto& rasterizer = Core::System::GetInstance().Renderer().Rasterizer(); |
| 120 | rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), -1); | 120 | rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), -1); |
| 121 | 121 | ||
| 122 | // Only flush if use_accurate_framebuffers is enabled, as it incurs a performance hit | 122 | // Only flush if use_accurate_gpu_emulation is enabled, as it incurs a performance hit |
| 123 | if (Settings::values.use_accurate_framebuffers) { | 123 | if (Settings::values.use_accurate_gpu_emulation) { |
| 124 | FlushObject(object); | 124 | FlushObject(object); |
| 125 | } | 125 | } |
| 126 | 126 | ||
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 6ce183c25..468253033 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -638,8 +638,8 @@ void RasterizerOpenGL::FlushAll() {} | |||
| 638 | void RasterizerOpenGL::FlushRegion(VAddr addr, u64 size) { | 638 | void RasterizerOpenGL::FlushRegion(VAddr addr, u64 size) { |
| 639 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); | 639 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); |
| 640 | 640 | ||
| 641 | if (Settings::values.use_accurate_framebuffers) { | 641 | if (Settings::values.use_accurate_gpu_emulation) { |
| 642 | // Only flush if use_accurate_framebuffers is enabled, as it incurs a performance hit | 642 | // Only flush if use_accurate_gpu_emulation is enabled, as it incurs a performance hit |
| 643 | res_cache.FlushRegion(addr, size); | 643 | res_cache.FlushRegion(addr, size); |
| 644 | } | 644 | } |
| 645 | } | 645 | } |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index f79b4f221..1fddc1c26 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -1197,11 +1197,11 @@ Surface RasterizerCacheOpenGL::RecreateSurface(const Surface& old_surface, | |||
| 1197 | 1197 | ||
| 1198 | // If the format is the same, just do a framebuffer blit. This is significantly faster than | 1198 | // If the format is the same, just do a framebuffer blit. This is significantly faster than |
| 1199 | // using PBOs. The is also likely less accurate, as textures will be converted rather than | 1199 | // using PBOs. The is also likely less accurate, as textures will be converted rather than |
| 1200 | // reinterpreted. When use_accurate_framebuffers setting is enabled, perform a more accurate | 1200 | // reinterpreted. When use_accurate_gpu_emulation setting is enabled, perform a more accurate |
| 1201 | // surface copy, where pixels are reinterpreted as a new format (without conversion). This | 1201 | // surface copy, where pixels are reinterpreted as a new format (without conversion). This |
| 1202 | // code path uses OpenGL PBOs and is quite slow. | 1202 | // code path uses OpenGL PBOs and is quite slow. |
| 1203 | const bool is_blit{old_params.pixel_format == new_params.pixel_format || | 1203 | const bool is_blit{old_params.pixel_format == new_params.pixel_format || |
| 1204 | !Settings::values.use_accurate_framebuffers}; | 1204 | !Settings::values.use_accurate_gpu_emulation}; |
| 1205 | 1205 | ||
| 1206 | switch (new_params.target) { | 1206 | switch (new_params.target) { |
| 1207 | case SurfaceParams::SurfaceTarget::Texture2D: | 1207 | case SurfaceParams::SurfaceTarget::Texture2D: |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 7fec15991..71c6ebb41 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -85,8 +85,8 @@ void Config::ReadValues() { | |||
| 85 | Settings::values.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat(); | 85 | Settings::values.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat(); |
| 86 | Settings::values.use_frame_limit = qt_config->value("use_frame_limit", true).toBool(); | 86 | Settings::values.use_frame_limit = qt_config->value("use_frame_limit", true).toBool(); |
| 87 | Settings::values.frame_limit = qt_config->value("frame_limit", 100).toInt(); | 87 | Settings::values.frame_limit = qt_config->value("frame_limit", 100).toInt(); |
| 88 | Settings::values.use_accurate_framebuffers = | 88 | Settings::values.use_accurate_gpu_emulation = |
| 89 | qt_config->value("use_accurate_framebuffers", false).toBool(); | 89 | qt_config->value("use_accurate_gpu_emulation", false).toBool(); |
| 90 | 90 | ||
| 91 | Settings::values.bg_red = qt_config->value("bg_red", 0.0).toFloat(); | 91 | Settings::values.bg_red = qt_config->value("bg_red", 0.0).toFloat(); |
| 92 | Settings::values.bg_green = qt_config->value("bg_green", 0.0).toFloat(); | 92 | Settings::values.bg_green = qt_config->value("bg_green", 0.0).toFloat(); |
| @@ -233,7 +233,7 @@ void Config::SaveValues() { | |||
| 233 | qt_config->setValue("resolution_factor", (double)Settings::values.resolution_factor); | 233 | qt_config->setValue("resolution_factor", (double)Settings::values.resolution_factor); |
| 234 | qt_config->setValue("use_frame_limit", Settings::values.use_frame_limit); | 234 | qt_config->setValue("use_frame_limit", Settings::values.use_frame_limit); |
| 235 | qt_config->setValue("frame_limit", Settings::values.frame_limit); | 235 | qt_config->setValue("frame_limit", Settings::values.frame_limit); |
| 236 | qt_config->setValue("use_accurate_framebuffers", Settings::values.use_accurate_framebuffers); | 236 | qt_config->setValue("use_accurate_gpu_emulation", Settings::values.use_accurate_gpu_emulation); |
| 237 | 237 | ||
| 238 | // Cast to double because Qt's written float values are not human-readable | 238 | // Cast to double because Qt's written float values are not human-readable |
| 239 | qt_config->setValue("bg_red", (double)Settings::values.bg_red); | 239 | qt_config->setValue("bg_red", (double)Settings::values.bg_red); |
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index cd1549462..8290b4384 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp | |||
| @@ -75,7 +75,7 @@ void ConfigureGraphics::setConfiguration() { | |||
| 75 | static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor))); | 75 | static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor))); |
| 76 | ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); | 76 | ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); |
| 77 | ui->frame_limit->setValue(Settings::values.frame_limit); | 77 | ui->frame_limit->setValue(Settings::values.frame_limit); |
| 78 | ui->use_accurate_framebuffers->setChecked(Settings::values.use_accurate_framebuffers); | 78 | ui->use_accurate_gpu_emulation->setChecked(Settings::values.use_accurate_gpu_emulation); |
| 79 | bg_color = QColor::fromRgbF(Settings::values.bg_red, Settings::values.bg_green, | 79 | bg_color = QColor::fromRgbF(Settings::values.bg_red, Settings::values.bg_green, |
| 80 | Settings::values.bg_blue); | 80 | Settings::values.bg_blue); |
| 81 | ui->bg_button->setStyleSheet( | 81 | ui->bg_button->setStyleSheet( |
| @@ -87,7 +87,7 @@ void ConfigureGraphics::applyConfiguration() { | |||
| 87 | ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex())); | 87 | ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex())); |
| 88 | Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked(); | 88 | Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked(); |
| 89 | Settings::values.frame_limit = ui->frame_limit->value(); | 89 | Settings::values.frame_limit = ui->frame_limit->value(); |
| 90 | Settings::values.use_accurate_framebuffers = ui->use_accurate_framebuffers->isChecked(); | 90 | Settings::values.use_accurate_gpu_emulation = ui->use_accurate_gpu_emulation->isChecked(); |
| 91 | Settings::values.bg_red = static_cast<float>(bg_color.redF()); | 91 | Settings::values.bg_red = static_cast<float>(bg_color.redF()); |
| 92 | Settings::values.bg_green = static_cast<float>(bg_color.greenF()); | 92 | Settings::values.bg_green = static_cast<float>(bg_color.greenF()); |
| 93 | Settings::values.bg_blue = static_cast<float>(bg_color.blueF()); | 93 | Settings::values.bg_blue = static_cast<float>(bg_color.blueF()); |
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 8fc00af1b..91fcad994 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | </layout> | 50 | </layout> |
| 51 | </item> | 51 | </item> |
| 52 | <item> | 52 | <item> |
| 53 | <widget class="QCheckBox" name="use_accurate_framebuffers"> | 53 | <widget class="QCheckBox" name="use_accurate_gpu_emulation"> |
| 54 | <property name="text"> | 54 | <property name="text"> |
| 55 | <string>Use accurate framebuffers (slow)</string> | 55 | <string>Use accurate GPU emulation (slow)</string> |
| 56 | </property> | 56 | </property> |
| 57 | </widget> | 57 | </widget> |
| 58 | </item> | 58 | </item> |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 2470f4640..5e42e48b2 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -99,8 +99,8 @@ void Config::ReadValues() { | |||
| 99 | Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true); | 99 | Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true); |
| 100 | Settings::values.frame_limit = | 100 | Settings::values.frame_limit = |
| 101 | static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); | 101 | static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); |
| 102 | Settings::values.use_accurate_framebuffers = | 102 | Settings::values.use_accurate_gpu_emulation = |
| 103 | sdl2_config->GetBoolean("Renderer", "use_accurate_framebuffers", false); | 103 | sdl2_config->GetBoolean("Renderer", "use_accurate_gpu_emulation", false); |
| 104 | 104 | ||
| 105 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0); | 105 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0); |
| 106 | Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 0.0); | 106 | Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 0.0); |
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 762396e3b..a97b75f7b 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -110,9 +110,9 @@ use_frame_limit = | |||
| 110 | # 1 - 9999: Speed limit as a percentage of target game speed. 100 (default) | 110 | # 1 - 9999: Speed limit as a percentage of target game speed. 100 (default) |
| 111 | frame_limit = | 111 | frame_limit = |
| 112 | 112 | ||
| 113 | # Whether to use accurate framebuffers | 113 | # Whether to use accurate GPU emulation |
| 114 | # 0 (default): Off (fast), 1 : On (slow) | 114 | # 0 (default): Off (fast), 1 : On (slow) |
| 115 | use_accurate_framebuffers = | 115 | use_accurate_gpu_emulation = |
| 116 | 116 | ||
| 117 | # The clear color for the renderer. What shows up on the sides of the bottom screen. | 117 | # The clear color for the renderer. What shows up on the sides of the bottom screen. |
| 118 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. | 118 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. |