common/string_util: Remove unimplemented function prototype

This function was relocated to log.h as a constexpr function, so this
can be removed.

.ci/scripts/format/script.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-10
+CLANG_FORMAT=clang-format-6.0
 $CLANG_FORMAT --version
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "libressl"]
     path = externals/libressl
     url = https://github.com/citra-emu/ext-libressl-portable.git
-[submodule "libusb"]
-	path = externals/libusb/libusb
-	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
     path = externals/discord-rpc
     url = https://github.com/discordapp/discord-rpc.git
@@ -37,6 +34,9 @@
 [submodule "xbyak"]
     path = externals/xbyak
     url = https://github.com/herumi/xbyak.git
+[submodule "externals/libusb"]
+	path = externals/libusb
+	url = https://github.com/ameerj/libusb
 [submodule "opus"]
 	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git

.lgtm.yml

@@ -1,13 +0,0 @@
-path_classifiers:
-  library: "externals"
-extraction:
-  cpp:
-    prepare:
-      packages:
-      - "libsdl2-dev"
-      - "qtmultimedia5-dev"
-      - "clang-format-10"
-      - "libtbb-dev"
-      - "libjack-jackd2-dev"
-      - "doxygen"
-      - "graphviz"

.travis/clang-format/script.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-10.0
+CLANG_FORMAT=clang-format-6.0
 $CLANG_FORMAT --version
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

CMakeLists.txt

@@ -159,15 +159,15 @@ macro(yuzu_find_packages)
     # Capitalization matters here. We need the naming to match the generated paths from Conan
     set(REQUIRED_LIBS
     #    Cmake Pkg Prefix  Version     Conan Pkg
-        "Boost             1.73        boost/1.73.0"
-        "Catch2            2.13        catch2/2.13.0"
-        "fmt               7.0         fmt/7.0.3"
+        "Boost             1.71        boost/1.72.0"
+        "Catch2            2.11        catch2/2.11.0"
+        "fmt               7.0         fmt/7.0.1"
     # can't use until https://github.com/bincrafters/community/issues/1173
         #"libzip            1.5         libzip/1.5.2@bincrafters/stable"
         "lz4               1.8         lz4/1.9.2"
-        "nlohmann_json     3.8         nlohmann_json/3.8.0"
+        "nlohmann_json     3.7         nlohmann_json/3.7.3"
         "ZLIB              1.2         zlib/1.2.11"
-        "zstd              1.4         zstd/1.4.5"
+        "zstd              1.4         zstd/1.4.4"
     )
 
     foreach(PACKAGE ${REQUIRED_LIBS})
@@ -456,7 +456,7 @@ endif()
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 
-set(CLANG_FORMAT_POSTFIX "-10")
+set(CLANG_FORMAT_POSTFIX "-6.0")
 find_program(CLANG_FORMAT
     NAMES clang-format${CLANG_FORMAT_POSTFIX}
           clang-format

dist/icons/controller/controller.qrc

@@ -1,25 +0,0 @@
-<RCC>
-  <qresource prefix="controller">
-    <file alias="dual_joycon">dual_joycon.png</file>
-    <file alias="dual_joycon_dark">dual_joycon_dark.png</file>
-    <file alias="dual_joycon_midnight">dual_joycon_midnight.png</file>
-    <file alias="handheld">handheld.png</file>
-    <file alias="handheld_dark">handheld_dark.png</file>
-    <file alias="handheld_midnight">handheld_midnight.png</file>
-    <file alias="pro_controller">pro_controller.png</file>
-    <file alias="pro_controller_dark">pro_controller_dark.png</file>
-    <file alias="pro_controller_midnight">pro_controller_midnight.png</file>
-    <file alias="single_joycon_left">single_joycon_left.png</file>
-    <file alias="single_joycon_left_dark">single_joycon_left_dark.png</file>
-    <file alias="single_joycon_left_midnight">single_joycon_left_midnight.png</file>
-    <file alias="single_joycon_right">single_joycon_right.png</file>
-    <file alias="single_joycon_right_dark">single_joycon_right_dark.png</file>
-    <file alias="single_joycon_right_midnight">single_joycon_right_midnight.png</file>
-    <file alias="single_joycon_left_vertical">single_joycon_left_vertical.png</file>
-    <file alias="single_joycon_left_vertical_dark">single_joycon_left_vertical_dark.png</file>
-    <file alias="single_joycon_left_vertical_midnight">single_joycon_left_vertical_midnight.png</file>
-    <file alias="single_joycon_right_vertical">single_joycon_right_vertical.png</file>
-    <file alias="single_joycon_right_vertical_dark">single_joycon_right_vertical_dark.png</file>
-    <file alias="single_joycon_right_vertical_midnight">single_joycon_right_vertical_midnight.png</file>
-  </qresource>
-</RCC>

dist/license.md

@@ -5,7 +5,6 @@ Icon Name | License | Origin/Author
 qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -13,7 +12,6 @@ qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -21,7 +19,6 @@ qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com

dist/qt_themes/colorful_dark/style.qrc

@@ -2,7 +2,6 @@
     <qresource prefix="icons/colorful_dark">
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>

dist/qt_themes/colorful_midnight_blue/style.qrc

@@ -2,7 +2,6 @@
     <qresource prefix="icons/colorful_midnight_blue">
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>

dist/qt_themes/default/default.qrc

@@ -4,7 +4,6 @@
         <file alias="16x16/checked.png">icons/16x16/checked.png</file>
         <file alias="16x16/failed.png">icons/16x16/failed.png</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>

dist/qt_themes/default/style.qss

@@ -30,66 +30,6 @@ QPushButton#RendererStatusBarButton:checked {
     color: #e85c00;
 }
 
-QPushButton#RendererStatusBarButton:!checked {
+QPushButton#RendererStatusBarButton:!checked{
     color: #0066ff;
 }
-
-QPushButton#buttonRefreshDevices {
-    min-width: 20px;
-    min-height: 20px;
-    max-width: 20px;
-    max-height: 20px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid black;
-    background: #39ff14;
-    image: none;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid black;
-    background: transparent;
-    image: none;
-}

dist/qt_themes/qdarkstyle/style.qrc

@@ -2,7 +2,6 @@
   <qresource prefix="icons/qdarkstyle">
     <file alias="index.theme">icons/index.theme</file>
     <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
     <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
     <file alias="48x48/chip.png">icons/48x48/chip.png</file>
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>

dist/qt_themes/qdarkstyle/style.qss

@@ -40,8 +40,8 @@ QCheckBox:disabled {
 
 QCheckBox::indicator,
 QGroupBox::indicator {
-    width: 16px;
-    height: 16px;
+    width: 18px;
+    height: 18px;
 }
 
 QGroupBox::indicator {
@@ -654,11 +654,7 @@ QAbstractSpinBox::down-arrow:hover {
     image: url(:/qss_icons/rc/down_arrow.png);
 }
 
-QLabel {
-    border: 0;
-    background: transparent;
-}
-
+QLabel,
 QTabWidget {
     border: 0;
 }
@@ -1237,7 +1233,6 @@ QPlainTextEdit:disabled {
     background-color: #2b2e31;
 }
 
-
 QPushButton#TogglableStatusBarButton {
     min-width: 0px;
     color: #656565;
@@ -1272,107 +1267,6 @@ QPushButton#RendererStatusBarButton:checked {
     color: #e85c00;
 }
 
-QPushButton#RendererStatusBarButton:!checked {
-    color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-    min-width: 24px;
-    min-height: 24px;
-    max-width: 24px;
-    max-height: 24px;
-    padding: 0px 0px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
-    padding: 4px 0px 5px 0px;
-    min-width: 63px;
-}
-
-QSpinBox#vibrationSpin {
-    padding: 4px 0px 5px 0px;
-    min-width: 63px;
-}
-
-QSpinBox#spinboxLStickRange:up-button,
-QSpinBox#spinboxRStickRange:up-button,
-QSpinBox#vibrationSpin:up-button {
-    left: -2px;
-}
-
-QSpinBox#spinboxLStickRange:down-button,
-QSpinBox#spinboxRStickRange:down-button,
-QSpinBox#vibrationSpin:down-button {
-    right: -1px;
-}
-
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-    margin-left: 0px;
-}
-
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-	spacing: 2px;
-	padding-left: 1px;
-	padding-right: 1px;
-}
-
-/* touchscreen mapping widget */
-TouchScreenPreview {
-    qproperty-dotHighlightColor: #3daee9;
-}
+QPushButton#RendererStatusBarButton:!checked{
+   color: #00ccdd;
+}

dist/qt_themes/qdarkstyle_midnight_blue/style.qrc

@@ -2,7 +2,6 @@
   <qresource prefix="icons/qdarkstyle_midnight_blue">
     <file alias="index.theme">icons/index.theme</file>
     <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
     <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
     <file alias="48x48/chip.png">icons/48x48/chip.png</file>
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -138,6 +138,8 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
 
 --------------------------------------------------------------------------- */
 QStatusBar {
+  border: 1px solid #32414B;
+  /* Fixes Spyder #9120, #9121 */
   background: #32414B;
   /* Fixes #205, white vertical borders separating items */
 }
@@ -159,7 +161,6 @@ QStatusBar QToolTip {
 QStatusBar QLabel {
   /* Fixes Spyder #9120, #9121 */
   background: transparent;
-  padding: 0px;
 }
 
 /* QCheckBox --------------------------------------------------------------
@@ -235,19 +236,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
 
 --------------------------------------------------------------------------- */
 QGroupBox {
-    font-weight: bold;
-    border: 1px solid #32414B;
-    border-radius: 4px;
-    margin-top: 12px;
-    padding: 4px;
+  font-weight: bold;
+  border: 1px solid #32414B;
+  border-radius: 4px;
+  padding: 4px;
+  margin-top: 16px;
 }
 
 QGroupBox::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 3px;
-    padding-right: 5px;
-    padding-top: 4px;
+  subcontrol-origin: margin;
+  subcontrol-position: top left;
+  left: 3px;
+  padding-left: 3px;
+  padding-right: 5px;
+  padding-top: 8px;
+  padding-bottom: 16px;
 }
 
 QGroupBox::indicator {
@@ -364,19 +367,28 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
 --------------------------------------------------------------------------- */
 QMenuBar {
   background-color: #32414B;
+  padding: 2px;
+  border: 1px solid #19232D;
   color: #F0F0F0;
 }
 
+QMenuBar:focus {
+  border: 1px solid #148CD2;
+}
+
 QMenuBar::item {
   background: transparent;
+  padding: 4px;
 }
 
 QMenuBar::item:selected {
+  padding: 4px;
   background: transparent;
   border: 0px solid #32414B;
 }
 
 QMenuBar::item:pressed {
+  padding: 4px;
   border: 0px solid #32414B;
   background-color: #148CD2;
   color: #F0F0F0;
@@ -384,7 +396,6 @@ QMenuBar::item:pressed {
   padding-bottom: 0px;
 }
 
-
 /* QMenu ------------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
@@ -471,7 +482,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QAbstractItemView {
-  alternate-background-color: #1f2933;
+  alternate-background-color: #19232D;
   color: #F0F0F0;
   border: 1px solid #32414B;
   border-radius: 4px;
@@ -490,13 +501,13 @@ QAbstractScrollArea {
   background-color: #19232D;
   border: 1px solid #32414B;
   border-radius: 4px;
+  padding: 2px;
   /* fix #159 */
   min-height: 1.25em;
   /* fix #159 */
   color: #F0F0F0;
 }
 
-
 QAbstractScrollArea:disabled {
   color: #787878;
 }
@@ -796,22 +807,20 @@ QAbstractSpinBox {
 }
 
 QAbstractSpinBox:up-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
   subcontrol-origin: border;
   subcontrol-position: top right;
   border-left: 1px solid #32414B;
-  border-top: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-top-right-radius: 4px;
+  border-bottom: 1px solid #32414B;
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  margin: 0px;
+  margin: 1px;
   width: 12px;
-  margin-bottom: 0px;
+  margin-bottom: -1px;
 }
 
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(":/qss_icons/rc/up_arrow.png");
+  image: url(":/qss_icons/rc/arrow_up_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -821,23 +830,20 @@ QAbstractSpinBox::up-arrow:hover {
 }
 
 QAbstractSpinBox:down-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
   subcontrol-origin: border;
   subcontrol-position: bottom right;
   border-left: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-bottom: 1px solid #32414B;
   border-top: 1px solid #32414B;
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: 4px;
-  margin: 0px;
+  margin: 1px;
   width: 12px;
-  margin-top: 0px;
+  margin-top: -1px;
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(":/qss_icons/rc/down_arrow.png");
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -869,7 +875,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
 
 --------------------------------------------------------------------------- */
 QLabel {
-  background: transparent;
+  background-color: #19232D;
   border: 0px solid #32414B;
   padding: 2px;
   margin: 0px;
@@ -877,6 +883,7 @@ QLabel {
 }
 
 QLabel:disabled {
+  background-color: #19232D;
   border: 0px solid #32414B;
   color: #787878;
 }
@@ -1193,7 +1200,6 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QComboBox {
-  background-color: #0f1922;
   border: 1px solid #32414B;
   border-radius: 4px;
   selection-background-color: #1464A0;
@@ -1211,7 +1217,7 @@ QComboBox {
 QComboBox QAbstractItemView {
   border: 1px solid #32414B;
   border-radius: 0;
-  background-color: #0f1922;
+  background-color: #19232D;
   selection-background-color: #1464A0;
 }
 
@@ -1280,12 +1286,7 @@ QComboBox::drop-down {
 }
 
 QComboBox::down-arrow {
-  image: url(":/qss_icons/rc/down_arrow.png");
-  background-color: #505F69;
-  padding: 6px 2px;
-  border: 1px solid #32414B;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -1559,12 +1560,12 @@ QTabBar::tab:right:!selected {
 QTabBar::tab:top {
   background-color: #32414B;
   color: #F0F0F0;
-  min-width: 36px;
   margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
   padding-top: 2px;
   padding-bottom: 2px;
+  min-width: 5px;
   border-bottom: 3px solid #32414B;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
@@ -1588,16 +1589,16 @@ QTabBar::tab:top:!selected:hover {
 
 QTabBar::tab:bottom {
   color: #F0F0F0;
-  min-width: 36px;
   border-top: 3px solid #32414B;
   background-color: #32414B;
   margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
   padding-top: 2px;
   padding-bottom: 2px;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  min-width: 5px;
 }
 
 QTabBar::tab:bottom:selected {
@@ -1752,6 +1753,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
 
 --------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/qss_icons/rc/transparent.png");
+}
+
+QTreeView:branch:has-siblings:!adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_line.png") 0;
+}
+
+QTreeView:branch:has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_more.png") 0;
+}
+
+QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_end.png") 0;
+}
 
 QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
   border-image: none;
@@ -1885,21 +1901,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
 
 --------------------------------------------------------------------------- */
 QHeaderView {
-  background-color: #19232D;
-  border: 0px transparent #19232D;
+  background-color: #32414B;
+  border: 0px transparent #32414B;
   padding: 0px;
   margin: 0px;
   border-radius: 0px;
 }
 
 QHeaderView:disabled {
-  background-color: #19232D;
-  border: 1px transparent #19232D;
+  background-color: #32414B;
+  border: 1px transparent #32414B;
   padding: 2px;
 }
 
 QHeaderView::section {
-  background-color: #19232D;
+  background-color: #32414B;
   color: #F0F0F0;
   padding: 2px;
   border-radius: 0px;
@@ -1919,11 +1935,11 @@ QHeaderView::section:checked:disabled {
 QHeaderView::section::horizontal {
   padding-left: 4px;
   padding-right: 4px;
-  border-left: 1px solid #32414B;
+  border-left: 1px solid #19232D;
 }
 
 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
-  border-left: 1px solid #19232D;
+  border-left: 1px solid #32414B;
 }
 
 QHeaderView::section::horizontal:disabled {
@@ -1933,7 +1949,7 @@ QHeaderView::section::horizontal:disabled {
 QHeaderView::section::vertical {
   padding-left: 4px;
   padding-right: 4px;
-  border-top: 1px solid #32414B;
+  border-top: 1px solid #19232D;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
@@ -1947,7 +1963,7 @@ QHeaderView::section::vertical:disabled {
 QHeaderView::down-arrow {
   /* Those settings (border/width/height/background-color) solve bug */
   /* transparent arrow background and size */
-  background-color: #19232D;
+  background-color: #32414B;
   border: none;
   height: 12px;
   width: 12px;
@@ -1957,7 +1973,7 @@ QHeaderView::down-arrow {
 }
 
 QHeaderView::up-arrow {
-  background-color: #19232D;
+  background-color: #32414B;
   border: none;
   height: 12px;
   width: 12px;
@@ -2157,132 +2173,3 @@ PlotWidget {
   /* Fix cut labels in plots #134 */
   padding: 0px;
 }
-
-
-QPushButton#TogglableStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#TogglableStatusBarButton:checked {
-  color: #ffffff;
-}
-
-QPushButton#TogglableStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#RendererStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton:checked {
-  color: #e85c00;
-}
-
-QPushButton#RendererStatusBarButton:!checked {
-  color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-  min-width: 20px;
-  min-height: 20px;
-  max-width: 20px;
-  max-height: 20px;
-  padding: 0px 0px;
-}
-
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-  spacing: 0px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-  width: 14px;
-  height: 14px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: #39ff14;
-  image: none;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: transparent;
-  image: none;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
-  min-width: 38px;
-}
-
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-  margin-left: 0px;
-}
-
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-spacing: 2px;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-QListWidget#selectorList {
-  background-color: #0f1922;
-}
-
-QSpinBox,
-QLineEdit,
-QTreeView#hotkey_list,
-QScrollArea#scrollArea QTreeView {
-  background-color: #0f1922;
-}

externals/libusb/CMakeLists.txt

@@ -1,150 +0,0 @@
-add_library(usb STATIC EXCLUDE_FROM_ALL
-    libusb/libusb/core.c
-    libusb/libusb/core.c
-    libusb/libusb/descriptor.c
-    libusb/libusb/hotplug.c
-    libusb/libusb/io.c
-    libusb/libusb/strerror.c
-    libusb/libusb/sync.c
-)
-set_target_properties(usb PROPERTIES VERSION 1.0.23)
-if(WIN32)
-    target_include_directories(usb
-        BEFORE
-        PUBLIC
-          libusb/libusb
-
-        PRIVATE
-          "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-
-    if (NOT MINGW)
-        target_include_directories(usb BEFORE PRIVATE libusb/msvc)
-    endif()
-
-    # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
-    target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
-else()
-target_include_directories(usb
-    # turns out other projects also have "config.h", so make sure the
-    # LibUSB one comes first
-    BEFORE
-
-    PUBLIC
-      libusb/libusb
-
-    PRIVATE
-      "${CMAKE_CURRENT_BINARY_DIR}"
-)
-endif()
-
-if(WIN32 OR CYGWIN)
-    target_sources(usb PRIVATE
-      libusb/libusb/os/threads_windows.c
-      libusb/libusb/os/windows_winusb.c
-      libusb/libusb/os/windows_usbdk.c
-      libusb/libusb/os/windows_nt_common.c
-    )
-    set(OS_WINDOWS TRUE)
-elseif(APPLE)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/darwin_usb.c
-    )
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(OBJC_LIBRARY objc)
-    target_link_libraries(usb PRIVATE
-        ${COREFOUNDATION_LIBRARY}
-        ${IOKIT_LIBRARY}
-        ${OBJC_LIBRARY}
-    )
-    set(OS_DARWIN TRUE)
-elseif(ANDROID)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-        libusb/libusb/os/linux_netlink.c
-    )
-    find_library(LOG_LIBRARY log)
-    target_link_libraries(usb PRIVATE ${LOG_LIBRARY})
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-    )
-    find_package(Libudev)
-    if(LIBUDEV_FOUND)
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_udev.c
-        )
-        target_link_libraries(usb PRIVATE "${LIBUDEV_LIBRARIES}")
-        target_include_directories(usb PRIVATE "${LIBUDEV_INCLUDE_DIR}")
-        set(HAVE_LIBUDEV TRUE)
-        set(USE_UDEV TRUE)
-    else()
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_netlink.c
-        )
-    endif()
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/netbsd_usb.c
-    )
-    set(OS_NETBSD TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/openbsd_usb.c
-    )
-    set(OS_OPENBSD TRUE)
-endif()
-
-if(UNIX)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_posix.c
-        libusb/libusb/os/threads_posix.c
-    )
-    find_package(Threads REQUIRED)
-    if(THREADS_HAVE_PTHREAD_ARG)
-      target_compile_options(usb PUBLIC "-pthread")
-    endif()
-    if(CMAKE_THREAD_LIBS_INIT)
-      target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
-    endif()
-    set(THREADS_POSIX TRUE)
-elseif(WIN32)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_windows.c
-        libusb/libusb/os/threads_windows.c
-    )
-endif()
-
-include(CheckFunctionExists)
-include(CheckIncludeFiles)
-include(CheckTypeSize)
-check_include_files(asm/types.h HAVE_ASM_TYPES_H)
-check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
-check_include_files(linux/filter.h HAVE_LINUX_FILTER_H)
-check_include_files(linux/netlink.h HAVE_LINUX_NETLINK_H)
-check_include_files(poll.h HAVE_POLL_H)
-check_include_files(signal.h HAVE_SIGNAL_H)
-check_include_files(strings.h HAVE_STRINGS_H)
-check_type_size("struct timespec" STRUCT_TIMESPEC)
-check_function_exists(syslog HAVE_SYSLOG_FUNC)
-check_include_files(syslog.h HAVE_SYSLOG_H)
-check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-check_include_files(sys/time.h HAVE_SYS_TIME_H)
-check_include_files(sys/types.h HAVE_SYS_TYPES_H)
-
-set(CMAKE_EXTRA_INCLUDE_FILES poll.h)
-check_type_size("nfds_t" nfds_t)
-unset(CMAKE_EXTRA_INCLUDE_FILES)
-if(HAVE_NFDS_T)
-    set(POLL_NFDS_TYPE "nfds_t")
-else()
-    set(POLL_NFDS_TYPE "unsigned int")
-endif()
-
-check_include_files(sys/timerfd.h USBI_TIMERFD_AVAILABLE)
-
-
-configure_file(config.h.in config.h)

externals/libusb/config.h.in

@@ -1,90 +0,0 @@
-/* Default visibility */
-#if defined(__GNUC__) || defined(__clang__)
-  #define DEFAULT_VISIBILITY __attribute__((visibility("default")))
-#elif defined(_MSC_VER)
-  #define DEFAULT_VISIBILITY __declspec(dllexport)
-#endif
-
-/* Start with debug message logging enabled */
-#undef ENABLE_DEBUG_LOGGING
-
-/* Message logging */
-#undef ENABLE_LOGGING
-
-/* Define to 1 if you have the <asm/types.h> header file. */
-#cmakedefine HAVE_ASM_TYPES_H 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#cmakedefine HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `udev' library (-ludev). */
-#cmakedefine HAVE_LIBUDEV 1
-
-/* Define to 1 if you have the <linux/filter.h> header file. */
-#cmakedefine HAVE_LINUX_FILTER_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#cmakedefine HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#cmakedefine HAVE_POLL_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#cmakedefine HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H 1
-
-/* Define to 1 if the system has the type `struct timespec'. */
-#cmakedefine HAVE_STRUCT_TIMESPEC 1
-
-/* syslog() function available */
-#cmakedefine HAVE_SYSLOG_FUNC 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#cmakedefine HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Darwin backend */
-#cmakedefine OS_DARWIN 1
-
-/* Linux backend */
-#cmakedefine OS_LINUX 1
-
-/* NetBSD backend */
-#cmakedefine OS_NETBSD 1
-
-/* OpenBSD backend */
-#cmakedefine OS_OPENBSD 1
-
-/* Windows backend */
-#cmakedefine OS_WINDOWS 1
-
-/* type of second poll() argument */
-#define POLL_NFDS_TYPE @POLL_NFDS_TYPE@
-
-/* Use POSIX Threads */
-#cmakedefine THREADS_POSIX
-
-/* timerfd headers available */
-#cmakedefine USBI_TIMERFD_AVAILABLE 1
-
-/* Enable output to system log */
-#define USE_SYSTEM_LOGGING_FACILITY 1
-
-/* Use udev for device enumeration/hotplug */
-#cmakedefine USE_UDEV 1
-
-/* Use GNU extensions */
-#define _GNU_SOURCE
-
-/* Oldest Windows version supported */
-#define WINVER 0x0501

externals/microprofile/microprofile.h

@@ -152,11 +152,9 @@ typedef uint16_t MicroProfileGroupId;
 
 #include <stdint.h>
 #include <string.h>
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <mutex>
 #include <thread>
+#include <mutex>
+#include <atomic>
 
 #ifndef MICROPROFILE_API
 #define MICROPROFILE_API
@@ -607,45 +605,28 @@ struct MicroProfileFrameState
 
 struct MicroProfileThreadLog
 {
-    std::array<MicroProfileLogEntry, MICROPROFILE_BUFFER_SIZE> Log{};
+    MicroProfileLogEntry    Log[MICROPROFILE_BUFFER_SIZE];
 
-    std::atomic<uint32_t>   nPut{0};
-    std::atomic<uint32_t>   nGet{0};
-    uint32_t                nActive = 0;
-    uint32_t                nGpu = 0;
-    ThreadIdType            nThreadId{};
+    std::atomic<uint32_t>   nPut;
+    std::atomic<uint32_t>   nGet;
+    uint32_t                nActive;
+    uint32_t                nGpu;
+    ThreadIdType            nThreadId;
 
-    std::array<uint32_t, MICROPROFILE_STACK_MAX> nStack{};
-    std::array<int64_t, MICROPROFILE_STACK_MAX>  nChildTickStack{};
-    uint32_t                                     nStackPos = 0;
+    uint32_t                nStack[MICROPROFILE_STACK_MAX];
+    int64_t                 nChildTickStack[MICROPROFILE_STACK_MAX];
+    uint32_t                nStackPos;
 
 
-    std::array<uint8_t, MICROPROFILE_MAX_GROUPS> nGroupStackPos{};
-    std::array<int64_t, MICROPROFILE_MAX_GROUPS> nGroupTicks{};
-    std::array<int64_t, MICROPROFILE_MAX_GROUPS> nAggregateGroupTicks{};
+    uint8_t                 nGroupStackPos[MICROPROFILE_MAX_GROUPS];
+    int64_t                 nGroupTicks[MICROPROFILE_MAX_GROUPS];
+    int64_t                 nAggregateGroupTicks[MICROPROFILE_MAX_GROUPS];
     enum
     {
         THREAD_MAX_LEN = 64,
     };
-    char                    ThreadName[64]{};
-    int                     nFreeListNext = 0;
-
-    void Reset() {
-        Log.fill({});
-        nPut = 0;
-        nGet = 0;
-        nActive = 0;
-        nGpu = 0;
-        nThreadId = {};
-        nStack.fill(0);
-        nChildTickStack.fill(0);
-        nStackPos = 0;
-        nGroupStackPos.fill(0);
-        nGroupTicks.fill(0);
-        nAggregateGroupTicks.fill(0);
-        std::fill(std::begin(ThreadName), std::end(ThreadName), '\0');
-        nFreeListNext = 0;
-    }
+    char                    ThreadName[64];
+    int                     nFreeListNext;
 };
 
 #if MICROPROFILE_GPU_TIMERS_D3D11
@@ -1037,7 +1018,7 @@ static void MicroProfileCreateThreadLogKey()
 #else
 MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0;
 #endif
-static std::atomic<bool> g_bUseLock{false}; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled)
+static bool g_bUseLock = false; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled)
 
 
 MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee);
@@ -1170,7 +1151,6 @@ MicroProfileThreadLog* MicroProfileCreateThreadLog(const char* pName)
         MP_ASSERT(pLog->nPut.load() == 0);
         MP_ASSERT(pLog->nGet.load() == 0);
         S.nFreeListHead = S.Pool[S.nFreeListHead]->nFreeListNext;
-        pLog->Reset();
     }
     else
     {
@@ -1178,6 +1158,7 @@ MicroProfileThreadLog* MicroProfileCreateThreadLog(const char* pName)
         S.nMemUsage += sizeof(MicroProfileThreadLog);
         S.Pool[S.nNumLogs++] = pLog;
     }
+    memset(pLog, 0, sizeof(*pLog));
     int len = (int)strlen(pName);
     int maxlen = sizeof(pLog->ThreadName)-1;
     len = len < maxlen ? len : maxlen;
@@ -1225,8 +1206,8 @@ void MicroProfileOnThreadExit()
         {
             S.Frames[i].nLogStart[nLogIndex] = 0;
         }
-        pLog->nGroupStackPos.fill(0);
-        pLog->nGroupTicks.fill(0);
+        memset(pLog->nGroupStackPos, 0, sizeof(pLog->nGroupStackPos));
+        memset(pLog->nGroupTicks, 0, sizeof(pLog->nGroupTicks));
     }
 }
 

externals/microprofile/microprofileui.h

@@ -169,13 +169,14 @@ MICROPROFILEUI_API void MicroProfileCustomGroup(const char* pCustomName, uint32_
 MICROPROFILEUI_API void MicroProfileCustomGroupAddTimer(const char* pCustomName, const char* pGroup, const char* pTimer);
 
 #ifdef MICROPROFILEUI_IMPL
-#include <inttypes.h>
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
 #include <algorithm>
-#include <array>
 
 MICROPROFILE_DEFINE(g_MicroProfileDetailed, "MicroProfile", "Detailed View", 0x8888000);
 MICROPROFILE_DEFINE(g_MicroProfileDrawGraph, "MicroProfile", "Draw Graph", 0xff44ee00);
@@ -226,10 +227,10 @@ struct SOptionDesc
     uint8_t nIndex;
     bool bSelected;
 };
-static const std::array<uint32_t, 6> g_MicroProfileAggregatePresets{0, 10, 20, 30, 60, 120};
-static const std::array<float, 10> g_MicroProfileReferenceTimePresets{5.f, 10.f, 15.f,20.f, 33.33f, 66.66f, 100.f, 250.f, 500.f, 1000.f};
-static const std::array<uint32_t, 4> g_MicroProfileOpacityPresets{0x40, 0x80, 0xc0, 0xff};
-static const std::array<const char*, 7> g_MicroProfilePresetNames
+static uint32_t g_MicroProfileAggregatePresets[] = {0, 10, 20, 30, 60, 120};
+static float g_MicroProfileReferenceTimePresets[] = {5.f, 10.f, 15.f,20.f, 33.33f, 66.66f, 100.f, 250.f, 500.f, 1000.f};
+static uint32_t g_MicroProfileOpacityPresets[] = {0x40, 0x80, 0xc0, 0xff};
+static const char* g_MicroProfilePresetNames[] =
 {
     MICROPROFILE_DEFAULT_PRESET,
     "Render",
@@ -242,8 +243,8 @@ static const std::array<const char*, 7> g_MicroProfilePresetNames
 
 enum
 {
-    MICROPROFILE_NUM_REFERENCE_PRESETS = g_MicroProfileReferenceTimePresets.size(),
-    MICROPROFILE_NUM_OPACITY_PRESETS = g_MicroProfileOpacityPresets.size(),
+    MICROPROFILE_NUM_REFERENCE_PRESETS = sizeof(g_MicroProfileReferenceTimePresets)/sizeof(g_MicroProfileReferenceTimePresets[0]),
+    MICROPROFILE_NUM_OPACITY_PRESETS = sizeof(g_MicroProfileOpacityPresets)/sizeof(g_MicroProfileOpacityPresets[0]),
 #if MICROPROFILE_CONTEXT_SWITCH_TRACE
     MICROPROFILE_OPTION_SIZE = MICROPROFILE_NUM_REFERENCE_PRESETS + MICROPROFILE_NUM_OPACITY_PRESETS * 2 + 2 + 7,
 #else
@@ -325,9 +326,9 @@ struct MicroProfileUI
 
 MicroProfileUI g_MicroProfileUI;
 #define UI g_MicroProfileUI
-static const std::array<uint32_t, 2> g_nMicroProfileBackColors{  0x474747, 0x313131 };
+static uint32_t g_nMicroProfileBackColors[2] = {  0x474747, 0x313131 };
 #define MICROPROFILE_NUM_CONTEXT_SWITCH_COLORS 16
-static const std::array<uint32_t, MICROPROFILE_NUM_CONTEXT_SWITCH_COLORS> g_nMicroProfileContextSwitchThreadColors //palette generated by http://tools.medialab.sciences-po.fr/iwanthue/index.php
+static uint32_t g_nMicroProfileContextSwitchThreadColors[MICROPROFILE_NUM_CONTEXT_SWITCH_COLORS] = //palette generated by http://tools.medialab.sciences-po.fr/iwanthue/index.php
 {
     0x63607B,
     0x755E2B,
@@ -355,7 +356,7 @@ void MicroProfileInitUI()
     {
         bInitialized = true;
         memset(&g_MicroProfileUI, 0, sizeof(g_MicroProfileUI));
-        UI.nActiveMenu = UINT32_MAX;
+        UI.nActiveMenu = (uint32_t)-1;
         UI.fDetailedOffsetTarget = UI.fDetailedOffset = 0.f;
         UI.fDetailedRangeTarget = UI.fDetailedRange = 50.f;
 
@@ -367,7 +368,7 @@ void MicroProfileInitUI()
         UI.nWidth = 100;
         UI.nHeight = 100;
 
-        UI.nCustomActive = UINT32_MAX;
+        UI.nCustomActive = (uint32_t)-1;
         UI.nCustomTimerCount = 0;
         UI.nCustomCount = 0;
 
@@ -497,8 +498,8 @@ inline void MicroProfileDrawFloatWindow(uint32_t nX, uint32_t nY, const char** p
         {
             MicroProfileDrawBox(nX-MICROPROFILE_TEXT_WIDTH, nY, nX, nY + MICROPROFILE_TEXT_WIDTH, pColors[i]|0xff000000);
         }
-        MicroProfileDrawText(nX + 1, nY + 1, UINT32_MAX, ppStrings[i0], (uint32_t)strlen(ppStrings[i0]));
-        MicroProfileDrawText(nX + nWidth - nStringLengths[i0+1] * (MICROPROFILE_TEXT_WIDTH+1), nY + 1, UINT32_MAX, ppStrings[i0+1], (uint32_t)strlen(ppStrings[i0+1]));
+        MicroProfileDrawText(nX + 1, nY + 1, (uint32_t)-1, ppStrings[i0], (uint32_t)strlen(ppStrings[i0]));
+        MicroProfileDrawText(nX + nWidth - nStringLengths[i0+1] * (MICROPROFILE_TEXT_WIDTH+1), nY + 1, (uint32_t)-1, ppStrings[i0+1], (uint32_t)strlen(ppStrings[i0+1]));
         nY += (MICROPROFILE_TEXT_HEIGHT+1);
     }
 }
@@ -521,7 +522,7 @@ inline void MicroProfileDrawTextBox(uint32_t nX, uint32_t nY, const char** ppStr
     MicroProfileDrawBox(nX, nY, nX + nWidth, nY + nHeight, 0xff000000);
     for(uint32_t i = 0; i < nNumStrings; ++i)
     {
-        MicroProfileDrawText(nX + 1, nY + 1, UINT32_MAX, ppStrings[i], (uint32_t)strlen(ppStrings[i]));
+        MicroProfileDrawText(nX + 1, nY + 1, (uint32_t)-1, ppStrings[i], (uint32_t)strlen(ppStrings[i]));
         nY += (MICROPROFILE_TEXT_HEIGHT+1);
     }
 }
@@ -780,7 +781,7 @@ inline void MicroProfileDrawDetailedContextSwitchBars(uint32_t nY, uint32_t nThr
 {
     MicroProfile& S = *MicroProfileGet();
     int64_t nTickIn = -1;
-    uint32_t nThreadBefore = UINT32_MAX;
+    uint32_t nThreadBefore = -1;
     float fToMs = MicroProfileTickToMsMultiplier(MicroProfileTicksPerSecondCpu());
     float fMsToScreen = UI.nWidth / UI.fDetailedRange;
     float fMouseX = (float)UI.nMouseX;
@@ -948,10 +949,10 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
 
     uint32_t nContextSwitchHoverThreadAfter = S.nContextSwitchHoverThreadAfter;
     uint32_t nContextSwitchHoverThreadBefore = S.nContextSwitchHoverThreadBefore;
-    S.nContextSwitchHoverThread = S.nContextSwitchHoverThreadAfter = S.nContextSwitchHoverThreadBefore = UINT32_MAX;
+    S.nContextSwitchHoverThread = S.nContextSwitchHoverThreadAfter = S.nContextSwitchHoverThreadBefore = -1;
 
-    uint32_t nContextSwitchStart = UINT32_MAX;
-    uint32_t nContextSwitchEnd = UINT32_MAX;
+    uint32_t nContextSwitchStart = -1;
+    uint32_t nContextSwitchEnd = -1;
     S.nContextSwitchHoverCpuNext = 0xff;
     S.nContextSwitchHoverTickIn = -1;
     S.nContextSwitchHoverTickOut = -1;
@@ -1004,10 +1005,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
             }while(pFrameLogFirst != pFrameFirst);
 
 
-            if (nGet == UINT32_MAX) {
+            if(nGet == (uint32_t)-1)
                 continue;
-            }
-            MP_ASSERT(nGet != UINT32_MAX);
+            MP_ASSERT(nGet != (uint32_t)-1);
 
             nPut = pFrameLogLast->nLogStart[i];
 
@@ -1023,9 +1023,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
             int64_t nBaseTicks = bGpu ? nBaseTicksGpu : nBaseTicksCpu;
             char ThreadName[MicroProfileThreadLog::THREAD_MAX_LEN + 16];
             uint64_t nThreadId = pLog->nThreadId;
-            snprintf(ThreadName, sizeof(ThreadName)-1, "%04" PRIx64 ": %s", nThreadId, &pLog->ThreadName[0] );
+            snprintf(ThreadName, sizeof(ThreadName)-1, "%04llx: %s", nThreadId, &pLog->ThreadName[0] );
             nY += 3;
-            uint32_t nThreadColor = UINT32_MAX;
+            uint32_t nThreadColor = -1;
             if(pLog->nThreadId == nContextSwitchHoverThreadAfter || pLog->nThreadId == nContextSwitchHoverThreadBefore)
                 nThreadColor = UI.nHoverColorShared|0x906060;
             MicroProfileDrawText(0, nY, nThreadColor, &ThreadName[0], (uint32_t)strlen(&ThreadName[0]));
@@ -1048,7 +1048,7 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                 uint32_t nEnd = nRange[j][1];
                 for(uint32_t k = nStart; k < nEnd; ++k)
                 {
-                    MicroProfileLogEntry* pEntry = &pLog->Log[k];
+                    MicroProfileLogEntry* pEntry = pLog->Log + k;
                     int nType = MicroProfileLogType(*pEntry);
                     if(MP_LOG_ENTER == nType)
                     {
@@ -1066,7 +1066,7 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                             continue;
                         }
 
-                        MicroProfileLogEntry* pEntryEnter = &pLog->Log[nStack[nStackPos-1]];
+                        MicroProfileLogEntry* pEntryEnter = pLog->Log + nStack[nStackPos-1];
                         if(MicroProfileLogTimerIndex(*pEntryEnter) != MicroProfileLogTimerIndex(*pEntry))
                         {
                             //uprintf("mismatch %llx %llx\n", pEntryEnter->nToken, pEntry->nToken);
@@ -1126,7 +1126,7 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                         uint32_t nIntegerWidth = (uint32_t)(fXEnd - fXStart);
                         if(nIntegerWidth)
                         {
-                            if(bHover && UI.nActiveMenu == UINT32_MAX)
+                            if(bHover && UI.nActiveMenu == -1)
                             {
                                 nHoverToken = MicroProfileLogTimerIndex(*pEntry);
     #if MICROPROFILE_DEBUG
@@ -1146,7 +1146,7 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                                 int nCharacters = (nTextWidth - 2*MICROPROFILE_TEXT_WIDTH) / MICROPROFILE_TEXT_WIDTH;
                                 if(nCharacters>0)
                                 {
-                                    MicroProfileDrawText(fXStartText + 1, fYStart + 1, UINT32_MAX, S.TimerInfo[nTimerIndex].pName, MicroProfileMin<uint32_t>(S.TimerInfo[nTimerIndex].nNameLen, nCharacters));
+                                    MicroProfileDrawText(fXStartText+1, fYStart+1, -1, S.TimerInfo[nTimerIndex].pName, MicroProfileMin<uint32_t>(S.TimerInfo[nTimerIndex].nNameLen, nCharacters));
                                 }
                             }
 #endif
@@ -1158,7 +1158,7 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                             int nLineX = (int)floor(fXAvg+0.5f);
                             if(nLineX != (int)nLinesDrawn[nStackPos])
                             {
-                                if(bHover && UI.nActiveMenu == UINT32_MAX)
+                                if(bHover && UI.nActiveMenu == -1)
                                 {
                                     nHoverToken = (uint32_t)MicroProfileLogTimerIndex(*pEntry);
                                     nHoverTime = MicroProfileLogTickDifference(nTickStart, nTickEnd);
@@ -1235,9 +1235,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
                 // nThreadId is 32-bit on Windows
                 int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04x: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) );
 #else
-                int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04" PRIx64 ": %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) );
+                int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04llx: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) );
 #endif
-                uint32_t nThreadColor = UINT32_MAX;
+                uint32_t nThreadColor = -1;
                 if(nThreadId == nContextSwitchHoverThreadAfter || nThreadId == nContextSwitchHoverThreadBefore)
                     nThreadColor = UI.nHoverColorShared|0x906060;
                 MicroProfileDrawDetailedContextSwitchBars(nY+2, nThreadId, nContextSwitchStart, nContextSwitchEnd, nBaseTicksCpu, nBaseY);
@@ -1249,6 +1249,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
 
     S.nContextSwitchHoverCpu = S.nContextSwitchHoverCpuNext;
 
+
+
+
     UI.pDisplayMouseOver = pMouseOverNext;
 
     if(!S.nRunning)
@@ -1283,10 +1286,10 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
             float fStartTextWidth = (float)((1+MICROPROFILE_TEXT_WIDTH) * nLenStart);
             float fStartTextX = fXStart - fStartTextWidth - 2;
             MicroProfileDrawBox(fStartTextX, nBaseY, fStartTextX + fStartTextWidth + 2, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
-            MicroProfileDrawText(fStartTextX+1, nBaseY, UINT32_MAX, sBuffer, nLenStart);
+            MicroProfileDrawText(fStartTextX+1, nBaseY, (uint32_t)-1, sBuffer, nLenStart);
             uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd);
             MicroProfileDrawBox(fXEnd+1, nBaseY, fXEnd+1+(1+MICROPROFILE_TEXT_WIDTH) * nLenEnd + 3, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
-            MicroProfileDrawText(fXEnd+2, nBaseY+1, UINT32_MAX, sBuffer, nLenEnd);
+            MicroProfileDrawText(fXEnd+2, nBaseY+1, (uint32_t)-1, sBuffer, nLenEnd);
 
             if(UI.nMouseRight)
             {
@@ -1313,10 +1316,10 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
             float fStartTextWidth = (float)((1+MICROPROFILE_TEXT_WIDTH) * nLenStart);
             float fStartTextX = fXStart - fStartTextWidth - 2;
             MicroProfileDrawBox(fStartTextX, nBaseY, fStartTextX + fStartTextWidth + 2, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
-            MicroProfileDrawText(fStartTextX+1, nBaseY, UINT32_MAX, sBuffer, nLenStart);
+            MicroProfileDrawText(fStartTextX+1, nBaseY, (uint32_t)-1, sBuffer, nLenStart);
             uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd);
             MicroProfileDrawBox(fXEnd+1, nBaseY, fXEnd+1+(1+MICROPROFILE_TEXT_WIDTH) * nLenEnd + 3, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
-            MicroProfileDrawText(fXEnd+2, nBaseY+1, UINT32_MAX, sBuffer, nLenEnd);
+            MicroProfileDrawText(fXEnd+2, nBaseY+1, (uint32_t)-1, sBuffer, nLenEnd);
         }
     }
 }
@@ -1362,7 +1365,7 @@ inline void MicroProfileDrawDetailedFrameHistory(uint32_t nWidth, uint32_t nHeig
         fBaseX = fXStart;
         uint32_t nColor = MICROPROFILE_FRAME_HISTORY_COLOR_CPU;
         if(nIndex == nSelectedFrame)
-            nColor = UINT32_MAX;
+            nColor = (uint32_t)-1;
         MicroProfileDrawBox(fXStart, nBaseY + fScale * nBarHeight, fXEnd, nBaseY+MICROPROFILE_FRAME_HISTORY_HEIGHT, nColor, MicroProfileBoxTypeBar);
         if(pNext->nFrameStartCpu > nCpuStart)
         {
@@ -1384,7 +1387,7 @@ inline void MicroProfileDrawDetailedView(uint32_t nWidth, uint32_t nHeight)
     uint32_t nBaseY = MICROPROFILE_TEXT_HEIGHT + 1;
 
     int nSelectedFrame = -1;
-    if(UI.nMouseY > nBaseY && UI.nMouseY <= nBaseY + MICROPROFILE_FRAME_HISTORY_HEIGHT && UI.nActiveMenu == UINT32_MAX)
+    if(UI.nMouseY > nBaseY && UI.nMouseY <= nBaseY + MICROPROFILE_FRAME_HISTORY_HEIGHT && UI.nActiveMenu == -1)
     {
 
         nSelectedFrame = ((MICROPROFILE_NUM_FRAMES) * (UI.nWidth-UI.nMouseX) / UI.nWidth);
@@ -1422,7 +1425,7 @@ inline void MicroProfileDrawHeader(int32_t nX, uint32_t nWidth, const char* pNam
     if(pName)
     {
         MicroProfileDrawBox(nX-8, MICROPROFILE_TEXT_HEIGHT + 2, nX + nWidth+5, MICROPROFILE_TEXT_HEIGHT + 2 + (MICROPROFILE_TEXT_HEIGHT+1), 0xff000000|g_nMicroProfileBackColors[1]);
-        MicroProfileDrawText(nX, MICROPROFILE_TEXT_HEIGHT + 2, UINT32_MAX, pName, (uint32_t)strlen(pName));
+        MicroProfileDrawText(nX, MICROPROFILE_TEXT_HEIGHT + 2, (uint32_t)-1, pName, (uint32_t)strlen(pName));
     }
 }
 
@@ -1437,7 +1440,7 @@ inline void MicroProfileLoopActiveGroupsDraw(int32_t nX, int32_t nY, const char*
     uint32_t nCount = 0;
     for(uint32_t j = 0; j < MICROPROFILE_MAX_GROUPS; ++j)
     {
-        uint64_t nMask = 1ULL << j;
+        uint64_t nMask = 1ll << j;
         if(nMask & nGroup)
         {
             nY += MICROPROFILE_TEXT_HEIGHT + 1;
@@ -1518,7 +1521,7 @@ inline void MicroProfileCalcTimers(float* pTimers, float* pAverage, float* pMax,
                 }
             }
         }
-        nMask <<= 1;
+        nMask <<= 1ll;
     }
 }
 
@@ -1540,7 +1543,7 @@ inline void MicroProfileDrawBarArrayCallback(uint32_t nTimer, uint32_t nIdx, uin
         snprintf(sBuffer, SBUF_MAX-1, "%5.2f", pTimers[nIdx]);
     if (!pTimers2)
         MicroProfileDrawBox(nX + nTextWidth, nY, nX + nTextWidth + fWidth * pTimers[nIdx+1], nY + nHeight, UI.nOpacityForeground|S.TimerInfo[nTimer].nColor, MicroProfileBoxTypeBar);
-    MicroProfileDrawText(nX, nY, UINT32_MAX, sBuffer, (uint32_t)strlen(sBuffer));
+    MicroProfileDrawText(nX, nY, (uint32_t)-1, sBuffer, (uint32_t)strlen(sBuffer));
 }
 
 
@@ -1561,7 +1564,7 @@ inline void MicroProfileDrawBarCallCountCallback(uint32_t nTimer, uint32_t nIdx,
     MicroProfile& S = *MicroProfileGet();
     char sBuffer[SBUF_MAX];
     int nLen = snprintf(sBuffer, SBUF_MAX-1, "%5d", S.Frame[nTimer].nCount);//fix
-    MicroProfileDrawText(nX, nY, UINT32_MAX, sBuffer, nLen);
+    MicroProfileDrawText(nX, nY, (uint32_t)-1, sBuffer, nLen);
 }
 
 inline uint32_t MicroProfileDrawBarCallCount(int32_t nX, int32_t nY, const char* pName)
@@ -1585,7 +1588,7 @@ inline void MicroProfileDrawBarMetaAverageCallback(uint32_t nTimer, uint32_t nId
     float fRcpFrames = pArgs->fRcpFrames;
     char sBuffer[SBUF_MAX];
     int nLen = snprintf(sBuffer, SBUF_MAX-1, "%5.2f", pCounters[nTimer] * fRcpFrames);
-    MicroProfileDrawText(nX - nLen * (MICROPROFILE_TEXT_WIDTH+1), nY, UINT32_MAX, sBuffer, nLen);
+    MicroProfileDrawText(nX - nLen * (MICROPROFILE_TEXT_WIDTH+1), nY, (uint32_t)-1, sBuffer, nLen);
 }
 
 inline uint32_t MicroProfileDrawBarMetaAverage(int32_t nX, int32_t nY, uint64_t* pCounters, const char* pName, uint32_t nTotalHeight)
@@ -1606,8 +1609,8 @@ inline void MicroProfileDrawBarMetaCountCallback(uint32_t nTimer, uint32_t nIdx,
 {
     uint64_t* pCounters = (uint64_t*)pExtra;
     char sBuffer[SBUF_MAX];
-    int nLen = snprintf(sBuffer, SBUF_MAX-1, "%5" PRIu64, pCounters[nTimer]);
-    MicroProfileDrawText(nX - nLen * (MICROPROFILE_TEXT_WIDTH+1), nY, UINT32_MAX, sBuffer, nLen);
+    int nLen = snprintf(sBuffer, SBUF_MAX-1, "%5llu", pCounters[nTimer]);
+    MicroProfileDrawText(nX - nLen * (MICROPROFILE_TEXT_WIDTH+1), nY, (uint32_t)-1, sBuffer, nLen);
 }
 
 inline uint32_t MicroProfileDrawBarMetaCount(int32_t nX, int32_t nY, uint64_t* pCounters, const char* pName, uint32_t nTotalHeight)
@@ -1664,7 +1667,7 @@ bool MicroProfileDrawGraph(uint32_t nScreenWidth, uint32_t nScreenHeight)
     if(bMouseOver)
     {
         float fXAvg = fMouseXPrc * MICROPROFILE_GRAPH_WIDTH + nX;
-        MicroProfileDrawLineVertical(fXAvg, nY, nY + MICROPROFILE_GRAPH_HEIGHT, UINT32_MAX);
+        MicroProfileDrawLineVertical(fXAvg, nY, nY + MICROPROFILE_GRAPH_HEIGHT, (uint32_t)-1);
     }
 
 
@@ -1703,7 +1706,7 @@ bool MicroProfileDrawGraph(uint32_t nScreenWidth, uint32_t nScreenHeight)
 
         char buf[32];
         int nLen = snprintf(buf, sizeof(buf)-1, "%5.2fms", S.fReferenceTime);
-        MicroProfileDrawText(nX+1, fY1 - (2+MICROPROFILE_TEXT_HEIGHT), UINT32_MAX, buf, nLen);
+        MicroProfileDrawText(nX+1, fY1 - (2+MICROPROFILE_TEXT_HEIGHT), (uint32_t)-1, buf, nLen);
     }
 
 
@@ -1779,7 +1782,7 @@ void MicroProfileDumpTimers()
 
     for(uint32_t j = 0; j < MICROPROFILE_MAX_GROUPS; ++j)
     {
-        uint64_t nMask = 1ULL << j;
+        uint64_t nMask = 1ll << j;
         if(nMask & nActiveGroup)
         {
             MICROPROFILE_PRINTF("%s\n", S.GroupInfo[j].pName);
@@ -1820,7 +1823,7 @@ inline void MicroProfileDrawBarView(uint32_t nScreenWidth, uint32_t nScreenHeigh
     uint32_t nNumGroups = 0;
     for(uint32_t j = 0; j < MICROPROFILE_MAX_GROUPS; ++j)
     {
-        if(nActiveGroup & (1ULL << j))
+        if(nActiveGroup & (1ll << j))
         {
             nNumTimers += S.GroupInfo[j].nNumTimers;
             nNumGroups += 1;
@@ -1875,7 +1878,7 @@ inline void MicroProfileDrawBarView(uint32_t nScreenWidth, uint32_t nScreenHeigh
         for(uint32_t i = 0; i < nNumTimers+nNumGroups+1; ++i)
         {
             uint32_t nY0 = nY + i * (nHeight + 1);
-            bool bInside = (UI.nActiveMenu == UINT32_MAX) && ((UI.nMouseY >= nY0) && (UI.nMouseY < (nY0 + nHeight + 1)));
+            bool bInside = (UI.nActiveMenu == -1) && ((UI.nMouseY >= nY0) && (UI.nMouseY < (nY0 + nHeight + 1)));
             MicroProfileDrawBox(nX, nY0, nWidth+nX, nY0 + (nHeight+1)+1, UI.nOpacityBackground | (g_nMicroProfileBackColors[nColorIndex++ & 1] + ((bInside) ? 0x002c2c2c : 0)));
         }
         nX += 10;
@@ -1924,22 +1927,22 @@ inline void MicroProfileDrawBarView(uint32_t nScreenWidth, uint32_t nScreenHeigh
     nY = nHeight + 3 - UI.nOffsetY;
     for(uint32_t i = 0; i < nNumTimers+nNumGroups+1; ++i)
     {
-        const uint32_t nY0 = nY + i * (nHeight + 1);
-        const bool bInside = (UI.nActiveMenu == UINT32_MAX) && ((UI.nMouseY >= nY0) && (UI.nMouseY < (nY0 + nHeight + 1)));
+        uint32_t nY0 = nY + i * (nHeight + 1);
+        bool bInside = (UI.nActiveMenu == -1) && ((UI.nMouseY >= nY0) && (UI.nMouseY < (nY0 + nHeight + 1)));
         MicroProfileDrawBox(nX, nY0, nTimerWidth, nY0 + (nHeight+1)+1, 0xff0000000 | (g_nMicroProfileBackColors[nColorIndex++ & 1] + ((bInside) ? 0x002c2c2c : 0)));
     }
     nX += MicroProfileDrawBarLegend(nX, nY, nTotalHeight, nTimerWidth-5) + 1;
 
     for(uint32_t j = 0; j < MICROPROFILE_MAX_GROUPS; ++j)
     {
-        if(nActiveGroup & (1ULL << j))
+        if(nActiveGroup & (1ll << j))
         {
-            MicroProfileDrawText(nX, nY + (1+nHeight) * nLegendOffset, UINT32_MAX, S.GroupInfo[j].pName, S.GroupInfo[j].nNameLen);
+            MicroProfileDrawText(nX, nY + (1+nHeight) * nLegendOffset, (uint32_t)-1, S.GroupInfo[j].pName, S.GroupInfo[j].nNameLen);
             nLegendOffset += S.GroupInfo[j].nNumTimers+1;
         }
     }
     MicroProfileDrawHeader(nX, nTimerWidth-5, "Group");
-    MicroProfileDrawTextRight(nTimerWidth-3, MICROPROFILE_TEXT_HEIGHT + 2, UINT32_MAX, "Timer", 5);
+    MicroProfileDrawTextRight(nTimerWidth-3, MICROPROFILE_TEXT_HEIGHT + 2, (uint32_t)-1, "Timer", 5);
     MicroProfileDrawLineVertical(nTimerWidth, 0, nTotalHeight+nY, UI.nOpacityBackground|g_nMicroProfileBackColors[0]|g_nMicroProfileBackColors[1]);
     MicroProfileDrawLineHorizontal(0, nWidth, 2*MICROPROFILE_TEXT_HEIGHT + 3, UI.nOpacityBackground|g_nMicroProfileBackColors[0]|g_nMicroProfileBackColors[1]);
 }
@@ -2000,7 +2003,7 @@ inline const char* MicroProfileUIMenuGroups(int nIndex, bool* bSelected)
             }
             else
             {
-                *bSelected = 0 != (S.nActiveGroupWanted & (1ULL << Item.nIndex));
+                *bSelected = 0 != (S.nActiveGroupWanted & (1ll << Item.nIndex));
                 snprintf(buffer, sizeof(buffer)-1, "   %s", Item.pName);
             }
             return buffer;
@@ -2012,18 +2015,16 @@ inline const char* MicroProfileUIMenuGroups(int nIndex, bool* bSelected)
 inline const char* MicroProfileUIMenuAggregate(int nIndex, bool* bSelected)
 {
     MicroProfile& S = *MicroProfileGet();
-    if(static_cast<uint32_t>(nIndex) < g_MicroProfileAggregatePresets.size())
+    if(nIndex < sizeof(g_MicroProfileAggregatePresets)/sizeof(g_MicroProfileAggregatePresets[0]))
     {
-        uint32_t val = g_MicroProfileAggregatePresets[nIndex];
-        *bSelected = S.nAggregateFlip == val;
-        if (0 == val)
-        {
+        int val = g_MicroProfileAggregatePresets[nIndex];
+        *bSelected = (int)S.nAggregateFlip == val;
+        if(0 == val)
             return "Infinite";
-        }
         else
         {
             static char buf[128];
-            snprintf(buf, sizeof(buf)-1, "%7u", val);
+            snprintf(buf, sizeof(buf)-1, "%7d", val);
             return buf;
         }
     }
@@ -2097,13 +2098,11 @@ inline const char* MicroProfileUIMenuPreset(int nIndex, bool* bSelected)
 {
     static char buf[128];
     *bSelected = false;
-    int nNumPresets = static_cast<int>(g_MicroProfilePresetNames.size());
+    int nNumPresets = sizeof(g_MicroProfilePresetNames) / sizeof(g_MicroProfilePresetNames[0]);
     int nIndexSave = nIndex - nNumPresets - 1;
-    if (nIndex == nNumPresets)
-    {
+    if(nIndex == nNumPresets)
         return "--";
-    }
-    else if(nIndexSave >=0 && nIndexSave < nNumPresets)
+    else if(nIndexSave >=0 && nIndexSave <nNumPresets)
     {
         snprintf(buf, sizeof(buf)-1, "Save '%s'", g_MicroProfilePresetNames[nIndexSave]);
         return buf;
@@ -2121,13 +2120,13 @@ inline const char* MicroProfileUIMenuPreset(int nIndex, bool* bSelected)
 
 inline const char* MicroProfileUIMenuCustom(int nIndex, bool* bSelected)
 {
-    if(UINT32_MAX == UI.nCustomActive)
+    if((uint32_t)-1 == UI.nCustomActive)
     {
         *bSelected = nIndex == 0;
     }
     else
     {
-        *bSelected = nIndex-2 == static_cast<int>(UI.nCustomActive);
+        *bSelected = nIndex-2 == UI.nCustomActive;
     }
     switch(nIndex)
     {
@@ -2203,7 +2202,7 @@ inline void MicroProfileUIClickGroups(int nIndex)
             else
             {
                 MP_ASSERT(Item.nIndex < S.nGroupCount);
-                S.nActiveGroupWanted ^= (1ULL << Item.nIndex);
+                S.nActiveGroupWanted ^= (1ll << Item.nIndex);
             }
         }
     }
@@ -2274,7 +2273,7 @@ inline void MicroProfileUIClickOptions(int nIndex)
 
 inline void MicroProfileUIClickPreset(int nIndex)
 {
-    int nNumPresets = static_cast<int>(g_MicroProfilePresetNames.size());
+    int nNumPresets = sizeof(g_MicroProfilePresetNames) / sizeof(g_MicroProfilePresetNames[0]);
     int nIndexSave = nIndex - nNumPresets - 1;
     if(nIndexSave >= 0 && nIndexSave < nNumPresets)
     {
@@ -2311,7 +2310,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
 
     uint32_t nX = 0;
     uint32_t nY = 0;
-
+    bool bMouseOver = UI.nMouseY < MICROPROFILE_TEXT_HEIGHT + 1;
 #define SBUF_SIZE 256
     char buffer[256];
     MicroProfileDrawBox(nX, nY, nX + nWidth, nY + (MICROPROFILE_TEXT_HEIGHT+1)+1, 0xff000000|g_nMicroProfileBackColors[1]);
@@ -2322,7 +2321,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
     uint32_t nNumMenuItems = 0;
 
     int nLen = snprintf(buffer, 127, "MicroProfile");
-    MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nLen);
+    MicroProfileDrawText(nX, nY, (uint32_t)-1, buffer, nLen);
     nX += (sizeof("MicroProfile")+2) * (MICROPROFILE_TEXT_WIDTH+1);
     pMenuText[nNumMenuItems++] = "Mode";
     pMenuText[nNumMenuItems++] = "Groups";
@@ -2410,7 +2409,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
     };
 
 
-    uint32_t nSelectMenu = UINT32_MAX;
+    uint32_t nSelectMenu = (uint32_t)-1;
     for(uint32_t i = 0; i < nNumMenuItems; ++i)
     {
         nMenuX[i] = nX;
@@ -2420,17 +2419,17 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
         {
             MicroProfileDrawBox(nX-1, nY, nX + nLen * (MICROPROFILE_TEXT_WIDTH+1), nY +(MICROPROFILE_TEXT_HEIGHT+1)+1, 0xff888888);
             nSelectMenu = i;
-            if((UI.nMouseLeft || UI.nMouseRight) && i == (uint32_t)nPauseIndex)
+            if((UI.nMouseLeft || UI.nMouseRight) && i == (int)nPauseIndex)
             {
                 S.nToggleRunning = 1;
             }
         }
-        MicroProfileDrawText(nX, nY, UINT32_MAX, pMenuText[i], (uint32_t)strlen(pMenuText[i]));
+        MicroProfileDrawText(nX, nY, (uint32_t)-1, pMenuText[i], (uint32_t)strlen(pMenuText[i]));
         nX += (nLen+1) * (MICROPROFILE_TEXT_WIDTH+1);
     }
-    uint32_t nMenu = nSelectMenu != UINT32_MAX ? nSelectMenu : UI.nActiveMenu;
+    uint32_t nMenu = nSelectMenu != (uint32_t)-1 ? nSelectMenu : UI.nActiveMenu;
     UI.nActiveMenu = nMenu;
-    if(UINT32_MAX != nMenu)
+    if((uint32_t)-1 != nMenu)
     {
         nX = nMenuX[nMenu];
         nY += MICROPROFILE_TEXT_HEIGHT+1;
@@ -2451,9 +2450,9 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
         {
             UI.nActiveMenu = nMenu;
         }
-        else if(nSelectMenu == UINT32_MAX)
+        else if(nSelectMenu == (uint32_t)-1)
         {
-            UI.nActiveMenu = UINT32_MAX;
+            UI.nActiveMenu = (uint32_t)-1;
         }
         MicroProfileDrawBox(nX, nY, nX + nWidth, nY + nHeight, 0xff000000|g_nMicroProfileBackColors[1]);
         for(int i = 0; i < nNumLines; ++i)
@@ -2462,6 +2461,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
             const char* pString = CB(i, &bSelected);
             if(UI.nMouseY >= nY && UI.nMouseY < nY + MICROPROFILE_TEXT_HEIGHT + 1)
             {
+                bMouseOver = true;
                 if(UI.nMouseLeft || UI.nMouseRight)
                 {
                     CBClick[nMenu](i);
@@ -2469,7 +2469,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
                 MicroProfileDrawBox(nX, nY, nX + nWidth, nY + MICROPROFILE_TEXT_HEIGHT + 1, 0xff888888);
             }
             int nLen = snprintf(buffer, SBUF_SIZE-1, "%c %s", bSelected ? '*' : ' ' ,pString);
-            MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nLen);
+            MicroProfileDrawText(nX, nY, (uint32_t)-1, buffer, nLen);
             nY += MICROPROFILE_TEXT_HEIGHT+1;
         }
     }
@@ -2484,7 +2484,7 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
         float fMaxMs = fToMs * S.nFlipMaxDisplay;
         int nLen = snprintf(FrameTimeMessage, sizeof(FrameTimeMessage)-1, "Time[%6.2f] Avg[%6.2f] Max[%6.2f]", fMs, fAverageMs, fMaxMs);
         pMenuText[nNumMenuItems++] = &FrameTimeMessage[0];
-        MicroProfileDrawText(nWidth - nLen * (MICROPROFILE_TEXT_WIDTH+1), 0, UINT32_MAX, FrameTimeMessage, nLen);
+        MicroProfileDrawText(nWidth - nLen * (MICROPROFILE_TEXT_WIDTH+1), 0, -1, FrameTimeMessage, nLen);
     }
 }
 
@@ -2538,7 +2538,7 @@ inline void MicroProfileMoveGraph()
 
 inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
 {
-    if(UINT32_MAX != UI.nCustomActive)
+    if((uint32_t)-1 != UI.nCustomActive)
     {
         MicroProfile& S = *MicroProfileGet();
         MP_ASSERT(UI.nCustomActive < MICROPROFILE_CUSTOM_MAX);
@@ -2571,8 +2571,8 @@ inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
             pColors[i] = S.TimerInfo[nTimerIndex].nColor;
         }
 
-        MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING + 3*MICROPROFILE_TEXT_WIDTH, nOffsetY, UINT32_MAX, "Avg", sizeof("Avg")-1);
-        MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING + 13*MICROPROFILE_TEXT_WIDTH, nOffsetY, UINT32_MAX, "Max", sizeof("Max")-1);
+        MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING + 3*MICROPROFILE_TEXT_WIDTH, nOffsetY, (uint32_t)-1, "Avg", sizeof("Avg")-1);
+        MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING + 13*MICROPROFILE_TEXT_WIDTH, nOffsetY, (uint32_t)-1, "Max", sizeof("Max")-1);
         for(uint32_t i = 0; i < nCount; ++i)
         {
             nOffsetY += (1+MICROPROFILE_TEXT_HEIGHT);
@@ -2582,10 +2582,10 @@ inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
             int nSize;
             uint32_t nOffsetX = MICROPROFILE_CUSTOM_PADDING;
             nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2f", pTimeAvg[i]);
-            MicroProfileDrawText(nOffsetX, nOffsetY, UINT32_MAX, Buffer, nSize);
+            MicroProfileDrawText(nOffsetX, nOffsetY, (uint32_t)-1, Buffer, nSize);
             nOffsetX += (nSize+2) * (MICROPROFILE_TEXT_WIDTH+1);
             nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2f", pTimeMax[i]);
-            MicroProfileDrawText(nOffsetX, nOffsetY, UINT32_MAX, Buffer, nSize);
+            MicroProfileDrawText(nOffsetX, nOffsetY, (uint32_t)-1, Buffer, nSize);
             nOffsetX += (nSize+2) * (MICROPROFILE_TEXT_WIDTH+1);
             nSize = snprintf(Buffer, sizeof(Buffer)-1, "%s:%s", S.GroupInfo[nGroupIndex].pName, pTimerInfo->pName);
             MicroProfileDrawText(nOffsetX, nOffsetY, pTimerInfo->nColor, Buffer, nSize);
@@ -2599,9 +2599,9 @@ inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
             nOffsetY = nOffsetYBase;
             float* pMs = pCustom->nFlags & MICROPROFILE_CUSTOM_BAR_SOURCE_MAX ? pTimeMax : pTimeAvg;
             const char* pString = pCustom->nFlags & MICROPROFILE_CUSTOM_BAR_SOURCE_MAX ? "Max" : "Avg";
-            MicroProfileDrawText(nMaxOffsetX, nOffsetY, UINT32_MAX, pString, static_cast<uint32_t>(strlen(pString)));
+            MicroProfileDrawText(nMaxOffsetX, nOffsetY, (uint32_t)-1, pString, static_cast<uint32_t>(strlen(pString)));
             int nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2fms", fReference);
-            MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, UINT32_MAX, Buffer, nSize);
+            MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, (uint32_t)-1, Buffer, nSize);
             for(uint32_t i = 0; i < nCount; ++i)
             {
                 nOffsetY += (1+MICROPROFILE_TEXT_HEIGHT);
@@ -2613,9 +2613,9 @@ inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
         {
             nOffsetY += 2*(1+MICROPROFILE_TEXT_HEIGHT);
             const char* pString = pCustom->nFlags & MICROPROFILE_CUSTOM_STACK_SOURCE_MAX ? "Max" : "Avg";
-            MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING, nOffsetY, UINT32_MAX, pString, static_cast<uint32_t>(strlen(pString)));
+            MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING, nOffsetY, (uint32_t)-1, pString, static_cast<uint32_t>(strlen(pString)));
             int nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2fms", fReference);
-            MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, UINT32_MAX, Buffer, nSize);
+            MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, (uint32_t)-1, Buffer, nSize);
             nOffsetY += (1+MICROPROFILE_TEXT_HEIGHT);
             float fPosX = MICROPROFILE_CUSTOM_PADDING;
             float* pMs = pCustom->nFlags & MICROPROFILE_CUSTOM_STACK_SOURCE_MAX ? pTimeMax : pTimeAvg;
@@ -2668,7 +2668,7 @@ inline void MicroProfileDraw(uint32_t nWidth, uint32_t nHeight)
         UI.nHoverTime = 0;
         UI.nHoverFrame = -1;
         if(S.nDisplay != MP_DRAW_DETAILED)
-            S.nContextSwitchHoverThread = S.nContextSwitchHoverThreadAfter = S.nContextSwitchHoverThreadBefore = UINT32_MAX;
+            S.nContextSwitchHoverThread = S.nContextSwitchHoverThreadAfter = S.nContextSwitchHoverThreadBefore = -1;
         MicroProfileMoveGraph();
 
 
@@ -2798,13 +2798,13 @@ inline void MicroProfileDraw(uint32_t nWidth, uint32_t nHeight)
 
 
 
-            if(UI.nActiveMenu == UINT32_MAX && !bMouseOverGraph)
+            if(UI.nActiveMenu == -1 && !bMouseOverGraph)
             {
                 if(UI.nHoverToken != MICROPROFILE_INVALID_TOKEN)
                 {
                     MicroProfileDrawFloatTooltip(UI.nMouseX, UI.nMouseY, UI.nHoverToken, UI.nHoverTime);
                 }
-                else if(S.nContextSwitchHoverThreadAfter != UINT32_MAX && S.nContextSwitchHoverThreadBefore != UINT32_MAX)
+                else if(S.nContextSwitchHoverThreadAfter != -1 && S.nContextSwitchHoverThreadBefore != -1)
                 {
                     float fToMs = MicroProfileTickToMsMultiplier(MicroProfileTicksPerSecondCpu());
                     MicroProfileStringArray ToolTip;
@@ -2820,7 +2820,7 @@ inline void MicroProfileDraw(uint32_t nWidth, uint32_t nHeight)
                     MicroProfileStringArrayFormat(&ToolTip, "%6.2fms", fToMs * nDifference );
                     MicroProfileStringArrayAddLiteral(&ToolTip, "CPU");
                     MicroProfileStringArrayFormat(&ToolTip, "%d", S.nContextSwitchHoverCpu);
-                    MicroProfileDrawFloatWindow(UI.nMouseX, UI.nMouseY+20, &ToolTip.ppStrings[0], ToolTip.nNumStrings, UINT32_MAX);
+                    MicroProfileDrawFloatWindow(UI.nMouseX, UI.nMouseY+20, &ToolTip.ppStrings[0], ToolTip.nNumStrings, -1);
 
 
                 }
@@ -2858,7 +2858,7 @@ inline void MicroProfileDraw(uint32_t nWidth, uint32_t nHeight)
                         }
                     }
                     #endif
-                    MicroProfileDrawFloatWindow(UI.nMouseX, UI.nMouseY+20, &ToolTip.ppStrings[0], ToolTip.nNumStrings, UINT32_MAX);
+                    MicroProfileDrawFloatWindow(UI.nMouseX, UI.nMouseY+20, &ToolTip.ppStrings[0], ToolTip.nNumStrings, -1);
                 }
                 if(UI.nMouseLeft)
                 {
@@ -2883,7 +2883,7 @@ inline void MicroProfileDraw(uint32_t nWidth, uint32_t nHeight)
 #endif
         m.unlock();
     }
-    else if(UI.nCustomActive != UINT32_MAX)
+    else if(UI.nCustomActive != (uint32_t)-1)
     {
         std::recursive_mutex& m = MicroProfileGetMutex();
         m.lock();
@@ -3179,7 +3179,7 @@ void MicroProfileLoadPreset(const char* pSuffix)
             {
                 if(0 == MP_STRCASECMP(pGroupName, S.GroupInfo[j].pName))
                 {
-                    S.nActiveGroupWanted |= (1ULL << j);
+                    S.nActiveGroupWanted |= (1ll << j);
                 }
             }
         }
@@ -3212,7 +3212,7 @@ void MicroProfileLoadPreset(const char* pSuffix)
                 uint64_t nGroupIndex = S.TimerInfo[j].nGroupIndex;
                 if(0 == MP_STRCASECMP(pGraphName, S.TimerInfo[j].pName) && 0 == MP_STRCASECMP(pGraphGroupName, S.GroupInfo[nGroupIndex].pName))
                 {
-                    MicroProfileToken nToken = MicroProfileMakeToken(1ULL << nGroupIndex, (uint16_t)j);
+                    MicroProfileToken nToken = MicroProfileMakeToken(1ll << nGroupIndex, (uint16_t)j);
                     S.Graph[i].nToken = nToken;         // note: group index is stored here but is checked without in MicroProfileToggleGraph()!
                     S.TimerInfo[j].bGraph = true;
                     if(nToken != nPrevToken)
@@ -3235,7 +3235,7 @@ inline uint32_t MicroProfileCustomGroupFind(const char* pCustomName)
             return i;
         }
     }
-    return UINT32_MAX;
+    return (uint32_t)-1;
 }
 
 inline uint32_t MicroProfileCustomGroup(const char* pCustomName)
@@ -3251,7 +3251,7 @@ inline uint32_t MicroProfileCustomGroup(const char* pCustomName)
     uint32_t nIndex = UI.nCustomCount;
     UI.nCustomCount++;
     memset(&UI.Custom[nIndex], 0, sizeof(UI.Custom[nIndex]));
-    size_t nLen = strlen(pCustomName);
+    uint32_t nLen = (uint32_t)strlen(pCustomName);
     if(nLen > MICROPROFILE_NAME_MAX_LEN-1)
         nLen = MICROPROFILE_NAME_MAX_LEN-1;
     memcpy(&UI.Custom[nIndex].pName[0], pCustomName, nLen);
@@ -3309,7 +3309,7 @@ inline void MicroProfileCustomGroupEnable(uint32_t nIndex)
 void MicroProfileCustomGroupToggle(const char* pCustomName)
 {
     uint32_t nIndex = MicroProfileCustomGroupFind(pCustomName);
-    if(nIndex == UINT32_MAX || nIndex == UI.nCustomActive)
+    if(nIndex == (uint32_t)-1 || nIndex == UI.nCustomActive)
     {
         MicroProfileCustomGroupDisable();
     }
@@ -3328,13 +3328,13 @@ void MicroProfileCustomGroupDisable()
 {
     MicroProfile& S = *MicroProfileGet();
     S.nForceGroupUI = 0;
-    UI.nCustomActive = UINT32_MAX;
+    UI.nCustomActive = (uint32_t)-1;
 }
 
 void MicroProfileCustomGroupAddTimer(const char* pCustomName, const char* pGroup, const char* pTimer)
 {
     uint32_t nIndex = MicroProfileCustomGroupFind(pCustomName);
-    if(UINT32_MAX == nIndex)
+    if((uint32_t)-1 == nIndex)
     {
         return;
     }
@@ -3344,7 +3344,7 @@ void MicroProfileCustomGroupAddTimer(const char* pCustomName, const char* pGroup
     MP_ASSERT(nToken != MICROPROFILE_INVALID_TOKEN); //Timer must be registered first.
     UI.Custom[nIndex].pTimers[nTimerIndex] = nToken;
     uint16_t nGroup = MicroProfileGetGroupIndex(nToken);
-    UI.Custom[nIndex].nGroupMask |= (1ULL << nGroup);
+    UI.Custom[nIndex].nGroupMask |= (1ll << nGroup);
     UI.Custom[nIndex].nNumTimers++;
 }
 

src/CMakeLists.txt

@@ -62,12 +62,6 @@ else()
         -Wno-unused-parameter
     )
 
-    # TODO: Remove when we update to a GCC compiler that enables this
-    #       by default (i.e. GCC 10 or newer).
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-        add_compile_options(-fconcepts)
-    endif()
-
     if (ARCHITECTURE_x86_64)
         add_compile_options("-mcx16")
     endif()

src/audio_core/cubeb_sink.cpp

@@ -78,7 +78,7 @@ public:
                 const s16 surround_left{samples[i + 4]};
                 const s16 surround_right{samples[i + 5]};
                 // Not used in the ATSC reference implementation
-                [[maybe_unused]] const s16 low_frequency_effects{samples[i + 3]};
+                [[maybe_unused]] const s16 low_frequency_effects { samples[i + 3] };
 
                 constexpr s32 clev{707}; // center mixing level coefficient
                 constexpr s32 slev{707}; // surround mixing level coefficient

src/audio_core/stream.cpp

@@ -36,10 +36,9 @@ Stream::Stream(Core::Timing::CoreTiming& core_timing, u32 sample_rate, Format fo
                ReleaseCallback&& release_callback, SinkStream& sink_stream, std::string&& name_)
     : sample_rate{sample_rate}, format{format}, release_callback{std::move(release_callback)},
       sink_stream{sink_stream}, core_timing{core_timing}, name{std::move(name_)} {
-    release_event =
-        Core::Timing::CreateEvent(name, [this](std::uintptr_t, std::chrono::nanoseconds ns_late) {
-            ReleaseActiveBuffer(ns_late);
-        });
+
+    release_event = Core::Timing::CreateEvent(
+        name, [this](u64, std::chrono::nanoseconds ns_late) { ReleaseActiveBuffer(ns_late); });
 }
 
 void Stream::Play() {

src/common/CMakeLists.txt

@@ -110,7 +110,6 @@ add_library(common STATIC
     common_funcs.h
     common_paths.h
     common_types.h
-    concepts.h
     dynamic_library.cpp
     dynamic_library.h
     fiber.cpp
@@ -172,6 +171,7 @@ add_library(common STATIC
     virtual_buffer.h
     wall_clock.cpp
     wall_clock.h
+    web_result.h
     zstd_compression.cpp
     zstd_compression.h
 )

src/common/algorithm.h

@@ -15,8 +15,7 @@
 namespace Common {
 
 template <class ForwardIt, class T, class Compare = std::less<>>
-[[nodiscard]] ForwardIt BinaryFind(ForwardIt first, ForwardIt last, const T& value,
-                                   Compare comp = {}) {
+ForwardIt BinaryFind(ForwardIt first, ForwardIt last, const T& value, Compare comp = {}) {
     // Note: BOTH type T and the type after ForwardIt is dereferenced
     // must be implicitly convertible to BOTH Type1 and Type2, used in Compare.
     // This is stricter than lower_bound requirement (see above)

src/common/alignment.h

@@ -9,7 +9,7 @@
 namespace Common {
 
 template <typename T>
-[[nodiscard]] constexpr T AlignUp(T value, std::size_t size) {
+constexpr T AlignUp(T value, std::size_t size) {
     static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
     auto mod{static_cast<T>(value % size)};
     value -= mod;
@@ -17,31 +17,31 @@ template <typename T>
 }
 
 template <typename T>
-[[nodiscard]] constexpr T AlignDown(T value, std::size_t size) {
+constexpr T AlignDown(T value, std::size_t size) {
     static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
     return static_cast<T>(value - value % size);
 }
 
 template <typename T>
-[[nodiscard]] constexpr T AlignBits(T value, std::size_t align) {
+constexpr T AlignBits(T value, std::size_t align) {
     static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
     return static_cast<T>((value + ((1ULL << align) - 1)) >> align << align);
 }
 
 template <typename T>
-[[nodiscard]] constexpr bool Is4KBAligned(T value) {
+constexpr bool Is4KBAligned(T value) {
     static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
     return (value & 0xFFF) == 0;
 }
 
 template <typename T>
-[[nodiscard]] constexpr bool IsWordAligned(T value) {
+constexpr bool IsWordAligned(T value) {
     static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
     return (value & 0b11) == 0;
 }
 
 template <typename T>
-[[nodiscard]] constexpr bool IsAligned(T value, std::size_t alignment) {
+constexpr bool IsAligned(T value, std::size_t alignment) {
     using U = typename std::make_unsigned<T>::type;
     const U mask = static_cast<U>(alignment - 1);
     return (value & mask) == 0;
@@ -64,7 +64,7 @@ public:
     template <typename T2>
     constexpr AlignmentAllocator(const AlignmentAllocator<T2, Align>&) noexcept {}
 
-    [[nodiscard]] T* allocate(size_type n) {
+    T* allocate(size_type n) {
         return static_cast<T*>(::operator new (n * sizeof(T), std::align_val_t{Align}));
     }
 

src/common/assert.h

@@ -17,12 +17,11 @@
 // enough for our purposes.
 template <typename Fn>
 #if defined(_MSC_VER)
-[[msvc::noinline, noreturn]]
+__declspec(noinline, noreturn)
 #elif defined(__GNUC__)
-[[gnu::cold, gnu::noinline, noreturn]]
+    __attribute__((noinline, noreturn, cold))
 #endif
-static void
-assert_noinline_call(const Fn& fn) {
+    static void assert_noinline_call(const Fn& fn) {
     fn();
     Crash();
     exit(1); // Keeps GCC's mouth shut about this actually returning

src/common/atomic_ops.cpp

@@ -14,55 +14,50 @@ namespace Common {
 
 #if _MSC_VER
 
-bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected) {
-    const u8 result =
-        _InterlockedCompareExchange8(reinterpret_cast<volatile char*>(pointer), value, expected);
+bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected) {
+    u8 result = _InterlockedCompareExchange8((char*)pointer, value, expected);
     return result == expected;
 }
 
-bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected) {
-    const u16 result =
-        _InterlockedCompareExchange16(reinterpret_cast<volatile short*>(pointer), value, expected);
+bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected) {
+    u16 result = _InterlockedCompareExchange16((short*)pointer, value, expected);
     return result == expected;
 }
 
-bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected) {
-    const u32 result =
-        _InterlockedCompareExchange(reinterpret_cast<volatile long*>(pointer), value, expected);
+bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected) {
+    u32 result = _InterlockedCompareExchange((long*)pointer, value, expected);
     return result == expected;
 }
 
-bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected) {
-    const u64 result = _InterlockedCompareExchange64(reinterpret_cast<volatile __int64*>(pointer),
-                                                     value, expected);
+bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) {
+    u64 result = _InterlockedCompareExchange64((__int64*)pointer, value, expected);
     return result == expected;
 }
 
-bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected) {
-    return _InterlockedCompareExchange128(reinterpret_cast<volatile __int64*>(pointer), value[1],
-                                          value[0],
-                                          reinterpret_cast<__int64*>(expected.data())) != 0;
+bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) {
+    return _InterlockedCompareExchange128((__int64*)pointer, value[1], value[0],
+                                          (__int64*)expected.data()) != 0;
 }
 
 #else
 
-bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected) {
+bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected) {
     return __sync_bool_compare_and_swap(pointer, expected, value);
 }
 
-bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected) {
+bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected) {
     return __sync_bool_compare_and_swap(pointer, expected, value);
 }
 
-bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected) {
+bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected) {
     return __sync_bool_compare_and_swap(pointer, expected, value);
 }
 
-bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected) {
+bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) {
     return __sync_bool_compare_and_swap(pointer, expected, value);
 }
 
-bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected) {
+bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) {
     unsigned __int128 value_a;
     unsigned __int128 expected_a;
     std::memcpy(&value_a, value.data(), sizeof(u128));

src/common/atomic_ops.h

@@ -8,10 +8,10 @@
 
 namespace Common {
 
-[[nodiscard]] bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected);
-[[nodiscard]] bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected);
-[[nodiscard]] bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected);
-[[nodiscard]] bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected);
-[[nodiscard]] bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected);
+bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected);
+bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected);
+bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected);
+bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected);
+bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected);
 
 } // namespace Common

src/common/bit_field.h

@@ -36,6 +36,13 @@
 #include "common/common_funcs.h"
 #include "common/swap.h"
 
+// Inlining
+#ifdef _WIN32
+#define FORCE_INLINE __forceinline
+#else
+#define FORCE_INLINE inline __attribute__((always_inline))
+#endif
+
 /*
  * Abstract bitfield class
  *
@@ -135,8 +142,8 @@ public:
      * containing several bitfields can be assembled by formatting each of their values and ORing
      * the results together.
      */
-    [[nodiscard]] static constexpr StorageType FormatValue(const T& value) {
-        return (static_cast<StorageType>(value) << position) & mask;
+    static constexpr FORCE_INLINE StorageType FormatValue(const T& value) {
+        return ((StorageType)value << position) & mask;
     }
 
     /**
@@ -144,7 +151,7 @@ public:
      * (such as Value() or operator T), but this can be used to extract a value from a bitfield
      * union in a constexpr context.
      */
-    [[nodiscard]] static constexpr T ExtractValue(const StorageType& storage) {
+    static constexpr FORCE_INLINE T ExtractValue(const StorageType& storage) {
         if constexpr (std::numeric_limits<UnderlyingType>::is_signed) {
             std::size_t shift = 8 * sizeof(T) - bits;
             return static_cast<T>(static_cast<UnderlyingType>(storage << (shift - position)) >>
@@ -168,7 +175,7 @@ public:
     constexpr BitField(BitField&&) noexcept = default;
     constexpr BitField& operator=(BitField&&) noexcept = default;
 
-    [[nodiscard]] constexpr operator T() const {
+    constexpr operator T() const {
         return Value();
     }
 
@@ -176,11 +183,11 @@ public:
         storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value));
     }
 
-    [[nodiscard]] constexpr T Value() const {
+    constexpr T Value() const {
         return ExtractValue(storage);
     }
 
-    [[nodiscard]] constexpr explicit operator bool() const {
+    constexpr explicit operator bool() const {
         return Value() != 0;
     }
 

src/common/bit_util.h

@@ -17,12 +17,12 @@ namespace Common {
 
 /// Gets the size of a specified type T in bits.
 template <typename T>
-[[nodiscard]] constexpr std::size_t BitSize() {
+constexpr std::size_t BitSize() {
     return sizeof(T) * CHAR_BIT;
 }
 
 #ifdef _MSC_VER
-[[nodiscard]] inline u32 CountLeadingZeroes32(u32 value) {
+inline u32 CountLeadingZeroes32(u32 value) {
     unsigned long leading_zero = 0;
 
     if (_BitScanReverse(&leading_zero, value) != 0) {
@@ -32,7 +32,7 @@ template <typename T>
     return 32;
 }
 
-[[nodiscard]] inline u32 CountLeadingZeroes64(u64 value) {
+inline u32 CountLeadingZeroes64(u64 value) {
     unsigned long leading_zero = 0;
 
     if (_BitScanReverse64(&leading_zero, value) != 0) {
@@ -42,7 +42,7 @@ template <typename T>
     return 64;
 }
 #else
-[[nodiscard]] inline u32 CountLeadingZeroes32(u32 value) {
+inline u32 CountLeadingZeroes32(u32 value) {
     if (value == 0) {
         return 32;
     }
@@ -50,7 +50,7 @@ template <typename T>
     return static_cast<u32>(__builtin_clz(value));
 }
 
-[[nodiscard]] inline u32 CountLeadingZeroes64(u64 value) {
+inline u32 CountLeadingZeroes64(u64 value) {
     if (value == 0) {
         return 64;
     }
@@ -60,7 +60,7 @@ template <typename T>
 #endif
 
 #ifdef _MSC_VER
-[[nodiscard]] inline u32 CountTrailingZeroes32(u32 value) {
+inline u32 CountTrailingZeroes32(u32 value) {
     unsigned long trailing_zero = 0;
 
     if (_BitScanForward(&trailing_zero, value) != 0) {
@@ -70,7 +70,7 @@ template <typename T>
     return 32;
 }
 
-[[nodiscard]] inline u32 CountTrailingZeroes64(u64 value) {
+inline u32 CountTrailingZeroes64(u64 value) {
     unsigned long trailing_zero = 0;
 
     if (_BitScanForward64(&trailing_zero, value) != 0) {
@@ -80,7 +80,7 @@ template <typename T>
     return 64;
 }
 #else
-[[nodiscard]] inline u32 CountTrailingZeroes32(u32 value) {
+inline u32 CountTrailingZeroes32(u32 value) {
     if (value == 0) {
         return 32;
     }
@@ -88,7 +88,7 @@ template <typename T>
     return static_cast<u32>(__builtin_ctz(value));
 }
 
-[[nodiscard]] inline u32 CountTrailingZeroes64(u64 value) {
+inline u32 CountTrailingZeroes64(u64 value) {
     if (value == 0) {
         return 64;
     }
@@ -99,13 +99,13 @@ template <typename T>
 
 #ifdef _MSC_VER
 
-[[nodiscard]] inline u32 MostSignificantBit32(const u32 value) {
+inline u32 MostSignificantBit32(const u32 value) {
     unsigned long result;
     _BitScanReverse(&result, value);
     return static_cast<u32>(result);
 }
 
-[[nodiscard]] inline u32 MostSignificantBit64(const u64 value) {
+inline u32 MostSignificantBit64(const u64 value) {
     unsigned long result;
     _BitScanReverse64(&result, value);
     return static_cast<u32>(result);
@@ -113,30 +113,30 @@ template <typename T>
 
 #else
 
-[[nodiscard]] inline u32 MostSignificantBit32(const u32 value) {
+inline u32 MostSignificantBit32(const u32 value) {
     return 31U - static_cast<u32>(__builtin_clz(value));
 }
 
-[[nodiscard]] inline u32 MostSignificantBit64(const u64 value) {
+inline u32 MostSignificantBit64(const u64 value) {
     return 63U - static_cast<u32>(__builtin_clzll(value));
 }
 
 #endif
 
-[[nodiscard]] inline u32 Log2Floor32(const u32 value) {
+inline u32 Log2Floor32(const u32 value) {
     return MostSignificantBit32(value);
 }
 
-[[nodiscard]] inline u32 Log2Ceil32(const u32 value) {
+inline u32 Log2Ceil32(const u32 value) {
     const u32 log2_f = Log2Floor32(value);
     return log2_f + ((value ^ (1U << log2_f)) != 0U);
 }
 
-[[nodiscard]] inline u32 Log2Floor64(const u64 value) {
+inline u32 Log2Floor64(const u64 value) {
     return MostSignificantBit64(value);
 }
 
-[[nodiscard]] inline u32 Log2Ceil64(const u64 value) {
+inline u32 Log2Ceil64(const u64 value) {
     const u64 log2_f = static_cast<u64>(Log2Floor64(value));
     return static_cast<u32>(log2_f + ((value ^ (1ULL << log2_f)) != 0ULL));
 }

src/common/cityhash.h

@@ -61,43 +61,42 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstdint>
 #include <utility>
+#include <stdint.h>
+#include <stdlib.h> // for std::size_t.
 
 namespace Common {
 
-using uint128 = std::pair<uint64_t, uint64_t>;
+typedef std::pair<uint64_t, uint64_t> uint128;
 
-[[nodiscard]] inline uint64_t Uint128Low64(const uint128& x) {
+inline uint64_t Uint128Low64(const uint128& x) {
     return x.first;
 }
-[[nodiscard]] inline uint64_t Uint128High64(const uint128& x) {
+inline uint64_t Uint128High64(const uint128& x) {
     return x.second;
 }
 
 // Hash function for a byte array.
-[[nodiscard]] uint64_t CityHash64(const char* buf, std::size_t len);
+uint64_t CityHash64(const char* buf, std::size_t len);
 
 // Hash function for a byte array.  For convenience, a 64-bit seed is also
 // hashed into the result.
-[[nodiscard]] uint64_t CityHash64WithSeed(const char* buf, std::size_t len, uint64_t seed);
+uint64_t CityHash64WithSeed(const char* buf, std::size_t len, uint64_t seed);
 
 // Hash function for a byte array.  For convenience, two seeds are also
 // hashed into the result.
-[[nodiscard]] uint64_t CityHash64WithSeeds(const char* buf, std::size_t len, uint64_t seed0,
-                                           uint64_t seed1);
+uint64_t CityHash64WithSeeds(const char* buf, std::size_t len, uint64_t seed0, uint64_t seed1);
 
 // Hash function for a byte array.
-[[nodiscard]] uint128 CityHash128(const char* s, std::size_t len);
+uint128 CityHash128(const char* s, std::size_t len);
 
 // Hash function for a byte array.  For convenience, a 128-bit seed is also
 // hashed into the result.
-[[nodiscard]] uint128 CityHash128WithSeed(const char* s, std::size_t len, uint128 seed);
+uint128 CityHash128WithSeed(const char* s, std::size_t len, uint128 seed);
 
 // Hash 128 input bits down to 64 bits of output.
 // This is intended to be a reasonably good hash function.
-[[nodiscard]] inline uint64_t Hash128to64(const uint128& x) {
+inline uint64_t Hash128to64(const uint128& x) {
     // Murmur-inspired hashing.
     const uint64_t kMul = 0x9ddfea08eb382d69ULL;
     uint64_t a = (Uint128Low64(x) ^ Uint128High64(x)) * kMul;

src/common/color.h

@@ -10,45 +10,45 @@
 #include "common/swap.h"
 #include "common/vector_math.h"
 
-namespace Common::Color {
+namespace Color {
 
 /// Convert a 1-bit color component to 8 bit
-[[nodiscard]] constexpr u8 Convert1To8(u8 value) {
+constexpr u8 Convert1To8(u8 value) {
     return value * 255;
 }
 
 /// Convert a 4-bit color component to 8 bit
-[[nodiscard]] constexpr u8 Convert4To8(u8 value) {
+constexpr u8 Convert4To8(u8 value) {
     return (value << 4) | value;
 }
 
 /// Convert a 5-bit color component to 8 bit
-[[nodiscard]] constexpr u8 Convert5To8(u8 value) {
+constexpr u8 Convert5To8(u8 value) {
     return (value << 3) | (value >> 2);
 }
 
 /// Convert a 6-bit color component to 8 bit
-[[nodiscard]] constexpr u8 Convert6To8(u8 value) {
+constexpr u8 Convert6To8(u8 value) {
     return (value << 2) | (value >> 4);
 }
 
 /// Convert a 8-bit color component to 1 bit
-[[nodiscard]] constexpr u8 Convert8To1(u8 value) {
+constexpr u8 Convert8To1(u8 value) {
     return value >> 7;
 }
 
 /// Convert a 8-bit color component to 4 bit
-[[nodiscard]] constexpr u8 Convert8To4(u8 value) {
+constexpr u8 Convert8To4(u8 value) {
     return value >> 4;
 }
 
 /// Convert a 8-bit color component to 5 bit
-[[nodiscard]] constexpr u8 Convert8To5(u8 value) {
+constexpr u8 Convert8To5(u8 value) {
     return value >> 3;
 }
 
 /// Convert a 8-bit color component to 6 bit
-[[nodiscard]] constexpr u8 Convert8To6(u8 value) {
+constexpr u8 Convert8To6(u8 value) {
     return value >> 2;
 }
 
@@ -57,7 +57,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRGBA8(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRGBA8(const u8* bytes) {
     return {bytes[3], bytes[2], bytes[1], bytes[0]};
 }
 
@@ -66,7 +66,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRGB8(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRGB8(const u8* bytes) {
     return {bytes[2], bytes[1], bytes[0], 255};
 }
 
@@ -75,7 +75,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRG8(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRG8(const u8* bytes) {
     return {bytes[1], bytes[0], 0, 255};
 }
 
@@ -84,7 +84,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRGB565(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRGB565(const u8* bytes) {
     u16_le pixel;
     std::memcpy(&pixel, bytes, sizeof(pixel));
     return {Convert5To8((pixel >> 11) & 0x1F), Convert6To8((pixel >> 5) & 0x3F),
@@ -96,7 +96,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRGB5A1(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRGB5A1(const u8* bytes) {
     u16_le pixel;
     std::memcpy(&pixel, bytes, sizeof(pixel));
     return {Convert5To8((pixel >> 11) & 0x1F), Convert5To8((pixel >> 6) & 0x1F),
@@ -108,7 +108,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source color
  * @return Result color decoded as Common::Vec4<u8>
  */
-[[nodiscard]] inline Common::Vec4<u8> DecodeRGBA4(const u8* bytes) {
+inline Common::Vec4<u8> DecodeRGBA4(const u8* bytes) {
     u16_le pixel;
     std::memcpy(&pixel, bytes, sizeof(pixel));
     return {Convert4To8((pixel >> 12) & 0xF), Convert4To8((pixel >> 8) & 0xF),
@@ -120,7 +120,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source value
  * @return Depth value as an u32
  */
-[[nodiscard]] inline u32 DecodeD16(const u8* bytes) {
+inline u32 DecodeD16(const u8* bytes) {
     u16_le data;
     std::memcpy(&data, bytes, sizeof(data));
     return data;
@@ -131,7 +131,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source value
  * @return Depth value as an u32
  */
-[[nodiscard]] inline u32 DecodeD24(const u8* bytes) {
+inline u32 DecodeD24(const u8* bytes) {
     return (bytes[2] << 16) | (bytes[1] << 8) | bytes[0];
 }
 
@@ -140,7 +140,7 @@ namespace Common::Color {
  * @param bytes Pointer to encoded source values
  * @return Resulting values stored as a Common::Vec2
  */
-[[nodiscard]] inline Common::Vec2<u32> DecodeD24S8(const u8* bytes) {
+inline Common::Vec2<u32> DecodeD24S8(const u8* bytes) {
     return {static_cast<u32>((bytes[2] << 16) | (bytes[1] << 8) | bytes[0]), bytes[3]};
 }
 
@@ -268,4 +268,4 @@ inline void EncodeX24S8(u8 stencil, u8* bytes) {
     bytes[3] = stencil;
 }
 
-} // namespace Common::Color
+} // namespace Color

src/common/common_funcs.h

@@ -53,49 +53,43 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
 // Call directly after the command or use the error num.
 // This function might change the error code.
 // Defined in Misc.cpp.
-[[nodiscard]] std::string GetLastErrorMsg();
+std::string GetLastErrorMsg();
 
 #define DECLARE_ENUM_FLAG_OPERATORS(type)                                                          \
-    [[nodiscard]] constexpr type operator|(type a, type b) noexcept {                              \
+    constexpr type operator|(type a, type b) noexcept {                                            \
         using T = std::underlying_type_t<type>;                                                    \
         return static_cast<type>(static_cast<T>(a) | static_cast<T>(b));                           \
     }                                                                                              \
-    [[nodiscard]] constexpr type operator&(type a, type b) noexcept {                              \
+    constexpr type operator&(type a, type b) noexcept {                                            \
         using T = std::underlying_type_t<type>;                                                    \
         return static_cast<type>(static_cast<T>(a) & static_cast<T>(b));                           \
     }                                                                                              \
-    [[nodiscard]] constexpr type operator^(type a, type b) noexcept {                              \
-        using T = std::underlying_type_t<type>;                                                    \
-        return static_cast<type>(static_cast<T>(a) ^ static_cast<T>(b));                           \
-    }                                                                                              \
     constexpr type& operator|=(type& a, type b) noexcept {                                         \
-        a = a | b;                                                                                 \
+        using T = std::underlying_type_t<type>;                                                    \
+        a = static_cast<type>(static_cast<T>(a) | static_cast<T>(b));                              \
         return a;                                                                                  \
     }                                                                                              \
     constexpr type& operator&=(type& a, type b) noexcept {                                         \
-        a = a & b;                                                                                 \
+        using T = std::underlying_type_t<type>;                                                    \
+        a = static_cast<type>(static_cast<T>(a) & static_cast<T>(b));                              \
         return a;                                                                                  \
     }                                                                                              \
-    constexpr type& operator^=(type& a, type b) noexcept {                                         \
-        a = a ^ b;                                                                                 \
-        return a;                                                                                  \
-    }                                                                                              \
-    [[nodiscard]] constexpr type operator~(type key) noexcept {                                    \
+    constexpr type operator~(type key) noexcept {                                                  \
         using T = std::underlying_type_t<type>;                                                    \
         return static_cast<type>(~static_cast<T>(key));                                            \
     }                                                                                              \
-    [[nodiscard]] constexpr bool True(type key) noexcept {                                         \
+    constexpr bool True(type key) noexcept {                                                       \
         using T = std::underlying_type_t<type>;                                                    \
         return static_cast<T>(key) != 0;                                                           \
     }                                                                                              \
-    [[nodiscard]] constexpr bool False(type key) noexcept {                                        \
+    constexpr bool False(type key) noexcept {                                                      \
         using T = std::underlying_type_t<type>;                                                    \
         return static_cast<T>(key) == 0;                                                           \
     }
 
 namespace Common {
 
-[[nodiscard]] constexpr u32 MakeMagic(char a, char b, char c, char d) {
+constexpr u32 MakeMagic(char a, char b, char c, char d) {
     return u32(a) | u32(b) << 8 | u32(c) << 16 | u32(d) << 24;
 }
 

src/common/common_paths.h

@@ -35,7 +35,6 @@
 #define KEYS_DIR "keys"
 #define LOAD_DIR "load"
 #define DUMP_DIR "dump"
-#define SCREENSHOTS_DIR "screenshots"
 #define SHADER_DIR "shader"
 #define LOG_DIR "log"
 

src/common/concepts.h

@@ -1,34 +0,0 @@
-// Copyright 2020 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <type_traits>
-
-namespace Common {
-
-// Check if type is like an STL container
-template <typename T>
-concept IsSTLContainer = requires(T t) {
-    typename T::value_type;
-    typename T::iterator;
-    typename T::const_iterator;
-    // TODO(ogniK): Replace below is std::same_as<void> when MSVC supports it.
-    t.begin();
-    t.end();
-    t.cbegin();
-    t.cend();
-    t.data();
-    t.size();
-};
-
-// TODO: Replace with std::derived_from when the <concepts> header
-//       is available on all supported platforms.
-template <typename Derived, typename Base>
-concept DerivedFrom = requires {
-    std::is_base_of_v<Base, Derived>;
-    std::is_convertible_v<const volatile Derived*, const volatile Base*>;
-};
-
-} // namespace Common

src/common/detached_tasks.cpp

@@ -34,7 +34,8 @@ void DetachedTasks::AddTask(std::function<void()> task) {
         std::unique_lock lock{instance->mutex};
         --instance->count;
         std::notify_all_at_thread_exit(instance->cv, std::move(lock));
-    }).detach();
+    })
+        .detach();
 }
 
 } // namespace Common

src/common/dynamic_library.cpp

@@ -21,7 +21,7 @@ namespace Common {
 DynamicLibrary::DynamicLibrary() = default;
 
 DynamicLibrary::DynamicLibrary(const char* filename) {
-    void(Open(filename));
+    Open(filename);
 }
 
 DynamicLibrary::DynamicLibrary(DynamicLibrary&& rhs) noexcept

src/common/dynamic_library.h

@@ -33,7 +33,7 @@ public:
     ~DynamicLibrary();
 
     /// Returns the specified library name with the platform-specific suffix added.
-    [[nodiscard]] static std::string GetUnprefixedFilename(const char* filename);
+    static std::string GetUnprefixedFilename(const char* filename);
 
     /// Returns the specified library name in platform-specific format.
     /// Major/minor versions will not be included if set to -1.
@@ -41,29 +41,28 @@ public:
     /// Windows: LIBNAME-MAJOR-MINOR.dll
     /// Linux: libLIBNAME.so.MAJOR.MINOR
     /// Mac: libLIBNAME.MAJOR.MINOR.dylib
-    [[nodiscard]] static std::string GetVersionedFilename(const char* libname, int major = -1,
-                                                          int minor = -1);
+    static std::string GetVersionedFilename(const char* libname, int major = -1, int minor = -1);
 
     /// Returns true if a module is loaded, otherwise false.
-    [[nodiscard]] bool IsOpen() const {
+    bool IsOpen() const {
         return handle != nullptr;
     }
 
     /// Loads (or replaces) the handle with the specified library file name.
     /// Returns true if the library was loaded and can be used.
-    [[nodiscard]] bool Open(const char* filename);
+    bool Open(const char* filename);
 
     /// Unloads the library, any function pointers from this library are no longer valid.
     void Close();
 
     /// Returns the address of the specified symbol (function or variable) as an untyped pointer.
     /// If the specified symbol does not exist in this library, nullptr is returned.
-    [[nodiscard]] void* GetSymbolAddress(const char* name) const;
+    void* GetSymbolAddress(const char* name) const;
 
     /// Obtains the address of the specified symbol, automatically casting to the correct type.
     /// Returns true if the symbol was found and assigned, otherwise false.
     template <typename T>
-    [[nodiscard]] bool GetSymbol(const char* name, T* ptr) const {
+    bool GetSymbol(const char* name, T* ptr) const {
         *ptr = reinterpret_cast<T>(GetSymbolAddress(name));
         return *ptr != nullptr;
     }

src/common/fiber.h

@@ -47,7 +47,7 @@ public:
     /// Yields control from Fiber 'from' to Fiber 'to'
     /// Fiber 'from' must be the currently running fiber.
     static void YieldTo(std::shared_ptr<Fiber>& from, std::shared_ptr<Fiber>& to);
-    [[nodiscard]] static std::shared_ptr<Fiber> ThreadToFiber();
+    static std::shared_ptr<Fiber> ThreadToFiber();
 
     void SetRewindPoint(std::function<void(void*)>&& rewind_func, void* start_parameter);
 

src/common/file_util.cpp

@@ -74,7 +74,7 @@
 // This namespace has various generic functions related to files and paths.
 // The code still needs a ton of cleanup.
 // REMEMBER: strdup considered harmful!
-namespace Common::FS {
+namespace FileUtil {
 
 // Remove any ending forward slashes from directory paths
 // Modifies argument.
@@ -196,7 +196,7 @@ bool CreateFullPath(const std::string& fullPath) {
     int panicCounter = 100;
     LOG_TRACE(Common_Filesystem, "path {}", fullPath);
 
-    if (Exists(fullPath)) {
+    if (FileUtil::Exists(fullPath)) {
         LOG_DEBUG(Common_Filesystem, "path exists {}", fullPath);
         return true;
     }
@@ -212,7 +212,7 @@ bool CreateFullPath(const std::string& fullPath) {
 
         // Include the '/' so the first call is CreateDir("/") rather than CreateDir("")
         std::string const subPath(fullPath.substr(0, position + 1));
-        if (!IsDirectory(subPath) && !CreateDir(subPath)) {
+        if (!FileUtil::IsDirectory(subPath) && !FileUtil::CreateDir(subPath)) {
             LOG_ERROR(Common, "CreateFullPath: directory creation failed");
             return false;
         }
@@ -231,7 +231,7 @@ bool DeleteDir(const std::string& filename) {
     LOG_TRACE(Common_Filesystem, "directory {}", filename);
 
     // check if a directory
-    if (!IsDirectory(filename)) {
+    if (!FileUtil::IsDirectory(filename)) {
         LOG_ERROR(Common_Filesystem, "Not a directory {}", filename);
         return false;
     }
@@ -371,7 +371,7 @@ u64 GetSize(FILE* f) {
 bool CreateEmptyFile(const std::string& filename) {
     LOG_TRACE(Common_Filesystem, "{}", filename);
 
-    if (!IOFile(filename, "wb").IsOpen()) {
+    if (!FileUtil::IOFile(filename, "wb").IsOpen()) {
         LOG_ERROR(Common_Filesystem, "failed {}: {}", filename, GetLastErrorMsg());
         return false;
     }
@@ -488,34 +488,29 @@ bool DeleteDirRecursively(const std::string& directory, unsigned int recursion)
         return false;
 
     // Delete the outermost directory
-    DeleteDir(directory);
+    FileUtil::DeleteDir(directory);
     return true;
 }
 
 void CopyDir(const std::string& source_path, const std::string& dest_path) {
 #ifndef _WIN32
-    if (source_path == dest_path) {
+    if (source_path == dest_path)
         return;
-    }
-    if (!Exists(source_path)) {
+    if (!FileUtil::Exists(source_path))
         return;
-    }
-    if (!Exists(dest_path)) {
-        CreateFullPath(dest_path);
-    }
+    if (!FileUtil::Exists(dest_path))
+        FileUtil::CreateFullPath(dest_path);
 
     DIR* dirp = opendir(source_path.c_str());
-    if (!dirp) {
+    if (!dirp)
         return;
-    }
 
     while (struct dirent* result = readdir(dirp)) {
         const std::string virtualName(result->d_name);
         // check for "." and ".."
         if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-            ((virtualName[0] == '.') && (virtualName[1] == '.') && (virtualName[2] == '\0'))) {
+            ((virtualName[0] == '.') && (virtualName[1] == '.') && (virtualName[2] == '\0')))
             continue;
-        }
 
         std::string source, dest;
         source = source_path + virtualName;
@@ -523,13 +518,11 @@ void CopyDir(const std::string& source_path, const std::string& dest_path) {
         if (IsDirectory(source)) {
             source += '/';
             dest += '/';
-            if (!Exists(dest)) {
-                CreateFullPath(dest);
-            }
+            if (!FileUtil::Exists(dest))
+                FileUtil::CreateFullPath(dest);
             CopyDir(source, dest);
-        } else if (!Exists(dest)) {
-            Copy(source, dest);
-        }
+        } else if (!FileUtil::Exists(dest))
+            FileUtil::Copy(source, dest);
     }
     closedir(dirp);
 #endif
@@ -545,7 +538,7 @@ std::optional<std::string> GetCurrentDir() {
     if (!dir) {
 #endif
         LOG_ERROR(Common_Filesystem, "GetCurrentDirectory failed: {}", GetLastErrorMsg());
-        return std::nullopt;
+        return {};
     }
 #ifdef _WIN32
     std::string strDir = Common::UTF16ToUTF8(dir);
@@ -553,7 +546,7 @@ std::optional<std::string> GetCurrentDir() {
     std::string strDir = dir;
 #endif
     free(dir);
-    return std::move(strDir);
+    return strDir;
 }
 
 bool SetCurrentDir(const std::string& directory) {
@@ -675,7 +668,7 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
     if (user_path.empty()) {
 #ifdef _WIN32
         user_path = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
-        if (!IsDirectory(user_path)) {
+        if (!FileUtil::IsDirectory(user_path)) {
             user_path = AppDataRoamingDirectory() + DIR_SEP EMU_DATA_DIR DIR_SEP;
         } else {
             LOG_INFO(Common_Filesystem, "Using the local user directory");
@@ -684,7 +677,7 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
         paths.emplace(UserPath::ConfigDir, user_path + CONFIG_DIR DIR_SEP);
         paths.emplace(UserPath::CacheDir, user_path + CACHE_DIR DIR_SEP);
 #else
-        if (Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) {
+        if (FileUtil::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) {
             user_path = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
             paths.emplace(UserPath::ConfigDir, user_path + CONFIG_DIR DIR_SEP);
             paths.emplace(UserPath::CacheDir, user_path + CACHE_DIR DIR_SEP);
@@ -702,7 +695,6 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
         paths.emplace(UserPath::NANDDir, user_path + NAND_DIR DIR_SEP);
         paths.emplace(UserPath::LoadDir, user_path + LOAD_DIR DIR_SEP);
         paths.emplace(UserPath::DumpDir, user_path + DUMP_DIR DIR_SEP);
-        paths.emplace(UserPath::ScreenshotsDir, user_path + SCREENSHOTS_DIR DIR_SEP);
         paths.emplace(UserPath::ShaderDir, user_path + SHADER_DIR DIR_SEP);
         paths.emplace(UserPath::SysDataDir, user_path + SYSDATA_DIR DIR_SEP);
         paths.emplace(UserPath::KeysDir, user_path + KEYS_DIR DIR_SEP);
@@ -711,7 +703,7 @@ const std::string& GetUserPath(UserPath path, const std::string& new_path) {
     }
 
     if (!new_path.empty()) {
-        if (!IsDirectory(new_path)) {
+        if (!FileUtil::IsDirectory(new_path)) {
             LOG_ERROR(Common_Filesystem, "Invalid path specified {}", new_path);
             return paths[path];
         } else {
@@ -909,10 +901,10 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
     return std::string(RemoveTrailingSlash(path));
 }
 
-IOFile::IOFile() = default;
+IOFile::IOFile() {}
 
 IOFile::IOFile(const std::string& filename, const char openmode[], int flags) {
-    void(Open(filename, openmode, flags));
+    Open(filename, openmode, flags);
 }
 
 IOFile::~IOFile() {
@@ -953,18 +945,17 @@ bool IOFile::Open(const std::string& filename, const char openmode[], int flags)
 }
 
 bool IOFile::Close() {
-    if (!IsOpen() || 0 != std::fclose(m_file)) {
+    if (!IsOpen() || 0 != std::fclose(m_file))
         return false;
-    }
 
     m_file = nullptr;
     return true;
 }
 
 u64 IOFile::GetSize() const {
-    if (IsOpen()) {
-        return FS::GetSize(m_file);
-    }
+    if (IsOpen())
+        return FileUtil::GetSize(m_file);
+
     return 0;
 }
 
@@ -973,9 +964,9 @@ bool IOFile::Seek(s64 off, int origin) const {
 }
 
 u64 IOFile::Tell() const {
-    if (IsOpen()) {
+    if (IsOpen())
         return ftello(m_file);
-    }
+
     return std::numeric_limits<u64>::max();
 }
 
@@ -1024,4 +1015,4 @@ bool IOFile::Resize(u64 size) {
         ;
 }
 
-} // namespace Common::FS
+} // namespace FileUtil

src/common/file_util.h

@@ -19,7 +19,7 @@
 #include "common/string_util.h"
 #endif
 
-namespace Common::FS {
+namespace FileUtil {
 
 // User paths for GetUserPath
 enum class UserPath {
@@ -32,7 +32,6 @@ enum class UserPath {
     SDMCDir,
     LoadDir,
     DumpDir,
-    ScreenshotsDir,
     ShaderDir,
     SysDataDir,
     UserDir,
@@ -48,19 +47,19 @@ struct FSTEntry {
 };
 
 // Returns true if file filename exists
-[[nodiscard]] bool Exists(const std::string& filename);
+bool Exists(const std::string& filename);
 
 // Returns true if filename is a directory
-[[nodiscard]] bool IsDirectory(const std::string& filename);
+bool IsDirectory(const std::string& filename);
 
 // Returns the size of filename (64bit)
-[[nodiscard]] u64 GetSize(const std::string& filename);
+u64 GetSize(const std::string& filename);
 
 // Overloaded GetSize, accepts file descriptor
-[[nodiscard]] u64 GetSize(int fd);
+u64 GetSize(const int fd);
 
 // Overloaded GetSize, accepts FILE*
-[[nodiscard]] u64 GetSize(FILE* f);
+u64 GetSize(FILE* f);
 
 // Returns true if successful, or path already exists.
 bool CreateDir(const std::string& filename);
@@ -120,7 +119,7 @@ u64 ScanDirectoryTree(const std::string& directory, FSTEntry& parent_entry,
 bool DeleteDirRecursively(const std::string& directory, unsigned int recursion = 256);
 
 // Returns the current directory
-[[nodiscard]] std::optional<std::string> GetCurrentDir();
+std::optional<std::string> GetCurrentDir();
 
 // Create directory and copy contents (does not overwrite existing files)
 void CopyDir(const std::string& source_path, const std::string& dest_path);
@@ -132,20 +131,20 @@ bool SetCurrentDir(const std::string& directory);
 // directory. To be used in "multi-user" mode (that is, installed).
 const std::string& GetUserPath(UserPath path, const std::string& new_path = "");
 
-[[nodiscard]] std::string GetHactoolConfigurationPath();
+std::string GetHactoolConfigurationPath();
 
-[[nodiscard]] std::string GetNANDRegistrationDir(bool system = false);
+std::string GetNANDRegistrationDir(bool system = false);
 
 // Returns the path to where the sys file are
-[[nodiscard]] std::string GetSysDirectory();
+std::string GetSysDirectory();
 
 #ifdef __APPLE__
-[[nodiscard]] std::string GetBundleDirectory();
+std::string GetBundleDirectory();
 #endif
 
 #ifdef _WIN32
-[[nodiscard]] const std::string& GetExeDirectory();
-[[nodiscard]] std::string AppDataRoamingDirectory();
+const std::string& GetExeDirectory();
+std::string AppDataRoamingDirectory();
 #endif
 
 std::size_t WriteStringToFile(bool text_file, const std::string& filename, std::string_view str);
@@ -164,55 +163,38 @@ void SplitFilename83(const std::string& filename, std::array<char, 9>& short_nam
 
 // Splits the path on '/' or '\' and put the components into a vector
 // i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" }
-[[nodiscard]] std::vector<std::string> SplitPathComponents(std::string_view filename);
+std::vector<std::string> SplitPathComponents(std::string_view filename);
 
 // Gets all of the text up to the last '/' or '\' in the path.
-[[nodiscard]] std::string_view GetParentPath(std::string_view path);
+std::string_view GetParentPath(std::string_view path);
 
 // Gets all of the text after the first '/' or '\' in the path.
-[[nodiscard]] std::string_view GetPathWithoutTop(std::string_view path);
+std::string_view GetPathWithoutTop(std::string_view path);
 
 // Gets the filename of the path
-[[nodiscard]] std::string_view GetFilename(std::string_view path);
+std::string_view GetFilename(std::string_view path);
 
 // Gets the extension of the filename
-[[nodiscard]] std::string_view GetExtensionFromFilename(std::string_view name);
+std::string_view GetExtensionFromFilename(std::string_view name);
 
 // Removes the final '/' or '\' if one exists
-[[nodiscard]] std::string_view RemoveTrailingSlash(std::string_view path);
+std::string_view RemoveTrailingSlash(std::string_view path);
 
 // Creates a new vector containing indices [first, last) from the original.
 template <typename T>
-[[nodiscard]] std::vector<T> SliceVector(const std::vector<T>& vector, std::size_t first,
-                                         std::size_t last) {
-    if (first >= last) {
+std::vector<T> SliceVector(const std::vector<T>& vector, std::size_t first, std::size_t last) {
+    if (first >= last)
         return {};
-    }
     last = std::min<std::size_t>(last, vector.size());
     return std::vector<T>(vector.begin() + first, vector.begin() + first + last);
 }
 
-enum class DirectorySeparator {
-    ForwardSlash,
-    BackwardSlash,
-    PlatformDefault,
-};
+enum class DirectorySeparator { ForwardSlash, BackwardSlash, PlatformDefault };
 
 // Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\'
 // depending if directory_separator is BackwardSlash or PlatformDefault and running on windows
-[[nodiscard]] std::string SanitizePath(
-    std::string_view path,
-    DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);
-
-// To deal with Windows being dumb at Unicode
-template <typename T>
-void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode) {
-#ifdef _MSC_VER
-    fstream.open(Common::UTF8ToUTF16W(filename), openmode);
-#else
-    fstream.open(filename, openmode);
-#endif
-}
+std::string SanitizePath(std::string_view path,
+                         DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);
 
 // simple wrapper for cstdlib file functions to
 // hopefully will make error checking easier
@@ -232,7 +214,7 @@ public:
 
     void Swap(IOFile& other) noexcept;
 
-    [[nodiscard]] bool Open(const std::string& filename, const char openmode[], int flags = 0);
+    bool Open(const std::string& filename, const char openmode[], int flags = 0);
     bool Close();
 
     template <typename T>
@@ -273,13 +255,13 @@ public:
         return WriteArray(str.data(), str.length());
     }
 
-    [[nodiscard]] bool IsOpen() const {
+    bool IsOpen() const {
         return nullptr != m_file;
     }
 
     bool Seek(s64 off, int origin) const;
-    [[nodiscard]] u64 Tell() const;
-    [[nodiscard]] u64 GetSize() const;
+    u64 Tell() const;
+    u64 GetSize() const;
     bool Resize(u64 size);
     bool Flush();
 
@@ -295,4 +277,14 @@ private:
     std::FILE* m_file = nullptr;
 };
 
-} // namespace Common::FS
+} // namespace FileUtil
+
+// To deal with Windows being dumb at unicode:
+template <typename T>
+void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode) {
+#ifdef _MSC_VER
+    fstream.open(Common::UTF8ToUTF16W(filename), openmode);
+#else
+    fstream.open(filename, openmode);
+#endif
+}

src/common/hash.h

@@ -5,11 +5,36 @@
 #pragma once
 
 #include <cstddef>
+#include <cstring>
 #include <utility>
 #include <boost/functional/hash.hpp>
+#include "common/cityhash.h"
+#include "common/common_types.h"
 
 namespace Common {
 
+/**
+ * Computes a 64-bit hash over the specified block of data
+ * @param data Block of data to compute hash over
+ * @param len Length of data (in bytes) to compute hash over
+ * @returns 64-bit hash value that was computed over the data block
+ */
+static inline u64 ComputeHash64(const void* data, std::size_t len) {
+    return CityHash64(static_cast<const char*>(data), len);
+}
+
+/**
+ * Computes a 64-bit hash of a struct. In addition to being trivially copyable, it is also critical
+ * that either the struct includes no padding, or that any padding is initialized to a known value
+ * by memsetting the struct to 0 before filling it in.
+ */
+template <typename T>
+static inline u64 ComputeStructHash64(const T& data) {
+    static_assert(std::is_trivially_copyable_v<T>,
+                  "Type passed to ComputeStructHash64 must be trivially copyable");
+    return ComputeHash64(&data, sizeof(data));
+}
+
 struct PairHash {
     template <class T1, class T2>
     std::size_t operator()(const std::pair<T1, T2>& pair) const noexcept {

src/common/hex_util.cpp

@@ -3,9 +3,21 @@
 // Refer to the license.txt file included.
 
 #include "common/hex_util.h"
+#include "common/logging/log.h"
 
 namespace Common {
 
+u8 ToHexNibble(char c1) {
+    if (c1 >= 65 && c1 <= 70)
+        return c1 - 55;
+    if (c1 >= 97 && c1 <= 102)
+        return c1 - 87;
+    if (c1 >= 48 && c1 <= 57)
+        return c1 - 48;
+    LOG_ERROR(Common, "Invalid hex digit: 0x{:02X}", c1);
+    return 0;
+}
+
 std::vector<u8> HexStringToVector(std::string_view str, bool little_endian) {
     std::vector<u8> out(str.size() / 2);
     if (little_endian) {
@@ -18,4 +30,26 @@ std::vector<u8> HexStringToVector(std::string_view str, bool little_endian) {
     return out;
 }
 
+std::array<u8, 16> operator""_array16(const char* str, std::size_t len) {
+    if (len != 32) {
+        LOG_ERROR(Common,
+                  "Attempting to parse string to array that is not of correct size (expected=32, "
+                  "actual={}).",
+                  len);
+        return {};
+    }
+    return HexStringToArray<16>(str);
+}
+
+std::array<u8, 32> operator""_array32(const char* str, std::size_t len) {
+    if (len != 64) {
+        LOG_ERROR(Common,
+                  "Attempting to parse string to array that is not of correct size (expected=64, "
+                  "actual={}).",
+                  len);
+        return {};
+    }
+    return HexStringToArray<32>(str);
+}
+
 } // namespace Common

src/common/hex_util.h

@@ -14,37 +14,25 @@
 
 namespace Common {
 
-[[nodiscard]] constexpr u8 ToHexNibble(char c) {
-    if (c >= 65 && c <= 70) {
-        return c - 55;
-    }
+u8 ToHexNibble(char c1);
 
-    if (c >= 97 && c <= 102) {
-        return c - 87;
-    }
-
-    return c - 48;
-}
-
-[[nodiscard]] std::vector<u8> HexStringToVector(std::string_view str, bool little_endian);
+std::vector<u8> HexStringToVector(std::string_view str, bool little_endian);
 
 template <std::size_t Size, bool le = false>
-[[nodiscard]] constexpr std::array<u8, Size> HexStringToArray(std::string_view str) {
+std::array<u8, Size> HexStringToArray(std::string_view str) {
     std::array<u8, Size> out{};
     if constexpr (le) {
-        for (std::size_t i = 2 * Size - 2; i <= 2 * Size; i -= 2) {
+        for (std::size_t i = 2 * Size - 2; i <= 2 * Size; i -= 2)
             out[i / 2] = (ToHexNibble(str[i]) << 4) | ToHexNibble(str[i + 1]);
-        }
     } else {
-        for (std::size_t i = 0; i < 2 * Size; i += 2) {
+        for (std::size_t i = 0; i < 2 * Size; i += 2)
             out[i / 2] = (ToHexNibble(str[i]) << 4) | ToHexNibble(str[i + 1]);
-        }
     }
     return out;
 }
 
 template <typename ContiguousContainer>
-[[nodiscard]] std::string HexToString(const ContiguousContainer& data, bool upper = true) {
+std::string HexToString(const ContiguousContainer& data, bool upper = true) {
     static_assert(std::is_same_v<typename ContiguousContainer::value_type, u8>,
                   "Underlying type within the contiguous container must be u8.");
 
@@ -60,12 +48,7 @@ template <typename ContiguousContainer>
     return out;
 }
 
-[[nodiscard]] constexpr std::array<u8, 16> AsArray(const char (&data)[17]) {
-    return HexStringToArray<16>(data);
-}
-
-[[nodiscard]] constexpr std::array<u8, 32> AsArray(const char (&data)[65]) {
-    return HexStringToArray<32>(data);
-}
+std::array<u8, 0x10> operator"" _array16(const char* str, std::size_t len);
+std::array<u8, 0x20> operator"" _array32(const char* str, std::size_t len);
 
 } // namespace Common

src/common/logging/backend.cpp

@@ -113,19 +113,19 @@ private:
     Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr,
                       const char* function, std::string message) const {
         using std::chrono::duration_cast;
-        using std::chrono::microseconds;
         using std::chrono::steady_clock;
 
-        return {
-            .timestamp = duration_cast<microseconds>(steady_clock::now() - time_origin),
-            .log_class = log_class,
-            .log_level = log_level,
-            .filename = filename,
-            .line_num = line_nr,
-            .function = function,
-            .message = std::move(message),
-            .final_entry = false,
-        };
+        Entry entry;
+        entry.timestamp =
+            duration_cast<std::chrono::microseconds>(steady_clock::now() - time_origin);
+        entry.log_class = log_class;
+        entry.log_level = log_level;
+        entry.filename = filename;
+        entry.line_num = line_nr;
+        entry.function = function;
+        entry.message = std::move(message);
+
+        return entry;
     }
 
     std::mutex writing_mutex;

src/common/logging/backend.h

@@ -21,13 +21,19 @@ class Filter;
  */
 struct Entry {
     std::chrono::microseconds timestamp;
-    Class log_class{};
-    Level log_level{};
-    const char* filename = nullptr;
-    unsigned int line_num = 0;
+    Class log_class;
+    Level log_level;
+    const char* filename;
+    unsigned int line_num;
     std::string function;
     std::string message;
     bool final_entry = false;
+
+    Entry() = default;
+    Entry(Entry&& o) = default;
+
+    Entry& operator=(Entry&& o) = default;
+    Entry& operator=(const Entry& o) = default;
 };
 
 /**
@@ -94,7 +100,7 @@ public:
     void Write(const Entry& entry) override;
 
 private:
-    Common::FS::IOFile file;
+    FileUtil::IOFile file;
     std::size_t bytes_written;
 };
 

src/common/lz4_compression.cpp

@@ -14,19 +14,19 @@ std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) {
     ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size");
 
     const auto source_size_int = static_cast<int>(source_size);
-    const auto max_compressed_size = static_cast<std::size_t>(LZ4_compressBound(source_size_int));
+    const int max_compressed_size = LZ4_compressBound(source_size_int);
     std::vector<u8> compressed(max_compressed_size);
 
-    const int compressed_size = LZ4_compress_default(
-        reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()),
-        source_size_int, static_cast<int>(max_compressed_size));
+    const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source),
+                                                     reinterpret_cast<char*>(compressed.data()),
+                                                     source_size_int, max_compressed_size);
 
     if (compressed_size <= 0) {
         // Compression failed
         return {};
     }
 
-    compressed.resize(static_cast<std::size_t>(compressed_size));
+    compressed.resize(compressed_size);
 
     return compressed;
 }
@@ -38,19 +38,19 @@ std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size,
     compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX);
 
     const auto source_size_int = static_cast<int>(source_size);
-    const auto max_compressed_size = static_cast<std::size_t>(LZ4_compressBound(source_size_int));
+    const int max_compressed_size = LZ4_compressBound(source_size_int);
     std::vector<u8> compressed(max_compressed_size);
 
     const int compressed_size = LZ4_compress_HC(
         reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()),
-        source_size_int, static_cast<int>(max_compressed_size), compression_level);
+        source_size_int, max_compressed_size, compression_level);
 
     if (compressed_size <= 0) {
         // Compression failed
         return {};
     }
 
-    compressed.resize(static_cast<std::size_t>(compressed_size));
+    compressed.resize(compressed_size);
 
     return compressed;
 }

src/common/lz4_compression.h

@@ -13,12 +13,12 @@ namespace Common::Compression {
 /**
  * Compresses a source memory region with LZ4 and returns the compressed data in a vector.
  *
- * @param source      The uncompressed source memory region.
- * @param source_size The size of the uncompressed source memory region.
+ * @param source the uncompressed source memory region.
+ * @param source_size the size in bytes of the uncompressed source memory region.
  *
  * @return the compressed data.
  */
-[[nodiscard]] std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size);
+std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size);
 
 /**
  * Utilizes the LZ4 subalgorithm LZ4HC with the specified compression level. Higher compression
@@ -26,24 +26,23 @@ namespace Common::Compression {
  * compression level has almost no impact on decompression speed. Data compressed with LZ4HC can
  * also be decompressed with the default LZ4 decompression.
  *
- * @param source            The uncompressed source memory region.
- * @param source_size       The size of the uncompressed source memory region.
- * @param compression_level The used compression level. Should be between 3 and 12.
+ * @param source the uncompressed source memory region.
+ * @param source_size the size in bytes of the uncompressed source memory region.
+ * @param compression_level the used compression level. Should be between 3 and 12.
  *
  * @return the compressed data.
  */
-[[nodiscard]] std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size,
-                                                s32 compression_level);
+std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size, s32 compression_level);
 
 /**
  * Utilizes the LZ4 subalgorithm LZ4HC with the highest possible compression level.
  *
- * @param source      The uncompressed source memory region.
- * @param source_size The size of the uncompressed source memory region
+ * @param source the uncompressed source memory region.
+ * @param source_size the size in bytes of the uncompressed source memory region.
  *
  * @return the compressed data.
  */
-[[nodiscard]] std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size);
+std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size);
 
 /**
  * Decompresses a source memory region with LZ4 and returns the uncompressed data in a vector.
@@ -53,7 +52,6 @@ namespace Common::Compression {
  *
  * @return the decompressed data.
  */
-[[nodiscard]] std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed,
-                                                std::size_t uncompressed_size);
+std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, std::size_t uncompressed_size);
 
 } // namespace Common::Compression

src/common/math_util.h

@@ -9,7 +9,7 @@
 
 namespace Common {
 
-constexpr float PI = 3.1415926535f;
+constexpr float PI = 3.14159265f;
 
 template <class T>
 struct Rectangle {
@@ -23,7 +23,7 @@ struct Rectangle {
     constexpr Rectangle(T left, T top, T right, T bottom)
         : left(left), top(top), right(right), bottom(bottom) {}
 
-    [[nodiscard]] T GetWidth() const {
+    T GetWidth() const {
         if constexpr (std::is_floating_point_v<T>) {
             return std::abs(right - left);
         } else {
@@ -31,7 +31,7 @@ struct Rectangle {
         }
     }
 
-    [[nodiscard]] T GetHeight() const {
+    T GetHeight() const {
         if constexpr (std::is_floating_point_v<T>) {
             return std::abs(bottom - top);
         } else {
@@ -39,21 +39,21 @@ struct Rectangle {
         }
     }
 
-    [[nodiscard]] Rectangle<T> TranslateX(const T x) const {
+    Rectangle<T> TranslateX(const T x) const {
         return Rectangle{left + x, top, right + x, bottom};
     }
 
-    [[nodiscard]] Rectangle<T> TranslateY(const T y) const {
+    Rectangle<T> TranslateY(const T y) const {
         return Rectangle{left, top + y, right, bottom + y};
     }
 
-    [[nodiscard]] Rectangle<T> Scale(const float s) const {
+    Rectangle<T> Scale(const float s) const {
         return Rectangle{left, top, static_cast<T>(left + GetWidth() * s),
                          static_cast<T>(top + GetHeight() * s)};
     }
 };
 
 template <typename T>
-Rectangle(T, T, T, T) -> Rectangle<T>;
+Rectangle(T, T, T, T)->Rectangle<T>;
 
 } // namespace Common

src/common/memory_detect.h

@@ -17,6 +17,6 @@ struct MemoryInfo {
  * Gets the memory info of the host system
  * @return Reference to a MemoryInfo struct with the physical and swap memory sizes in bytes
  */
-[[nodiscard]] const MemoryInfo& GetMemInfo();
+const MemoryInfo& GetMemInfo();
 
 } // namespace Common

src/common/multi_level_queue.h

@@ -223,15 +223,15 @@ public:
         ListShiftForward(levels[priority], n);
     }
 
-    [[nodiscard]] std::size_t depth() const {
+    std::size_t depth() const {
         return Depth;
     }
 
-    [[nodiscard]] std::size_t size(u32 priority) const {
+    std::size_t size(u32 priority) const {
         return levels[priority].size();
     }
 
-    [[nodiscard]] std::size_t size() const {
+    std::size_t size() const {
         u64 priorities = used_priorities;
         std::size_t size = 0;
         while (priorities != 0) {
@@ -242,64 +242,64 @@ public:
         return size;
     }
 
-    [[nodiscard]] bool empty() const {
+    bool empty() const {
         return used_priorities == 0;
     }
 
-    [[nodiscard]] bool empty(u32 priority) const {
+    bool empty(u32 priority) const {
         return (used_priorities & (1ULL << priority)) == 0;
     }
 
-    [[nodiscard]] u32 highest_priority_set(u32 max_priority = 0) const {
+    u32 highest_priority_set(u32 max_priority = 0) const {
         const u64 priorities =
             max_priority == 0 ? used_priorities : (used_priorities & ~((1ULL << max_priority) - 1));
         return priorities == 0 ? Depth : static_cast<u32>(CountTrailingZeroes64(priorities));
     }
 
-    [[nodiscard]] u32 lowest_priority_set(u32 min_priority = Depth - 1) const {
+    u32 lowest_priority_set(u32 min_priority = Depth - 1) const {
         const u64 priorities = min_priority >= Depth - 1
                                    ? used_priorities
                                    : (used_priorities & ((1ULL << (min_priority + 1)) - 1));
         return priorities == 0 ? Depth : 63 - CountLeadingZeroes64(priorities);
     }
 
-    [[nodiscard]] const_iterator cbegin(u32 max_prio = 0) const {
+    const_iterator cbegin(u32 max_prio = 0) const {
         const u32 priority = highest_priority_set(max_prio);
         return priority == Depth ? cend()
                                  : const_iterator{*this, levels[priority].cbegin(), priority};
     }
-    [[nodiscard]] const_iterator begin(u32 max_prio = 0) const {
+    const_iterator begin(u32 max_prio = 0) const {
         return cbegin(max_prio);
     }
-    [[nodiscard]] iterator begin(u32 max_prio = 0) {
+    iterator begin(u32 max_prio = 0) {
         const u32 priority = highest_priority_set(max_prio);
         return priority == Depth ? end() : iterator{*this, levels[priority].begin(), priority};
     }
 
-    [[nodiscard]] const_iterator cend(u32 min_prio = Depth - 1) const {
+    const_iterator cend(u32 min_prio = Depth - 1) const {
         return min_prio == Depth - 1 ? const_iterator{*this, Depth} : cbegin(min_prio + 1);
     }
-    [[nodiscard]] const_iterator end(u32 min_prio = Depth - 1) const {
+    const_iterator end(u32 min_prio = Depth - 1) const {
         return cend(min_prio);
     }
-    [[nodiscard]] iterator end(u32 min_prio = Depth - 1) {
+    iterator end(u32 min_prio = Depth - 1) {
         return min_prio == Depth - 1 ? iterator{*this, Depth} : begin(min_prio + 1);
     }
 
-    [[nodiscard]] T& front(u32 max_priority = 0) {
+    T& front(u32 max_priority = 0) {
         const u32 priority = highest_priority_set(max_priority);
         return levels[priority == Depth ? 0 : priority].front();
     }
-    [[nodiscard]] const T& front(u32 max_priority = 0) const {
+    const T& front(u32 max_priority = 0) const {
         const u32 priority = highest_priority_set(max_priority);
         return levels[priority == Depth ? 0 : priority].front();
     }
 
-    [[nodiscard]] T& back(u32 min_priority = Depth - 1) {
+    T back(u32 min_priority = Depth - 1) {
         const u32 priority = lowest_priority_set(min_priority); // intended
         return levels[priority == Depth ? 63 : priority].back();
     }
-    [[nodiscard]] const T& back(u32 min_priority = Depth - 1) const {
+    const T& back(u32 min_priority = Depth - 1) const {
         const u32 priority = lowest_priority_set(min_priority); // intended
         return levels[priority == Depth ? 63 : priority].back();
     }
@@ -329,8 +329,7 @@ private:
         in_list.splice(position, out_list, element);
     }
 
-    [[nodiscard]] static const_list_iterator ListIterateTo(const std::list<T>& list,
-                                                           const T& element) {
+    static const_list_iterator ListIterateTo(const std::list<T>& list, const T& element) {
         auto it = list.cbegin();
         while (it != list.cend() && *it != element) {
             ++it;

src/common/page_table.h

@@ -36,11 +36,11 @@ struct SpecialRegion {
 
     MemoryHookPointer handler;
 
-    [[nodiscard]] bool operator<(const SpecialRegion& other) const {
+    bool operator<(const SpecialRegion& other) const {
         return std::tie(type, handler) < std::tie(other.type, other.handler);
     }
 
-    [[nodiscard]] bool operator==(const SpecialRegion& other) const {
+    bool operator==(const SpecialRegion& other) const {
         return std::tie(type, handler) == std::tie(other.type, other.handler);
     }
 };

src/common/param_package.h

@@ -19,19 +19,19 @@ public:
     explicit ParamPackage(const std::string& serialized);
     ParamPackage(std::initializer_list<DataType::value_type> list);
     ParamPackage(const ParamPackage& other) = default;
-    ParamPackage(ParamPackage&& other) noexcept = default;
+    ParamPackage(ParamPackage&& other) = default;
 
     ParamPackage& operator=(const ParamPackage& other) = default;
     ParamPackage& operator=(ParamPackage&& other) = default;
 
-    [[nodiscard]] std::string Serialize() const;
-    [[nodiscard]] std::string Get(const std::string& key, const std::string& default_value) const;
-    [[nodiscard]] int Get(const std::string& key, int default_value) const;
-    [[nodiscard]] float Get(const std::string& key, float default_value) const;
+    std::string Serialize() const;
+    std::string Get(const std::string& key, const std::string& default_value) const;
+    int Get(const std::string& key, int default_value) const;
+    float Get(const std::string& key, float default_value) const;
     void Set(const std::string& key, std::string value);
     void Set(const std::string& key, int value);
     void Set(const std::string& key, float value);
-    [[nodiscard]] bool Has(const std::string& key) const;
+    bool Has(const std::string& key) const;
     void Erase(const std::string& key);
     void Clear();
 

src/common/quaternion.h

@@ -14,66 +14,35 @@ public:
     Vec3<T> xyz;
     T w{};
 
-    [[nodiscard]] Quaternion<decltype(-T{})> Inverse() const {
+    Quaternion<decltype(-T{})> Inverse() const {
         return {-xyz, w};
     }
 
-    [[nodiscard]] Quaternion<decltype(T{} + T{})> operator+(const Quaternion& other) const {
+    Quaternion<decltype(T{} + T{})> operator+(const Quaternion& other) const {
         return {xyz + other.xyz, w + other.w};
     }
 
-    [[nodiscard]] Quaternion<decltype(T{} - T{})> operator-(const Quaternion& other) const {
+    Quaternion<decltype(T{} - T{})> operator-(const Quaternion& other) const {
         return {xyz - other.xyz, w - other.w};
     }
 
-    [[nodiscard]] Quaternion<decltype(T{} * T{} - T{} * T{})> operator*(
-        const Quaternion& other) const {
+    Quaternion<decltype(T{} * T{} - T{} * T{})> operator*(const Quaternion& other) const {
         return {xyz * other.w + other.xyz * w + Cross(xyz, other.xyz),
                 w * other.w - Dot(xyz, other.xyz)};
     }
 
-    [[nodiscard]] Quaternion<T> Normalized() const {
+    Quaternion<T> Normalized() const {
         T length = std::sqrt(xyz.Length2() + w * w);
         return {xyz / length, w / length};
     }
-
-    [[nodiscard]] std::array<decltype(-T{}), 16> ToMatrix() const {
-        const T x2 = xyz[0] * xyz[0];
-        const T y2 = xyz[1] * xyz[1];
-        const T z2 = xyz[2] * xyz[2];
-
-        const T xy = xyz[0] * xyz[1];
-        const T wz = w * xyz[2];
-        const T xz = xyz[0] * xyz[2];
-        const T wy = w * xyz[1];
-        const T yz = xyz[1] * xyz[2];
-        const T wx = w * xyz[0];
-
-        return {1.0f - 2.0f * (y2 + z2),
-                2.0f * (xy + wz),
-                2.0f * (xz - wy),
-                0.0f,
-                2.0f * (xy - wz),
-                1.0f - 2.0f * (x2 + z2),
-                2.0f * (yz + wx),
-                0.0f,
-                2.0f * (xz + wy),
-                2.0f * (yz - wx),
-                1.0f - 2.0f * (x2 + y2),
-                0.0f,
-                0.0f,
-                0.0f,
-                0.0f,
-                1.0f};
-    }
 };
 
 template <typename T>
-[[nodiscard]] auto QuaternionRotate(const Quaternion<T>& q, const Vec3<T>& v) {
+auto QuaternionRotate(const Quaternion<T>& q, const Vec3<T>& v) {
     return v + 2 * Cross(q.xyz, Cross(q.xyz, v) + v * q.w);
 }
 
-[[nodiscard]] inline Quaternion<float> MakeQuaternion(const Vec3<float>& axis, float angle) {
+inline Quaternion<float> MakeQuaternion(const Vec3<float>& axis, float angle) {
     return {axis * std::sin(angle / 2), std::cos(angle / 2)};
 }
 

src/common/ring_buffer.h

@@ -91,12 +91,12 @@ public:
     }
 
     /// @returns Number of slots used
-    [[nodiscard]] std::size_t Size() const {
+    std::size_t Size() const {
         return m_write_index.load() - m_read_index.load();
     }
 
     /// @returns Maximum size of ring buffer
-    [[nodiscard]] constexpr std::size_t Capacity() const {
+    constexpr std::size_t Capacity() const {
         return capacity;
     }
 

src/common/spin_lock.h

@@ -17,7 +17,7 @@ class SpinLock {
 public:
     void lock();
     void unlock();
-    [[nodiscard]] bool try_lock();
+    bool try_lock();
 
 private:
     std::atomic_flag lck = ATOMIC_FLAG_INIT;

src/common/string_util.h

@@ -12,19 +12,19 @@
 namespace Common {
 
 /// Make a string lowercase
-[[nodiscard]] std::string ToLower(std::string str);
+std::string ToLower(std::string str);
 
 /// Make a string uppercase
-[[nodiscard]] std::string ToUpper(std::string str);
+std::string ToUpper(std::string str);
 
-[[nodiscard]] std::string StringFromBuffer(const std::vector<u8>& data);
+std::string StringFromBuffer(const std::vector<u8>& data);
 
-[[nodiscard]] std::string StripSpaces(const std::string& s);
-[[nodiscard]] std::string StripQuotes(const std::string& s);
+std::string StripSpaces(const std::string& s);
+std::string StripQuotes(const std::string& s);
 
-[[nodiscard]] std::string StringFromBool(bool value);
+std::string StringFromBool(bool value);
 
-[[nodiscard]] std::string TabsToSpaces(int tab_size, std::string in);
+std::string TabsToSpaces(int tab_size, std::string in);
 
 void SplitString(const std::string& str, char delim, std::vector<std::string>& output);
 
@@ -34,15 +34,14 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
 
 void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path,
                            const std::string& _Filename);
-[[nodiscard]] std::string ReplaceAll(std::string result, const std::string& src,
-                                     const std::string& dest);
+std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest);
 
-[[nodiscard]] std::string UTF16ToUTF8(const std::u16string& input);
-[[nodiscard]] std::u16string UTF8ToUTF16(const std::string& input);
+std::string UTF16ToUTF8(const std::u16string& input);
+std::u16string UTF8ToUTF16(const std::string& input);
 
 #ifdef _WIN32
-[[nodiscard]] std::string UTF16ToUTF8(const std::wstring& input);
-[[nodiscard]] std::wstring UTF8ToUTF16W(const std::string& str);
+std::string UTF16ToUTF8(const std::wstring& input);
+std::wstring UTF8ToUTF16W(const std::string& str);
 
 #endif
 
@@ -51,7 +50,7 @@ void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _P
  * `other` for equality.
  */
 template <typename InIt>
-[[nodiscard]] bool ComparePartialString(InIt begin, InIt end, const char* other) {
+bool ComparePartialString(InIt begin, InIt end, const char* other) {
     for (; begin != end && *other != '\0'; ++begin, ++other) {
         if (*begin != *other) {
             return false;
@@ -65,15 +64,14 @@ template <typename InIt>
  * Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't
  * NUL-terminated then the string ends at max_len characters.
  */
-[[nodiscard]] std::string StringFromFixedZeroTerminatedBuffer(const char* buffer,
-                                                              std::size_t max_len);
+std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len);
 
 /**
  * Creates a UTF-16 std::u16string from a fixed-size NUL-terminated char buffer. If the buffer isn't
  * null-terminated, then the string ends at the greatest multiple of two less then or equal to
  * max_len_bytes.
  */
-[[nodiscard]] std::u16string UTF16StringFromFixedZeroTerminatedBuffer(std::u16string_view buffer,
-                                                                      std::size_t max_len);
+std::u16string UTF16StringFromFixedZeroTerminatedBuffer(std::u16string_view buffer,
+                                                        std::size_t max_len);
 
 } // namespace Common

src/common/telemetry.cpp

@@ -12,7 +12,7 @@
 #include "common/x64/cpu_detect.h"
 #endif
 
-namespace Common::Telemetry {
+namespace Telemetry {
 
 void FieldCollection::Accept(VisitorInterface& visitor) const {
     for (const auto& field : fields) {
@@ -88,4 +88,4 @@ void AppendOSInfo(FieldCollection& fc) {
 #endif
 }
 
-} // namespace Common::Telemetry
+} // namespace Telemetry

src/common/telemetry.h

@@ -10,7 +10,7 @@
 #include <string>
 #include "common/common_types.h"
 
-namespace Common::Telemetry {
+namespace Telemetry {
 
 /// Field type, used for grouping fields together in the final submitted telemetry log
 enum class FieldType : u8 {
@@ -63,30 +63,30 @@ public:
 
     void Accept(VisitorInterface& visitor) const override;
 
-    [[nodiscard]] const std::string& GetName() const override {
+    const std::string& GetName() const override {
         return name;
     }
 
     /**
      * Returns the type of the field.
      */
-    [[nodiscard]] FieldType GetType() const {
+    FieldType GetType() const {
         return type;
     }
 
     /**
      * Returns the value of the field.
      */
-    [[nodiscard]] const T& GetValue() const {
+    const T& GetValue() const {
         return value;
     }
 
-    [[nodiscard]] bool operator==(const Field& other) const {
+    bool operator==(const Field& other) const {
         return (type == other.type) && (name == other.name) && (value == other.value);
     }
 
-    [[nodiscard]] bool operator!=(const Field& other) const {
-        return !operator==(other);
+    bool operator!=(const Field& other) const {
+        return !(*this == other);
     }
 
 private:
@@ -196,4 +196,4 @@ void AppendCPUInfo(FieldCollection& fc);
 /// such as platform name, etc.
 void AppendOSInfo(FieldCollection& fc);
 
-} // namespace Common::Telemetry
+} // namespace Telemetry

src/common/thread.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/common_funcs.h"
-#include "common/logging/log.h"
 #include "common/thread.h"
 #ifdef __APPLE__
 #include <mach/mach.h>
@@ -21,8 +19,6 @@
 #include <unistd.h>
 #endif
 
-#include <string>
-
 #ifdef __FreeBSD__
 #define cpu_set_t cpuset_t
 #endif
@@ -114,14 +110,6 @@ void SetCurrentThreadName(const char* name) {
     pthread_set_name_np(pthread_self(), name);
 #elif defined(__NetBSD__)
     pthread_setname_np(pthread_self(), "%s", (void*)name);
-#elif defined(__linux__)
-    // Linux limits thread names to 15 characters and will outright reject any
-    // attempt to set a longer name with ERANGE.
-    std::string truncated(name, std::min(strlen(name), static_cast<size_t>(15)));
-    if (int e = pthread_setname_np(pthread_self(), truncated.c_str())) {
-        errno = e;
-        LOG_ERROR(Common, "Failed to set thread name to '{}': {}", truncated, GetLastErrorMsg());
-    }
 #else
     pthread_setname_np(pthread_self(), name);
 #endif

src/common/thread.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
@@ -26,13 +25,13 @@ public:
 
     void Wait() {
         std::unique_lock lk{mutex};
-        condvar.wait(lk, [&] { return is_set.load(); });
+        condvar.wait(lk, [&] { return is_set; });
         is_set = false;
     }
 
     bool WaitFor(const std::chrono::nanoseconds& time) {
         std::unique_lock lk{mutex};
-        if (!condvar.wait_for(lk, time, [this] { return is_set.load(); }))
+        if (!condvar.wait_for(lk, time, [this] { return is_set; }))
             return false;
         is_set = false;
         return true;
@@ -41,7 +40,7 @@ public:
     template <class Clock, class Duration>
     bool WaitUntil(const std::chrono::time_point<Clock, Duration>& time) {
         std::unique_lock lk{mutex};
-        if (!condvar.wait_until(lk, time, [this] { return is_set.load(); }))
+        if (!condvar.wait_until(lk, time, [this] { return is_set; }))
             return false;
         is_set = false;
         return true;
@@ -55,9 +54,9 @@ public:
     }
 
 private:
+    bool is_set = false;
     std::condition_variable condvar;
     std::mutex mutex;
-    std::atomic_bool is_set{false};
 };
 
 class Barrier {

src/common/thread_queue_list.h

@@ -18,14 +18,14 @@ struct ThreadQueueList {
     using Priority = unsigned int;
 
     // Number of priority levels. (Valid levels are [0..NUM_QUEUES).)
-    static constexpr Priority NUM_QUEUES = N;
+    static const Priority NUM_QUEUES = N;
 
     ThreadQueueList() {
         first = nullptr;
     }
 
     // Only for debugging, returns priority level.
-    [[nodiscard]] Priority contains(const T& uid) const {
+    Priority contains(const T& uid) const {
         for (Priority i = 0; i < NUM_QUEUES; ++i) {
             const Queue& cur = queues[i];
             if (std::find(cur.data.cbegin(), cur.data.cend(), uid) != cur.data.cend()) {
@@ -36,7 +36,7 @@ struct ThreadQueueList {
         return -1;
     }
 
-    [[nodiscard]] T get_first() const {
+    T get_first() const {
         const Queue* cur = first;
         while (cur != nullptr) {
             if (!cur->data.empty()) {
@@ -49,7 +49,7 @@ struct ThreadQueueList {
     }
 
     template <typename UnaryPredicate>
-    [[nodiscard]] T get_first_filter(UnaryPredicate filter) const {
+    T get_first_filter(UnaryPredicate filter) const {
         const Queue* cur = first;
         while (cur != nullptr) {
             if (!cur->data.empty()) {
@@ -129,7 +129,7 @@ struct ThreadQueueList {
         first = nullptr;
     }
 
-    [[nodiscard]] bool empty(Priority priority) const {
+    bool empty(Priority priority) const {
         const Queue* cur = &queues[priority];
         return cur->data.empty();
     }

src/common/threadsafe_queue.h

@@ -25,15 +25,15 @@ public:
         delete read_ptr;
     }
 
-    [[nodiscard]] std::size_t Size() const {
+    std::size_t Size() const {
         return size.load();
     }
 
-    [[nodiscard]] bool Empty() const {
+    bool Empty() const {
         return Size() == 0;
     }
 
-    [[nodiscard]] T& Front() const {
+    T& Front() const {
         return read_ptr->current;
     }
 
@@ -130,15 +130,15 @@ private:
 template <typename T>
 class MPSCQueue {
 public:
-    [[nodiscard]] std::size_t Size() const {
+    std::size_t Size() const {
         return spsc_queue.Size();
     }
 
-    [[nodiscard]] bool Empty() const {
+    bool Empty() const {
         return spsc_queue.Empty();
     }
 
-    [[nodiscard]] T& Front() const {
+    T& Front() const {
         return spsc_queue.Front();
     }
 

src/common/time_zone.h

@@ -10,9 +10,9 @@
 namespace Common::TimeZone {
 
 /// Gets the default timezone, i.e. "GMT"
-[[nodiscard]] std::string GetDefaultTimeZone();
+std::string GetDefaultTimeZone();
 
 /// Gets the offset of the current timezone (from the default), in seconds
-[[nodiscard]] std::chrono::seconds GetCurrentOffsetSeconds();
+std::chrono::seconds GetCurrentOffsetSeconds();
 
 } // namespace Common::TimeZone

src/common/timer.h

@@ -19,18 +19,18 @@ public:
 
     // The time difference is always returned in milliseconds, regardless of alternative internal
     // representation
-    [[nodiscard]] std::chrono::milliseconds GetTimeDifference();
+    std::chrono::milliseconds GetTimeDifference();
     void AddTimeDifference();
 
-    [[nodiscard]] static std::chrono::seconds GetTimeSinceJan1970();
-    [[nodiscard]] static std::chrono::seconds GetLocalTimeSinceJan1970();
-    [[nodiscard]] static double GetDoubleTime();
+    static std::chrono::seconds GetTimeSinceJan1970();
+    static std::chrono::seconds GetLocalTimeSinceJan1970();
+    static double GetDoubleTime();
 
-    [[nodiscard]] static std::string GetTimeFormatted();
-    [[nodiscard]] std::string GetTimeElapsedFormatted() const;
-    [[nodiscard]] std::chrono::milliseconds GetTimeElapsed();
+    static std::string GetTimeFormatted();
+    std::string GetTimeElapsedFormatted() const;
+    std::chrono::milliseconds GetTimeElapsed();
 
-    [[nodiscard]] static std::chrono::milliseconds GetTimeMs();
+    static std::chrono::milliseconds GetTimeMs();
 
 private:
     std::chrono::milliseconds m_LastTime;