From 27960d8c2cfbe4188584f0186b56ea8806f9e223 Mon Sep 17 00:00:00 2001
From: unknown <katisx1@citromail.hu>
Date: Mon, 15 Jan 2018 16:59:02 +0100
Subject: [PATCH] Update the internal resolution settings

---
 src/yuzu/configuration/configure_graphics.cpp | 30 --------------
 src/yuzu/configuration/configure_graphics.ui  | 40 +++----------------
 src/yuzu_cmd/default_ini.h                    |  4 +-
 3 files changed, 7 insertions(+), 67 deletions(-)

diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 5f91d54925..081819812e 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -23,12 +23,6 @@ enum class Resolution : int {
     Scale2x,
     Scale3x,
     Scale4x,
-    Scale5x,
-    Scale6x,
-    Scale7x,
-    Scale8x,
-    Scale9x,
-    Scale10x,
 };
 
 float ToResolutionFactor(Resolution option) {
@@ -43,18 +37,6 @@ float ToResolutionFactor(Resolution option) {
         return 3.f;
     case Resolution::Scale4x:
         return 4.f;
-    case Resolution::Scale5x:
-        return 5.f;
-    case Resolution::Scale6x:
-        return 6.f;
-    case Resolution::Scale7x:
-        return 7.f;
-    case Resolution::Scale8x:
-        return 8.f;
-    case Resolution::Scale9x:
-        return 9.f;
-    case Resolution::Scale10x:
-        return 10.f;
     }
     return 0.f;
 }
@@ -70,18 +52,6 @@ Resolution FromResolutionFactor(float factor) {
         return Resolution::Scale3x;
     } else if (factor == 4.f) {
         return Resolution::Scale4x;
-    } else if (factor == 5.f) {
-        return Resolution::Scale5x;
-    } else if (factor == 6.f) {
-        return Resolution::Scale6x;
-    } else if (factor == 7.f) {
-        return Resolution::Scale7x;
-    } else if (factor == 8.f) {
-        return Resolution::Scale8x;
-    } else if (factor == 9.f) {
-        return Resolution::Scale9x;
-    } else if (factor == 10.f) {
-        return Resolution::Scale10x;
     }
     return Resolution::Auto;
 }
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 4891568056..366931a9ac 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -34,7 +34,7 @@
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
-             <string>Internal Resolution:</string>
+             <string>Internal Resolution:(Currently does nothing.)</string>
             </property>
            </widget>
           </item>
@@ -47,52 +47,22 @@
             </item>
             <item>
              <property name="text">
-              <string>Native (400x240)</string>
+              <string>Native (1280x720)</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>2x Native (800x480)</string>
+              <string>2x Native (2560x1440)</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>3x Native (1200x720)</string>
+              <string>3x Native (3840x2160)</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>4x Native (1600x960)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>5x Native (2000x1200)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>6x Native (2400x1440)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>7x Native (2800x1680)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>8x Native (3200x1920)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>9x Native (3600x2160)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>10x Native (4000x2400)</string>
+              <string>4x Native (5120x2880)</string>
              </property>
             </item>
            </widget>
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index e7941ecebb..11ed1237a2 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -81,8 +81,8 @@ use_hw_renderer =
 use_shader_jit =
 
 # Resolution scale factor
-# 0: Auto (scales resolution to window size), 1: Native 3DS screen resolution, Otherwise a scale
-# factor for the 3DS resolution
+# 0: Auto (scales resolution to window size), 1: Native Switch screen resolution, Otherwise a scale
+# factor for the Switch resolution
 resolution_factor =
 
 # Whether to enable V-Sync (caps the framerate at 60FPS) or not.