3 files changed, 7 insertions, 67 deletions
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 5f91d5492..081819812 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 489156805..366931a9a 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>
+              <string>4x Native (5120x2880)</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>
             </property>
            </item>
           </widget>
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index e7941eceb..11ed1237a 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
+# 0: Auto (scales resolution to window size), 1: Native Switch screen resolution, Otherwise a scale
-# factor for the 3DS resolution
+# factor for the Switch resolution
 resolution_factor =
 # Whether to enable V-Sync (caps the framerate at 60FPS) or not.

diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 5f91d5492..081819812 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -23,12 +23,6 @@ enum class Resolution : int {
23	Scale2x,	23	Scale2x,
24	Scale3x,	24	Scale3x,
25	Scale4x,	25	Scale4x,
26	Scale5x,
27	Scale6x,
28	Scale7x,
29	Scale8x,
30	Scale9x,
31	Scale10x,
32	};	26	};
33		27
34	float ToResolutionFactor(Resolution option) {	28	float ToResolutionFactor(Resolution option) {
@@ -43,18 +37,6 @@ float ToResolutionFactor(Resolution option) {
43	return 3.f;	37	return 3.f;
44	case Resolution::Scale4x:	38	case Resolution::Scale4x:
45	return 4.f;	39	return 4.f;
46	case Resolution::Scale5x:
47	return 5.f;
48	case Resolution::Scale6x:
49	return 6.f;
50	case Resolution::Scale7x:
51	return 7.f;
52	case Resolution::Scale8x:
53	return 8.f;
54	case Resolution::Scale9x:
55	return 9.f;
56	case Resolution::Scale10x:
57	return 10.f;
58	}	40	}
59	return 0.f;	41	return 0.f;
60	}	42	}
@@ -70,18 +52,6 @@ Resolution FromResolutionFactor(float factor) {
70	return Resolution::Scale3x;	52	return Resolution::Scale3x;
71	} else if (factor == 4.f) {	53	} else if (factor == 4.f) {
72	return Resolution::Scale4x;	54	return Resolution::Scale4x;
73	} else if (factor == 5.f) {
74	return Resolution::Scale5x;
75	} else if (factor == 6.f) {
76	return Resolution::Scale6x;
77	} else if (factor == 7.f) {
78	return Resolution::Scale7x;
79	} else if (factor == 8.f) {
80	return Resolution::Scale8x;
81	} else if (factor == 9.f) {
82	return Resolution::Scale9x;
83	} else if (factor == 10.f) {
84	return Resolution::Scale10x;
85	}	55	}
86	return Resolution::Auto;	56	return Resolution::Auto;
87	}	57	}


diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 489156805..366931a9a 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui
@@ -34,7 +34,7 @@
34	<item>	34	<item>
35	<widget class="QLabel" name="label">	35	<widget class="QLabel" name="label">
36	<property name="text">	36	<property name="text">
37	<string>Internal Resolution:</string>	37	<string>Internal Resolution:(Currently does nothing.)</string>
38	</property>	38	</property>
39	</widget>	39	</widget>
40	</item>	40	</item>
@@ -47,52 +47,22 @@
47	</item>	47	</item>
48	<item>	48	<item>
49	<property name="text">	49	<property name="text">
50	<string>Native (400x240)</string>	50	<string>Native (1280x720)</string>
51	</property>	51	</property>
52	</item>	52	</item>
53	<item>	53	<item>
54	<property name="text">	54	<property name="text">
55	<string>2x Native (800x480)</string>	55	<string>2x Native (2560x1440)</string>
56	</property>	56	</property>
57	</item>	57	</item>
58	<item>	58	<item>
59	<property name="text">	59	<property name="text">
60	<string>3x Native (1200x720)</string>	60	<string>3x Native (3840x2160)</string>
61	</property>	61	</property>
62	</item>	62	</item>
63	<item>	63	<item>
64	<property name="text">	64	<property name="text">
65	<string>4x Native (1600x960)</string>	65	<string>4x Native (5120x2880)</string>
66	</property>
67	</item>
68	<item>
69	<property name="text">
70	<string>5x Native (2000x1200)</string>
71	</property>
72	</item>
73	<item>
74	<property name="text">
75	<string>6x Native (2400x1440)</string>
76	</property>
77	</item>
78	<item>
79	<property name="text">
80	<string>7x Native (2800x1680)</string>
81	</property>
82	</item>
83	<item>
84	<property name="text">
85	<string>8x Native (3200x1920)</string>
86	</property>
87	</item>
88	<item>
89	<property name="text">
90	<string>9x Native (3600x2160)</string>
91	</property>
92	</item>
93	<item>
94	<property name="text">
95	<string>10x Native (4000x2400)</string>
96	</property>	66	</property>
97	</item>	67	</item>
98	</widget>	68	</widget>


diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index e7941eceb..11ed1237a 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h
@@ -81,8 +81,8 @@ use_hw_renderer =
81	use_shader_jit =	81	use_shader_jit =
82		82
83	# Resolution scale factor	83	# Resolution scale factor
84	# 0: Auto (scales resolution to window size), 1: Native 3DS screen resolution, Otherwise a scale	84	# 0: Auto (scales resolution to window size), 1: Native Switch screen resolution, Otherwise a scale
85	# factor for the 3DS resolution	85	# factor for the Switch resolution
86	resolution_factor =	86	resolution_factor =
87		87
88	# Whether to enable V-Sync (caps the framerate at 60FPS) or not.	88	# Whether to enable V-Sync (caps the framerate at 60FPS) or not.