CMakeLists: Update boost to 1.79.0

This version of boost brings in a number of bug fixes, especially to the asio library. Details can be seen here: https://www.boost.org/users/history/version_1_79_0.html
Merge pull request #8348 from JakobDev/metainfocontrol
2022-05-29 21:00:40 -04:00 · 2022-05-29 14:16:27 -07:00 · 2022-05-29 02:33:24 -07:00 · 2022-05-29 02:32:40 -07:00 · 2022-05-17 08:40:06 +02:00 · 2022-05-16 05:42:38 -07:00
9 changed files with 44 additions and 24 deletions
@@ -218,8 +218,8 @@ if (Boost_FOUND)
        list(APPEND Boost_LIBRARIES Boost::context)
    endif()
 else()
-    message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
-    list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0")
+    message(STATUS "Boost 1.79.0 or newer not found, falling back to Conan")
+    list(APPEND CONAN_REQUIRED_LIBS "boost/1.79.0")
 endif()

 # Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
@@ -32,6 +32,11 @@
    <binary>yuzu</binary>
    <binary>yuzu-cmd</binary>
  </provides>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>gamepad</control>
+  </supports>
  <requires>
    <memory>8192</memory>
  </requires>
@@ -129,17 +129,17 @@ s32 ToS32(float sample) {
    return static_cast<s32>(rescaled_sample);
 }

-constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_1CH{0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+constexpr std::array<u8, 20> REVERB_TAP_INDEX_1CH{0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

-constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_2CH{0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
-                                                           1, 1, 1, 0, 0, 0, 0, 1, 1, 1};
+constexpr std::array<u8, 20> REVERB_TAP_INDEX_2CH{0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
+                                                  1, 1, 1, 0, 0, 0, 0, 1, 1, 1};

-constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_4CH{0, 0, 0, 1, 1, 1, 1, 2, 2, 2,
-                                                           1, 1, 1, 0, 0, 0, 0, 3, 3, 3};
+constexpr std::array<u8, 20> REVERB_TAP_INDEX_4CH{0, 0, 0, 1, 1, 1, 1, 2, 2, 2,
+                                                  1, 1, 1, 0, 0, 0, 0, 3, 3, 3};

-constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_6CH{4, 0, 0, 1, 1, 1, 1, 2, 2, 2,
-                                                           1, 1, 1, 0, 0, 0, 0, 3, 3, 3};
+constexpr std::array<u8, 20> REVERB_TAP_INDEX_6CH{4, 0, 0, 1, 1, 1, 1, 2, 2, 2,
+                                                  1, 1, 1, 0, 0, 0, 0, 3, 3, 3};

 template <std::size_t CHANNEL_COUNT>
 void ApplyReverbGeneric(
@@ -110,10 +110,9 @@ static constexpr s64 GetLeapDaysFromYear(s64 year) {
    }
 }

-static constexpr int GetMonthLength(bool is_leap_year, int month) {
-    constexpr std::array<int, 12> month_lengths{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-    constexpr std::array<int, 12> month_lengths_leap{31, 29, 31, 30, 31, 30,
-                                                     31, 31, 30, 31, 30, 31};
+static constexpr s8 GetMonthLength(bool is_leap_year, int month) {
+    constexpr std::array<s8, 12> month_lengths{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+    constexpr std::array<s8, 12> month_lengths_leap{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
    return is_leap_year ? month_lengths_leap[month] : month_lengths[month];
 }

@@ -153,7 +153,7 @@ constexpr Vp9EntropyProbs default_probs{
    .high_precision{128, 128},
 };

-constexpr std::array<s32, 256> norm_lut{
+constexpr std::array<u8, 256> norm_lut{
    0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -164,7 +164,7 @@ constexpr std::array<s32, 256> norm_lut{
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };

-constexpr std::array<s32, 254> map_lut{
+constexpr std::array<u8, 254> map_lut{
    20,  21,  22,  23,  24,  25,  0,   26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,
    1,   38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  2,   50,  51,  52,  53,  54,
    55,  56,  57,  58,  59,  60,  61,  3,   62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,
@@ -232,7 +232,7 @@ constexpr std::array<s32, 254> map_lut{
            std::max(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1));
    }

-    return map_lut[index];
+    return static_cast<s32>(map_lut[index]);
 }
 } // Anonymous namespace

@@ -819,7 +819,7 @@ void VpxRangeEncoder::Write(bool bit, s32 probability) {
        local_range = range - split;
    }

-    s32 shift = norm_lut[local_range];
+    s32 shift = static_cast<s32>(norm_lut[local_range]);
    local_range <<= shift;
    count += shift;

@@ -147,7 +147,7 @@ enum class SurfaceTarget {
    TextureCubeArray,
 };

-constexpr std::array<u32, MaxPixelFormat> BLOCK_WIDTH_TABLE = {{
+constexpr std::array<u8, MaxPixelFormat> BLOCK_WIDTH_TABLE = {{
    1,  // A8B8G8R8_UNORM
    1,  // A8B8G8R8_SNORM
    1,  // A8B8G8R8_SINT
@@ -249,7 +249,7 @@ constexpr u32 DefaultBlockWidth(PixelFormat format) {
    return BLOCK_WIDTH_TABLE[static_cast<std::size_t>(format)];
 }

-constexpr std::array<u32, MaxPixelFormat> BLOCK_HEIGHT_TABLE = {{
+constexpr std::array<u8, MaxPixelFormat> BLOCK_HEIGHT_TABLE = {{
    1,  // A8B8G8R8_UNORM
    1,  // A8B8G8R8_SNORM
    1,  // A8B8G8R8_SINT
@@ -351,7 +351,7 @@ constexpr u32 DefaultBlockHeight(PixelFormat format) {
    return BLOCK_HEIGHT_TABLE[static_cast<std::size_t>(format)];
 }

-constexpr std::array<u32, MaxPixelFormat> BITS_PER_BLOCK_TABLE = {{
+constexpr std::array<u8, MaxPixelFormat> BITS_PER_BLOCK_TABLE = {{
    32,  // A8B8G8R8_UNORM
    32,  // A8B8G8R8_SNORM
    32,  // A8B8G8R8_SINT
@@ -19,7 +19,11 @@ AboutDialog::AboutDialog(QWidget* parent)
    const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;

    ui->setupUi(this);
-    ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200));
+    // Try and request the icon from Qt theme (Linux?)
+    const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu"));
+    if (!yuzu_logo.isNull()) {
+        ui->labelLogo->setPixmap(yuzu_logo.pixmap(200));
+    }
    ui->labelBuildInfo->setText(
        ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
                                       QString::fromUtf8(Common::g_build_date).left(10)));
@@ -26,8 +26,20 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+         <property name="maximumSize">
+          <size>
+           <width>200</width>
+           <height>200</height>
+          </size>
+         </property>
         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/yuzu.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap>
+         </property>
+         <property name="scaledContents">
+          <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -152,7 +164,7 @@ p, li { white-space: pre-wrap; }
  </layout>
 </widget>
 <resources>
-  <include location="../../dist/icons/icons.qrc"/>
+  <include location="../../dist/qt_themes_default/default/default.qrc"/>
 </resources>
 <connections>
  <connection>
Author	SHA1	Message	Date
Morph	f3d3528754	CMakeLists: Update boost to 1.79.0 This version of boost brings in a number of bug fixes, especially to the asio library. Details can be seen here: https://www.boost.org/users/history/version_1_79_0.html	2022-05-29 21:00:40 -04:00
bunnei	ce961cb4c6	Merge pull request #8348 from JakobDev/metainfocontrol Add control to metainfo	2022-05-29 14:16:27 -07:00
bunnei	1c8b509441	Merge pull request #8332 from Morph1984/reduce_exec_size general: Use smaller array types where applicable	2022-05-29 02:33:24 -07:00
bunnei	cc289a8ed0	Merge pull request #8339 from Docteh/about_icon about dialog: Fix yuzu icon	2022-05-29 02:32:40 -07:00
JakobDev	775e29efb6	Add control to Metainfo	2022-05-17 08:40:06 +02:00
Kyle K	8f3098fc1e	about dialog: Fix the logo in a multiplatform way The Icon was renamed in #8283 for Linux builds, and the fix proposed in #8312 would in turn break the icon for Windows users. I've decided to fix the aboutdialog.ui file via qtcreator. I'm not sure its important to have the yuzu icon inside the About dialog grabbed from the local Qt theme, but I've reword how the code works for that, and we can just delete those lines. I've also thrown the yuzu.png through pngcrush to remove this warning libpng warning: iCCP: known incorrect sRGB profile Credit to abouvier for bringing bug up.	2022-05-16 05:42:38 -07:00
Morph	36d44bf52f	time_zone_manager: Use s8 for month length tables Using this smaller type saves 512 bytes in the compiled executable.	2022-05-13 00:51:11 -04:00
Morph	370d3fa1e3	video_core/surface: Use u8 for PixelFormat block tables Using this smaller type saves 33280 bytes in the compiled executable.	2022-05-13 00:51:11 -04:00
Morph	b3f8c7ce58	codecs/vp9: Use u8 for norm and map luts Using this smaller type saves 1536 bytes in the compiled executable.	2022-05-13 00:51:05 -04:00
Morph	eea68eae18	command_generator: Use u8 for tap index lut Using this smaller type saves 1024 bytes in the compiled executable.	2022-05-13 00:50:58 -04:00