Merge pull request #20 from Andrix44/fixes

Various fixes

externals/microprofile/microprofileui.h

@@ -1991,7 +1991,7 @@ const char* MicroProfileUIMenuGroups(int nIndex, bool* bSelected)
     else
     {
         nIndex = nIndex-1;
-        if(nIndex < UI.GroupMenuCount)
+        if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount)
         {
             MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
             static char buffer[MICROPROFILE_NAME_MAX_LEN+32];
@@ -2134,7 +2134,7 @@ const char* MicroProfileUIMenuCustom(int nIndex, bool* bSelected)
     case 1: return "--";
     default:
         nIndex -= 2;
-        if(nIndex < UI.nCustomCount)
+        if(static_cast<uint32_t>(nIndex) < UI.nCustomCount)
         {
             return UI.Custom[nIndex].pName;
         }
@@ -2184,7 +2184,7 @@ void MicroProfileUIClickGroups(int nIndex)
     else
     {
         nIndex -= 1;
-        if(nIndex < UI.GroupMenuCount)
+        if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount)
         {
             MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
             if(Item.nIsCategory)

src/yuzu/configuration/config.cpp

@@ -8,7 +8,6 @@
 #include "yuzu/configuration/config.h"
 #include "yuzu/ui_settings.h"
 
-
 Config::Config() {
     // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
     qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
@@ -88,7 +87,7 @@ void Config::ReadValues() {
     qt_config->endGroup();
 
     qt_config->beginGroup("Miscellaneous");
-    Settings::values.log_filter = qt_config->value("log_filter", "*:Trace").toString().toStdString();
+    Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString();
     qt_config->endGroup();
 
     qt_config->beginGroup("Debugging");

src/yuzu/configuration/configure_graphics.cpp

@@ -7,7 +7,6 @@
 #include "ui_configure_graphics.h"
 #include "yuzu/configuration/configure_graphics.h"
 
-
 ConfigureGraphics::ConfigureGraphics(QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGraphics) {
 
@@ -23,12 +22,6 @@ enum class Resolution : int {
     Scale2x,
     Scale3x,
     Scale4x,
-    Scale5x,
-    Scale6x,
-    Scale7x,
-    Scale8x,
-    Scale9x,
-    Scale10x,
 };
 
 float ToResolutionFactor(Resolution option) {
@@ -43,18 +36,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 +51,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;
 }

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>

src/yuzu_cmd/default_ini.h

@@ -90,8 +90,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.