yuzu: Remove unused birthday setting

Fixes #2522.
Merge pull request #2519 from lioncash/sign
2019-05-29 23:31:55 +02:00 · 2019-05-27 12:26:17 -04:00 · 2019-05-27 12:25:59 -04:00 · 2019-05-27 00:55:57 -03:00 · 2019-05-27 00:51:35 -03:00 · 2019-05-25 17:01:18 -04:00
8 changed files with 63 additions and 190 deletions
@@ -14,11 +14,11 @@ namespace Core::Timing {
 constexpr u64 MAX_VALUE_TO_MULTIPLY = std::numeric_limits<s64>::max() / BASE_CLOCK_RATE;

 s64 usToCycles(s64 us) {
-    if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) {
+    if (static_cast<u64>(us / 1000000) > MAX_VALUE_TO_MULTIPLY) {
        LOG_ERROR(Core_Timing, "Integer overflow, use max value");
        return std::numeric_limits<s64>::max();
    }
-    if (us > MAX_VALUE_TO_MULTIPLY) {
+    if (static_cast<u64>(us) > MAX_VALUE_TO_MULTIPLY) {
        LOG_DEBUG(Core_Timing, "Time very big, do rounding");
        return BASE_CLOCK_RATE * (us / 1000000);
    }
@@ -38,11 +38,11 @@ s64 usToCycles(u64 us) {
 }

 s64 nsToCycles(s64 ns) {
-    if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
+    if (static_cast<u64>(ns / 1000000000) > MAX_VALUE_TO_MULTIPLY) {
        LOG_ERROR(Core_Timing, "Integer overflow, use max value");
        return std::numeric_limits<s64>::max();
    }
-    if (ns > MAX_VALUE_TO_MULTIPLY) {
+    if (static_cast<u64>(ns) > MAX_VALUE_TO_MULTIPLY) {
        LOG_DEBUG(Core_Timing, "Time very big, do rounding");
        return BASE_CLOCK_RATE * (ns / 1000000000);
    }
@@ -39,7 +39,7 @@ std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
    const std::vector<u8> uncompressed_data =
        Common::Compression::DecompressDataLZ4(compressed_data, header.size);

-    ASSERT_MSG(uncompressed_data.size() == static_cast<int>(header.size), "{} != {}", header.size,
+    ASSERT_MSG(uncompressed_data.size() == header.size, "{} != {}", header.size,
               uncompressed_data.size());

    return uncompressed_data;
@@ -35,6 +35,7 @@ Device::Device(std::nullptr_t) {

 bool Device::TestVariableAoffi() {
    const GLchar* AOFFI_TEST = R"(#version 430 core
+// This is a unit test, please ignore me on apitrace bug reports.
 uniform sampler2D tex;
 uniform ivec2 variable_offset;
 void main() {
@@ -170,7 +170,8 @@ GLShader::ProgramResult CreateProgram(const Device& device, Maxwell::ShaderProgr
 CachedProgram SpecializeShader(const std::string& code, const GLShader::ShaderEntries& entries,
                               Maxwell::ShaderProgram program_type, BaseBindings base_bindings,
                               GLenum primitive_mode, bool hint_retrievable = false) {
-    std::string source = "#version 430 core\n";
+    std::string source = "#version 430 core\n"
+                         "#extension GL_ARB_separate_shader_objects : enable\n\n";
    source += fmt::format("#define EMULATION_UBO_BINDING {}\n", base_bindings.cbuf++);

    for (const auto& cbuf : entries.const_buffers) {
@@ -19,8 +19,7 @@ static constexpr u32 PROGRAM_OFFSET{10};
 ProgramResult GenerateVertexShader(const Device& device, const ShaderSetup& setup) {
    const std::string id = fmt::format("{:016x}", setup.program.unique_identifier);

-    std::string out = "#extension GL_ARB_separate_shader_objects : enable\n\n";
-    out += "// Shader Unique Id: VS" + id + "\n\n";
+    std::string out = "// Shader Unique Id: VS" + id + "\n\n";
    out += GetCommonDeclarations();

    out += R"(
@@ -82,8 +81,7 @@ void main() {
 ProgramResult GenerateGeometryShader(const Device& device, const ShaderSetup& setup) {
    const std::string id = fmt::format("{:016x}", setup.program.unique_identifier);

-    std::string out = "#extension GL_ARB_separate_shader_objects : enable\n\n";
-    out += "// Shader Unique Id: GS" + id + "\n\n";
+    std::string out = "// Shader Unique Id: GS" + id + "\n\n";
    out += GetCommonDeclarations();

    out += R"(
@@ -113,8 +111,7 @@ void main() {
 ProgramResult GenerateFragmentShader(const Device& device, const ShaderSetup& setup) {
    const std::string id = fmt::format("{:016x}", setup.program.unique_identifier);

-    std::string out = "#extension GL_ARB_separate_shader_objects : enable\n\n";
-    out += "// Shader Unique Id: FS" + id + "\n\n";
+    std::string out = "// Shader Unique Id: FS" + id + "\n\n";
    out += GetCommonDeclarations();

    out += R"(
@@ -16,28 +16,8 @@
 #include "ui_configure_system.h"
 #include "yuzu/configuration/configure_system.h"

-namespace {
-constexpr std::array<int, 12> days_in_month = {{
-    31,
-    29,
-    31,
-    30,
-    31,
-    30,
-    31,
-    31,
-    30,
-    31,
-    30,
-    31,
-}};
-} // Anonymous namespace
-
 ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
    ui->setupUi(this);
-    connect(ui->combo_birthmonth,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
-            &ConfigureSystem::UpdateBirthdayComboBox);
    connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
            &ConfigureSystem::RefreshConsoleID);

@@ -101,31 +81,6 @@ void ConfigureSystem::applyConfiguration() {
    Settings::Apply();
 }

-void ConfigureSystem::UpdateBirthdayComboBox(int birthmonth_index) {
-    if (birthmonth_index < 0 || birthmonth_index >= 12)
-        return;
-
-    // store current day selection
-    int birthday_index = ui->combo_birthday->currentIndex();
-
-    // get number of days in the new selected month
-    int days = days_in_month[birthmonth_index];
-
-    // if the selected day is out of range,
-    // reset it to 1st
-    if (birthday_index < 0 || birthday_index >= days)
-        birthday_index = 0;
-
-    // update the day combo box
-    ui->combo_birthday->clear();
-    for (int i = 1; i <= days; ++i) {
-        ui->combo_birthday->addItem(QString::number(i));
-    }
-
-    // restore the day selection
-    ui->combo_birthday->setCurrentIndex(birthday_index);
-}
-
 void ConfigureSystem::RefreshConsoleID() {
    QMessageBox::StandardButton reply;
    QString warning_text = tr("This will replace your current virtual Switch with a new one. "
@@ -26,14 +26,11 @@ public:
 private:
    void ReadSystemSettings();

-    void UpdateBirthdayComboBox(int birthmonth_index);
    void RefreshConsoleID();

    std::unique_ptr<Ui::ConfigureSystem> ui;
    bool enabled = false;

-    int birthmonth = 0;
-    int birthday = 0;
    int language_index = 0;
    int sound_index = 0;
 };
@@ -22,14 +22,21 @@
        <string>System Settings</string>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-        <item row="2" column="0">
+        <item row="1" column="0">
         <widget class="QLabel" name="label_sound">
          <property name="text">
           <string>Sound output mode</string>
          </property>
         </widget>
        </item>
-        <item row="1" column="1">
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_console_id">
+          <property name="text">
+           <string>Console ID:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
         <widget class="QComboBox" name="combo_language">
          <property name="toolTip">
           <string>Note: this can be overridden when region setting is auto-select</string>
@@ -121,108 +128,14 @@
          </item>
         </widget>
        </item>
-        <item row="0" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_birthday2">
-          <item>
-           <widget class="QComboBox" name="combo_birthmonth">
-            <item>
-             <property name="text">
-              <string>January</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>February</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>March</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>April</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>May</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>June</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>July</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>August</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>September</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>October</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>November</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>December</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="combo_birthday"/>
-          </item>
-         </layout>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_console_id">
+        <item row="4" column="0">
+         <widget class="QCheckBox" name="rng_seed_checkbox">
          <property name="text">
-           <string>Console ID:</string>
+           <string>RNG Seed</string>
          </property>
         </widget>
        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_birthday">
-          <property name="text">
-           <string>Birthday</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="QPushButton" name="button_regenerate_console_id">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="layoutDirection">
-           <enum>Qt::RightToLeft</enum>
-          </property>
-          <property name="text">
-           <string>Regenerate</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
+        <item row="1" column="1">
         <widget class="QComboBox" name="combo_sound">
          <item>
           <property name="text">
@@ -241,21 +154,51 @@
          </item>
         </widget>
        </item>
-        <item row="5" column="0">
-         <widget class="QCheckBox" name="rng_seed_checkbox">
-          <property name="text">
-           <string>RNG Seed</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
+        <item row="0" column="0">
         <widget class="QLabel" name="label_language">
          <property name="text">
           <string>Language</string>
          </property>
         </widget>
        </item>
-        <item row="5" column="1">
+        <item row="2" column="1">
+         <widget class="QPushButton" name="button_regenerate_console_id">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="text">
+           <string>Regenerate</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QCheckBox" name="custom_rtc_checkbox">
+          <property name="text">
+           <string>Custom RTC</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QDateTimeEdit" name="custom_rtc_edit">
+          <property name="minimumDate">
+           <date>
+            <year>1970</year>
+            <month>1</month>
+            <day>1</day>
+           </date>
+          </property>
+          <property name="displayFormat">
+           <string>d MMM yyyy h:mm:ss AP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
         <widget class="QLineEdit" name="rng_seed_edit">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -276,27 +219,6 @@
          </property>
         </widget>
        </item>
-        <item row="4" column="0">
-         <widget class="QCheckBox" name="custom_rtc_checkbox">
-          <property name="text">
-           <string>Custom RTC</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QDateTimeEdit" name="custom_rtc_edit">
-          <property name="minimumDate">
-           <date>
-            <year>1970</year>
-            <month>1</month>
-            <day>1</day>
-           </date>
-          </property>
-          <property name="displayFormat">
-           <string>d MMM yyyy h:mm:ss AP</string>
-          </property>
-         </widget>
-        </item>
       </layout>
      </widget>
     </item>
Author	SHA1	Message	Date
fearlessTobi	d9c1b94f03	yuzu: Remove unused birthday setting Fixes #2522.	2019-05-29 23:31:55 +02:00
bunnei	cfd885163f	Merge pull request #2519 from lioncash/sign loader/nso, core/core_timing_util: Silence sign-comparison warning	2019-05-27 12:26:17 -04:00
bunnei	2eb4d27c48	Merge pull request #2524 from ReinUsesLisp/fixup-extension gl_shader_gen: Always declare extensions after the version declaration	2019-05-27 12:25:59 -04:00
ReinUsesLisp	21c0b4dec8	gl_device: Add commentary to AOFFI unit test source code The intention behind this commit is to hint someone inspecting an apitrace dump to ignore this ill-formed GLSL code.	2019-05-27 00:55:57 -03:00
ReinUsesLisp	84928e6d67	gl_shader_gen: Always declare extensions after the version declaration This addresses a bug on geometry shaders where code was being written before all #extension declarations were done. Ref to #2523	2019-05-27 00:51:35 -03:00
Lioncash	0fa039d8d0	core_timing_util: Silence sign-comparison warnings We can just make the conversion explicit instead of implicit here to silence -Wsign-compare warnings.	2019-05-25 17:01:18 -04:00
Lioncash	e5159cfb84	loader/nso: Silence sign-comparison warning This was previously performing a size_t == int comparison. Silences a -Wsign-compare warning.	2019-05-25 16:53:33 -04:00