From 8d17aa40fdb4c7f25e0ba96e90a682270515cc57 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Mon, 16 Sep 2019 20:45:47 -0600
Subject: [PATCH] Remove vsync setting

---
 src/citra/config.cpp                  | 1 -
 src/citra/default_ini.h               | 4 ----
 src/citra_qt/configuration/config.cpp | 2 --
 src/core/settings.cpp                 | 1 -
 src/core/settings.h                   | 1 -
 src/core/telemetry_session.cpp        | 1 -
 6 files changed, 10 deletions(-)

diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 1b18f4536..297465f92 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -120,7 +120,6 @@ void Config::ReadValues() {
     Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true);
     Settings::values.resolution_factor =
         static_cast<u16>(sdl2_config->GetInteger("Renderer", "resolution_factor", 1));
-    Settings::values.vsync_enabled = sdl2_config->GetBoolean("Renderer", "vsync_enabled", false);
     Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true);
     Settings::values.frame_limit =
         static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100));
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 2b6aa2147..2ca725438 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -117,10 +117,6 @@ use_shader_jit =
 # factor for the 3DS resolution
 resolution_factor =
 
-# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
-# 0 (default): Off, 1: On
-vsync_enabled =
-
 # Turns on the frame limiter, which will limit frames output to the target game speed
 # 0: Off, 1: On (default)
 use_frame_limit =
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index feed246b4..26034dbe6 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -430,7 +430,6 @@ void Config::ReadRendererValues() {
     Settings::values.use_shader_jit = ReadSetting(QStringLiteral("use_shader_jit"), true).toBool();
     Settings::values.resolution_factor =
         static_cast<u16>(ReadSetting(QStringLiteral("resolution_factor"), 1).toInt());
-    Settings::values.vsync_enabled = ReadSetting(QStringLiteral("vsync_enabled"), false).toBool();
     Settings::values.use_frame_limit =
         ReadSetting(QStringLiteral("use_frame_limit"), true).toBool();
     Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt();
@@ -857,7 +856,6 @@ void Config::SaveRendererValues() {
                  false);
     WriteSetting(QStringLiteral("use_shader_jit"), Settings::values.use_shader_jit, true);
     WriteSetting(QStringLiteral("resolution_factor"), Settings::values.resolution_factor, 1);
-    WriteSetting(QStringLiteral("vsync_enabled"), Settings::values.vsync_enabled, false);
     WriteSetting(QStringLiteral("use_frame_limit"), Settings::values.use_frame_limit, true);
     WriteSetting(QStringLiteral("frame_limit"), Settings::values.frame_limit, 100);
 
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 079d276d0..40cec0029 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -78,7 +78,6 @@ void LogSettings() {
     LogSetting("Renderer_ShadersAccurateMul", Settings::values.shaders_accurate_mul);
     LogSetting("Renderer_UseShaderJit", Settings::values.use_shader_jit);
     LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
-    LogSetting("Renderer_VsyncEnabled", Settings::values.vsync_enabled);
     LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
     LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
     LogSetting("Renderer_PostProcessingShader", Settings::values.pp_shader_name);
diff --git a/src/core/settings.h b/src/core/settings.h
index 213cc3ec3..0d391afba 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -144,7 +144,6 @@ struct Values {
     bool shaders_accurate_mul;
     bool use_shader_jit;
     u16 resolution_factor;
-    bool vsync_enabled;
     bool use_frame_limit;
     u16 frame_limit;
 
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 274257eab..e9ec39b76 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -192,7 +192,6 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader) {
              Settings::values.shaders_accurate_mul);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_UseShaderJit",
              Settings::values.use_shader_jit);
-    AddField(Telemetry::FieldType::UserConfig, "Renderer_UseVsync", Settings::values.vsync_enabled);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_FilterMode", Settings::values.filter_mode);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_Render3d",
              static_cast<int>(Settings::values.render_3d));