summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp4
-rw-r--r--src/yuzu_cmd/default_ini.h6
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index d4ca6bb57..5af1ee6a8 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -451,8 +451,8 @@ void Config::ReadValues() {
451 ReadSetting("Renderer", Settings::values.fullscreen_mode); 451 ReadSetting("Renderer", Settings::values.fullscreen_mode);
452 ReadSetting("Renderer", Settings::values.aspect_ratio); 452 ReadSetting("Renderer", Settings::values.aspect_ratio);
453 ReadSetting("Renderer", Settings::values.max_anisotropy); 453 ReadSetting("Renderer", Settings::values.max_anisotropy);
454 ReadSetting("Renderer", Settings::values.use_frame_limit); 454 ReadSetting("Renderer", Settings::values.use_speed_limit);
455 ReadSetting("Renderer", Settings::values.frame_limit); 455 ReadSetting("Renderer", Settings::values.speed_limit);
456 ReadSetting("Renderer", Settings::values.use_disk_shader_cache); 456 ReadSetting("Renderer", Settings::values.use_disk_shader_cache);
457 ReadSetting("Renderer", Settings::values.gpu_accuracy); 457 ReadSetting("Renderer", Settings::values.gpu_accuracy);
458 ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); 458 ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation);
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index b2b2095d1..e646e2d2f 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -265,13 +265,13 @@ use_nvdec_emulation =
265# 0: Off, 1 (default): On 265# 0: Off, 1 (default): On
266accelerate_astc = 266accelerate_astc =
267 267
268# Turns on the frame limiter, which will limit frames output to the target game speed 268# Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value
269# 0: Off, 1: On (default) 269# 0: Off, 1: On (default)
270use_frame_limit = 270use_speed_limit =
271 271
272# Limits the speed of the game to run no faster than this value as a percentage of target speed 272# Limits the speed of the game to run no faster than this value as a percentage of target speed
273# 1 - 9999: Speed limit as a percentage of target game speed. 100 (default) 273# 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)
274frame_limit = 274speed_limit =
275 275
276# Whether to use disk based shader cache 276# Whether to use disk based shader cache
277# 0: Off, 1 (default): On 277# 0: Off, 1 (default): On
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 353e51ea7..ea3e0ada4 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -124,7 +124,7 @@ void EmuWindow_SDL2::OnResize() {
124 124
125void EmuWindow_SDL2::Fullscreen() { 125void EmuWindow_SDL2::Fullscreen() {
126 switch (Settings::values.fullscreen_mode.GetValue()) { 126 switch (Settings::values.fullscreen_mode.GetValue()) {
127 case 1: // Exclusive fullscreen 127 case Settings::FullscreenMode::Exclusive:
128 // Set window size to render size before entering fullscreen -- SDL does not resize to 128 // Set window size to render size before entering fullscreen -- SDL does not resize to
129 // display dimensions in this mode. 129 // display dimensions in this mode.
130 // TODO: Multiply the window size by resolution_factor (for both docked modes) 130 // TODO: Multiply the window size by resolution_factor (for both docked modes)
@@ -140,7 +140,7 @@ void EmuWindow_SDL2::Fullscreen() {
140 LOG_ERROR(Frontend, "Fullscreening failed: {}", SDL_GetError()); 140 LOG_ERROR(Frontend, "Fullscreening failed: {}", SDL_GetError());
141 LOG_INFO(Frontend, "Attempting to use borderless fullscreen..."); 141 LOG_INFO(Frontend, "Attempting to use borderless fullscreen...");
142 [[fallthrough]]; 142 [[fallthrough]];
143 case 0: // Borderless window 143 case Settings::FullscreenMode::Borderless:
144 if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN_DESKTOP) == 0) { 144 if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN_DESKTOP) == 0) {
145 return; 145 return;
146 } 146 }