GS/DX: Specify shader model directly instead of via feature level

[ci skip] PAD: Update to latest controller database.
GameDB: Enable Instant DMA Hack for SLPM-74405 to fix hang
2026-07-11 17:54:20 +02:00 · 2026-05-11 22:29:45 +02:00 · 2026-05-11 13:30:19 -04:00 · 2026-05-10 19:07:21 +02:00 · 2026-05-09 13:48:42 +02:00 · 2026-05-09 13:47:58 +02:00
1351 changed files with 52260 additions and 65927 deletions
@@ -0,0 +1,23 @@
+name: 'Commit Message Check'
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+
+jobs:
+  check-commit-message:
+    name: Check Commit Message
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for a commit prefix 
+        uses: gsactions/commit-message-checker@16fa2d5de096ae0d35626443bcd24f1e756cafee
+        with:
+          accessToken: ${{ secrets.GITHUB_TOKEN }}
+          pattern: '^[A-Z0-9][A-Za-z0-9 \["\/\\]+:.+'
+          excludeTitle: true
+          excludeDescription: true
+          checkAllCommitMessages: true
+          error: 'Commit messages should be capitalized, start with a prefix, delimited by a colon. Example: "Debugger: Add a paste bytes option to the memory view"'
@@ -0,0 +1,21 @@
+name: 🧹 Clean Up Old Caches
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # Every day at 12am UTC.
+  workflow_dispatch: # As well as manually.
+
+jobs:
+  clean:
+    name: "Clean Up Caches"
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Clean Caches
+        uses: PCSX2/cache-clean-action@v1.1.0
+        with:
+          items: '[{"key": " deps", "count": 4}, {"key": " ccache", "count": 1}, {"key": " flatpak", "count": 1}]'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: all
+          on_failure: error
@@ -17,7 +17,7 @@ jobs:
        run: ./.github/workflows/scripts/common/update_base_translation.sh
      
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
        with:
          title: "Qt: Update Base Translation"
          commit-message: "[ci skip] Qt: Update Base Translation."
@@ -19,7 +19,7 @@ jobs:
          mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
        with:
          title: "PAD: Update to latest controller database"
          commit-message: "[ci skip] PAD: Update to latest controller database."
@@ -93,7 +93,7 @@ jobs:

      - name: Build Flatpak (beta)
        if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
-        uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flatpak-builder@401fe28a8384095fc1531b9d320b292f0ee45adb
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -109,7 +109,7 @@ jobs:

      - name: Build Flatpak (stable)
        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
-        uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flatpak-builder@401fe28a8384095fc1531b9d320b292f0ee45adb
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -129,7 +129,7 @@ jobs:

      - name: Push to Flathub (beta)
        if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flat-manager@401fe28a8384095fc1531b9d320b292f0ee45adb
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: beta
@@ -138,7 +138,7 @@ jobs:

      - name: Push to Flathub (stable)
        if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flat-manager@401fe28a8384095fc1531b9d320b292f0ee45adb
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: stable
@@ -153,7 +153,7 @@ jobs:
          mv "./${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak" "$GITHUB_WORKSPACE"/ci-artifacts/

      - name: Upload artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
@@ -27,10 +27,6 @@ on:
        required: false
        type: boolean
        default: false
-      detail:
-        required: false
-        type: string
-        default: ""
      patchesUrl:
        required: false
        type: string
@@ -95,8 +91,8 @@ jobs:
        uses: actions/cache@v5
        with:
          path: .ccache
-          key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache
+          key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
+          restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ccache

      - name: Install Packages
        run: |
@@ -174,7 +170,7 @@ jobs:

      - name: Upload artifact
        if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
@@ -13,6 +13,10 @@ on:
        required: false
        type: string
        default: macos-26
+      arch:
+        required: false
+        type: string
+        default: x86-64
      patchesUrl:
        required: false
        type: string
@@ -62,11 +66,15 @@ jobs:
          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
          cat ./pcsx2-qt/DefaultUpdaterChannel.h

-      - name: Use Xcode 26.0.1
-        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
+      - name: Use Xcode 26.2
+        run: sudo xcode-select -s /Applications/Xcode_26.2.app

      - name: Install Metal Toolchain
-        run: xcodebuild -downloadComponent MetalToolchain
+        run: |
+          for i in {1..5}; do
+            if xcrun metal -v; then break; fi
+            xcodebuild -downloadComponent MetalToolchain
+          done

      - name: Prepare Artifact Metadata
        id: artifact-metadata
@@ -94,12 +102,12 @@ jobs:
        uses: actions/cache@v5
        with:
          path: ~/deps
-          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/*', '.github/workflows/scripts/common/*.patch') }}
+          key: ${{ inputs.os }} ${{ inputs.arch }} deps ${{ hashFiles('.github/workflows/scripts/macos/*', '.github/workflows/scripts/common/*.patch') }}

      - name: Build Dependencies
        if: steps.cache-deps.outputs.cache-hit != 'true'
        run: |
-          .github/workflows/scripts/macos/build-dependencies.sh "$HOME/deps"
+          .github/workflows/scripts/macos/build-dependencies${{ case(inputs.arch == 'x86-64', '', '-universal') }}.sh "$HOME/deps"

      - name: Download patches
        run: |
@@ -115,16 +123,16 @@ jobs:
        uses: actions/cache@v5
        with:
          path: .ccache
-          key: ${{ inputs.os }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: ${{ inputs.os }} ccache
+          key: ${{ inputs.os }} ${{ inputs.arch }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
+          restore-keys: ${{ inputs.os }} ${{ inputs.arch }} ccache

      - name: Generate CMake Files
        run: |
          cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+                -DCMAKE_OSX_ARCHITECTURES="${{ case(inputs.arch == 'x86-64', 'x86_64', inputs.arch) }}" \
                -DDISABLE_ADVANCE_SIMD=ON \
-                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${{ case(inputs.arch == 'x86-64', 'ON', 'OFF') }} \
                -DUSE_LINKED_FFMPEG=ON \
                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -147,6 +155,11 @@ jobs:
            fi
          done

+      - name: Build GSRunner
+        if: inputs.arch != 'x86-64'
+        working-directory: build
+        run: make -j$(getconf _NPROCESSORS_ONLN) pcsx2-gsrunner
+
      - name: Run Tests
        working-directory: build
        run: make -j$(getconf _NPROCESSORS_ONLN) unittests
@@ -184,6 +197,7 @@ jobs:
          app_store_connect_api_key_json_file: 'key.json'

      - name: Zip Build Artifacts
+        if: inputs.arch == 'x86-64'
        run: |
          TAG="$(git tag --points-at HEAD)"
          if [ -z "$TAG" ]; then
@@ -197,7 +211,8 @@ jobs:
          cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz

      - name: Upload Artifact
-        uses: actions/upload-artifact@v6
+        if: inputs.arch == 'x86-64'
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: "*.tar.xz"
@@ -18,3 +18,12 @@ jobs:
      artifactPrefixName: "PCSX2-macos-Qt"
      sign_and_notarize: true # If we find that notarization takes a long time we should disable that on PR builds
    secrets: inherit
+  build_macos_qt_arm:
+    name: "arm64"
+    if: github.repository != 'PCSX2/pcsx2' || github.event_name == 'pull_request'
+    uses: ./.github/workflows/macos_build.yml
+    with:
+      jobName: "MacOS arm64 Build"
+      artifactPrefixName: "PCSX2-macos-Qt-arm64"
+      arch: arm64
+    secrets: inherit
@@ -68,7 +68,7 @@ jobs:
          mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md

      - name: Create a GitHub Release (Manual)
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
        if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
        with:
          body_path: ./release-notes.md
@@ -77,7 +77,7 @@ jobs:
          tag_name: ${{ steps.tag_version.outputs.new_tag }}

      - name: Create a GitHub Release (Push)
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
        if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
        with:
          body_path: ./release-notes.md
@@ -151,6 +151,19 @@ jobs:
      sign_and_notarize: true
    secrets: inherit

+  # We don't use the artifacts, but we need this for the cache it generates
+  build_macos_qt_arm:
+    if: github.repository == 'PCSX2/pcsx2'
+    needs:
+      - cut-release
+    name: "MacOS"
+    uses: ./.github/workflows/macos_build.yml
+    with:
+      jobName: "Generate arm64 Caches"
+      artifactPrefixName: "PCSX2-macos-Qt-arm64"
+      arch: arm64
+    secrets: inherit
+
  # Upload the Artifacts
  upload_artifacts:
    if: github.repository == 'PCSX2/pcsx2'
@@ -168,7 +181,7 @@ jobs:
      - name: Prepare Artifact Folder
        run: mkdir ./ci-artifacts/

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
        name: Download all Artifacts
        with:
          path: ./ci-artifacts/
@@ -1,16 +1,3 @@
-diff --git a/CHANGES b/CHANGES
-index 5d3dd16..587b612 100644
--- a/CHANGES
-+++ b/CHANGES
-@@ -4,7 +4,7 @@ v2024.1
-  - Update dependencies
-  - Propagate test/install options to Glslang
- 
-v2024.0
-+v2024.0 2024-03-09
-  - Update dependencies
-  - Utilities:
-     - Use Python3 explicitly in utility scripts
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ffcb54b..7c1a6d8 100644
 --- a/CMakeLists.txt
@@ -43,8 +43,6 @@ STRIP=strip

 declare -a MANUAL_LIBS=(
 	"libshaderc_shared.so.1"
-	"libharfbuzz.so.0"
-	"libfreetype.so.6"
 )

 set -e
@@ -18,94 +18,96 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FFMPEG=8.0
-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBJPEGTURBO=3.1.2
-LIBPNG=1.6.53
-LIBWEBP=1.6.0
-NVENC=11.1.5.3
-SDL=SDL3-3.4.0
-QT=6.10.1
+QT=6.11.0
 QTAPNG=1.3.0
+
+FFMPEG=8.1
+LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
+LIBJPEGTURBO=3.1.4.1
+LIBPNG=1.6.56
+LIBWEBP=1.6.0
+NVENC=13.0.19.0
+SDL=SDL3-3.4.8
 LZ4=1.10.0
 VULKAN=1.4.328.1
 ZSTD=1.5.7
 KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
+RAPIDYAML=0.11.1

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2026.1
+SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
+SHADERC_SPIRVHEADERS=04f10f650d514df88b76d25e83db360142c7b174
+SHADERC_SPIRVTOOLS=fbe4f3ad913c44fe8700545f8ffe35d1382b7093

 mkdir -p deps-build
 cd deps-build

 export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"

-cat > SHASUMS <<EOF
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
+grep . > SHASUMS <<EOF
+231ad85979864d914dc9568a1b71c91d6cf20d7b2021d059103bf0eb51cb755e  qtbase-everywhere-src-$QT.tar.xz
+d3adb02ac5e2fe24068dbdaee0d7cc68cc3fa8553291c1bfce77c9fe8e940cc8  qtimageformats-everywhere-src-$QT.tar.xz
+dfa8d653be07087d9407ed4a4ebae847f8953e0b7abd829f089803ab652a30e6  qtsvg-everywhere-src-$QT.tar.xz
+cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76  qttools-everywhere-src-$QT.tar.xz
+54f48b2fe4316892ff930195f170a5385644acc7393505f3155c066b8e1ffe56  qttranslations-everywhere-src-$QT.tar.xz
+e710e6e760f92922b86e4dd68f6bbe94ef6510919519d1b0068e874b5ad84d37  qtwayland-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+
+b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
+96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d  libbacktrace-$LIBBACKTRACE.tar.gz
+ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
+e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
+9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8  libpng-$LIBPNG-apng.patch.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-2974b91062197e0527dffa3aadd8fe3bfa6681ae45f5ff9181bc0ca6479abd59  nv-codec-headers-$NVENC.tar.gz
+13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee  nv-codec-headers-$NVENC.tar.gz
 c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c  vulkan-sdk-$VULKAN.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-49bf6db800227a6b2c971f4c5d03dd1e81297e7ffb296ce4a96437304f27cb13  qtwayland-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1  rapidyaml-$RAPIDYAML-src.tgz
+
+245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66  shaderc-$SHADERC.tar.gz
+bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+1b220e3eec1714f0451b0e3652979bd280edf10893f617837b88e6359a804ded  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+cabb35f4eef0da3ef72ad9edd596af4191d7507a8f35c05df526d2d5ff889f59  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-curl -L \
-	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
-	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
-	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
-	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
-	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
-	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
-	-O "https://libsdl.org/release/$SDL.tar.gz" \
-	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-	-O "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-$VULKAN.tar.gz" \
-	-O "https://github.com/FFmpeg/nv-codec-headers/releases/download/n$NVENC/nv-codec-headers-$NVENC.tar.gz" \
-	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
-	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
-	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
-	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
-	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
-	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.tar.gz" \
-	-o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
-	-o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
+if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
+	curl -L \
+		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.tar.gz" \
+		-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
+		-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+		-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
+		-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+		-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
+		-O "https://libsdl.org/release/$SDL.tar.gz" \
+		-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+		-O "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-$VULKAN.tar.gz" \
+		-O "https://github.com/FFmpeg/nv-codec-headers/releases/download/n$NVENC/nv-codec-headers-$NVENC.tar.gz" \
+		-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \
+		-O "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
+		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
+		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
+		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
+		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
+		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
+		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
+fi

-shasum -a 256 --check SHASUMS
+shasum -a 256 --check --strict SHASUMS

 if [ "$BUILD_FFMPEG" -ne 0 ]; then
 	echo "Installing vulkan headers..."
@@ -140,9 +142,9 @@ fi

 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
-unzip "$LIBBACKTRACE.zip"
+tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
 cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$INSTALLDIR"
+./configure --prefix="$INSTALLDIR" --with-pic
 make
 make install
 cd ..
@@ -150,7 +152,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
+gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
 patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
@@ -198,40 +200,11 @@ cmake --build build --parallel
 ninja -C build install
 cd ..

-echo "Building FreeType without HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building HarfBuzz..."
-rm -fr "harfbuzz-$HARFBUZZ"
-tar xf "harfbuzz-$HARFBUZZ.tar.gz"
-cd "harfbuzz-$HARFBUZZ"
-# Add an SOVERSION to match system harfbuzz
-sed -i 's/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE SOVERSION 0)/g' CMakeLists.txt
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -DHB_HAVE_GOBJECT=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType with HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
 echo "Building SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_X11_XSCRNSAVER=OFF -DSDL_TESTS=OFF -G Ninja
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -247,7 +220,7 @@ tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 mkdir build
 cd build
-../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- --log-level=STATUS -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -- --log-level=STATUS -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON -DFEATURE_gtk3=OFF
 cmake --build . --parallel
 ninja install
 cd ../../
@@ -339,7 +312,16 @@ echo "Building PlutoSVG..."
 rm -fr "plutosvg-$PLUTOSVG"
 tar xf "plutosvg-$PLUTOSVG.tar.gz"
 cd "plutosvg-$PLUTOSVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=OFF -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building RapidYAML..."
+rm -fr "rapidyaml-$RAPIDYAML-src"
+tar xf "rapidyaml-$RAPIDYAML-src.tgz"
+cd "rapidyaml-$RAPIDYAML-src"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -24,6 +24,7 @@ LZ4=1.10.0
 ZSTD=1.5.7
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
+RAPIDYAML=0.11.1

 SHADERC=2025.4
 SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
@@ -33,10 +34,10 @@ SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
 mkdir -p deps-build
 cd deps-build

-cat > SHASUMS <<EOF
+grep . > SHASUMS <<EOF
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
+96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d  libbacktrace-$LIBBACKTRACE.tar.gz
 a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
 dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
@@ -49,30 +50,34 @@ c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-
 06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1  rapidyaml-$RAPIDYAML-src.tgz
 EOF

-curl -L \
-        -o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-        -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
-        -O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
-        -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-        -O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
-        -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
-        -O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
-        -O "https://libsdl.org/release/$SDL.tar.gz" \
-        -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-        -o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
-        -o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
-        -o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
-        -o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
-        -o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
-        -o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
+if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
+	curl -L \
+		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
+		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
+		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.tar.gz" \
+		-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+		-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
+		-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+		-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
+		-O "https://libsdl.org/release/$SDL.tar.gz" \
+		-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
+		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
+		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
+		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
+		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
+fi

-shasum -a 256 --check SHASUMS
+shasum -a 256 --check --strict SHASUMS

 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
-unzip "$LIBBACKTRACE.zip"
+tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
 cd "libbacktrace-$LIBBACKTRACE"
 ./configure --prefix="$INSTALLDIR"
 make
@@ -82,7 +87,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
+gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
 patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
@@ -150,7 +155,7 @@ echo "Building SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -173,6 +178,15 @@ cmake --build build --parallel
 ninja -C build install
 cd ..

+echo "Building RapidYAML..."
+rm -fr "rapidyaml-$RAPIDYAML-src"
+tar xf "rapidyaml-$RAPIDYAML-src.tgz"
+cd "rapidyaml-$RAPIDYAML-src"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
 echo "Building shaderc..."
 rm -fr "shaderc-$SHADERC"
 tar xf "shaderc-$SHADERC.tar.gz"
@@ -14,8 +14,8 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.4.0.tar.gz",
-      "sha256": "082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8"
+      "url": "https://libsdl.org/release/SDL3-3.4.8.tar.gz",
+      "sha256": "e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba"
    }
  ],
  "cleanup": [
@@ -15,24 +15,24 @@
    {
      "type": "git",
      "url": "https://github.com/google/shaderc.git",
-      "commit": "73743588fe9c39f2f1c780a087d94afac691a189"
+      "commit": "301b4ede53d59b68bf55f95bb26412d9233c8187"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/glslang/archive/7a47e2531cb334982b2a2dd8513dca0a3de4373d.tar.gz",
-      "sha256": "272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931",
+      "url": "https://github.com/KhronosGroup/glslang/archive/f0bd0257c308b9a26562c1a30c4748a0219cc951.tar.gz",
+      "sha256": "bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647",
      "dest": "third_party/glslang"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/b824a462d4256d720bebb40e78b9eb8f78bbb305.tar.gz",
-      "sha256": "c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c",
+      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/04f10f650d514df88b76d25e83db360142c7b174.tar.gz",
+      "sha256": "1b220e3eec1714f0451b0e3652979bd280edf10893f617837b88e6359a804ded",
      "dest": "third_party/spirv-headers"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/971a7b6e8d7740035bbff089bbbf9f42951ecfd5.tar.gz",
-      "sha256": "06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f",
+      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/fbe4f3ad913c44fe8700545f8ffe35d1382b7093.tar.gz",
+      "sha256": "cabb35f4eef0da3ef72ad9edd596af4191d7507a8f35c05df526d2d5ff889f59",
      "dest": "third_party/spirv-tools"
    },
    {
@@ -14,21 +14,21 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.53/libpng-1.6.53.tar.xz",
-      "sha256": "1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4"
+      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.56/libpng-1.6.56.tar.xz",
+      "sha256": "f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18"
    },
    {
      "type": "file",
-      "url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.53-apng.patch.gz",
-      "dest-filename": "libpng-1.6.53-apng.patch.gz",
-      "sha256": "452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c"
+      "url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.56-apng.patch.gz",
+      "dest-filename": "libpng-1.6.56-apng.patch.gz",
+      "sha256": "9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8"
    },
    {
      "type": "shell",
      "commands":
      [
-          "gunzip -f libpng-1.6.53-apng.patch.gz",
-          "patch -p1  < \"libpng-1.6.53-apng.patch\""
+          "gunzip -f libpng-1.6.56-apng.patch.gz",
+          "patch -p1  < \"libpng-1.6.56-apng.patch\""
      ]
    }
  ],
@@ -0,0 +1,23 @@
+{
+  "name": "rapidyaml",
+  "buildsystem": "cmake-ninja",
+  "builddir": true,
+  "config-opts": [
+  	"-DBUILD_SHARED_LIBS=ON"
+  ],
+  "build-options": {
+    "strip": true
+  },
+  "sources": [
+    {
+      "type": "git",
+      "url": "https://github.com/biojppm/rapidyaml.git",
+      "tag": "v0.11.1",
+      "commit": "119b6042064d3828819e428e32e5a0f3035d5643"
+    }
+  ],
+  "cleanup": [
+    "/include",
+    "/lib/cmake"
+  ]
+}
@@ -35,6 +35,7 @@
    "modules/25-plutosvg.json",
    "modules/26-libpng.json",
    "modules/27-qtapng.json",
+    "modules/28-rapidyaml.json",
    {
      "name": "pcsx2",
      "buildsystem": "cmake-ninja",
@@ -79,4 +80,3 @@
    }
  ]
 }
-
@@ -20,7 +20,7 @@
  <url type="donation">https://github.com/sponsors/PCSX2</url>
  <url type="faq">https://pcsx2.net/docs/</url>
  <url type="help">https://pcsx2.net/discord</url>
-  <url type="contribute">https://github.com/PCSX2/pcsx2/blob/master/.github/CONTRIBUTING.md</url>
+  <url type="contribute">https://pcsx2.net/docs/category/contributing</url>
  <url type="translate">https://crowdin.com/project/pcsx2-emulator</url>
  <url type="contact">https://mastodon.social/@PCSX2</url>
  <screenshots>
@@ -7,16 +7,21 @@ merge_binaries() {
 	ARMDIR=$2
 	echo "Merging ARM64 binaries from $ARMDIR into fat binaries at $X86DIR..."

-	IFS="
-"
+	IFS=$'\n'
+	FILES=()
+
 	pushd "$X86DIR"
 	for X86BIN in $(find . -type f \( -name '*.dylib' -o -name '*.a' -o -perm +111 \)); do
 		if file "$X86DIR/$X86BIN" | grep "Mach-O.*x86_64" >/dev/null; then
 			ARMBIN="${ARMDIR}/${X86BIN}"
 			echo "Merge $ARMBIN to $X86BIN..."
 			lipo -create "$X86BIN" "$ARMBIN" -o "$X86BIN"
+			FILES+=("$X86BIN")
 		fi
 	done
+	# If the timestamps of all the files we touched aren't equal, make may recreate them on make install if one depends on another
+	# Minimize the chance of that by touching them all at once
+	touch "${FILES[@]}"
 	popd
 }

@@ -38,26 +43,28 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-SDL=SDL3-3.4.0
+QT=6.11.0
+QTAPNG=1.3.0
+
+FREETYPE=2.14.3
+SDL=SDL3-3.4.8
+HARFBUZZ=14.0.0
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.53
-LIBJPEGTURBO=3.1.2
+LIBPNG=1.6.56
+LIBJPEGTURBO=3.1.4.1
 LIBWEBP=1.6.0
-FFMPEG=8.0
+FFMPEG=8.1
 MOLTENVK=1.4.1
-QT=6.10.1
-QTAPNG=1.3.0
 KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
+RAPIDYAML=0.11.1

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2026.1
+SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
+SHADERC_SPIRVHEADERS=04f10f650d514df88b76d25e83db360142c7b174
+SHADERC_SPIRVTOOLS=fbe4f3ad913c44fe8700545f8ffe35d1382b7093

 mkdir -p deps-build
 cd deps-build
@@ -77,66 +84,72 @@ CMAKE_ARCH_X64=-DCMAKE_OSX_ARCHITECTURES="x86_64"
 CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
 CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"

-cat > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
+grep . > SHASUMS <<EOF
+231ad85979864d914dc9568a1b71c91d6cf20d7b2021d059103bf0eb51cb755e  qtbase-everywhere-src-$QT.tar.xz
+d3adb02ac5e2fe24068dbdaee0d7cc68cc3fa8553291c1bfce77c9fe8e940cc8  qtimageformats-everywhere-src-$QT.tar.xz
+dfa8d653be07087d9407ed4a4ebae847f8953e0b7abd829f089803ab652a30e6  qtsvg-everywhere-src-$QT.tar.xz
+cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76  qttools-everywhere-src-$QT.tar.xz
+54f48b2fe4316892ff930195f170a5385644acc7393505f3155c066b8e1ffe56  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+
+36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f  freetype-$FREETYPE.tar.xz
+e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
+f29db9470e0ca5cef484e04e27baeec233aa428e8fdabe9e51b0f706c0809d24  harfbuzz-$HARFBUZZ.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
+f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8  libpng-$LIBPNG-apng.patch.gz
+ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
+9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  MoltenVK-$MOLTENVK.tar.gz
 51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1  rapidyaml-$RAPIDYAML-src.tgz
+
+245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66  shaderc-$SHADERC.tar.gz
+bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+1b220e3eec1714f0451b0e3652979bd280edf10893f617837b88e6359a804ded  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+cabb35f4eef0da3ef72ad9edd596af4191d7507a8f35c05df526d2d5ff889f59  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-curl -C - -L \
-	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
-	-O "https://libsdl.org/release/$SDL.tar.gz" \
-	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
-	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
-	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
-	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
-	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
-	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
-	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
-	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
-	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
-	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
-	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.tar.gz" \
-	-o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
-	-o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
+if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
+	curl -L \
+		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
+		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
+		-O "https://libsdl.org/release/$SDL.tar.gz" \
+		-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+		-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
+		-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+		-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
+		-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
+		-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+		-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+		-O "https://github.com/KhronosGroup/MoltenVK/archive/v$MOLTENVK/MoltenVK-$MOLTENVK.tar.gz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+		-O "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
+		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
+		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
+		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
+		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
+		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
+		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
+fi

-shasum -a 256 --check SHASUMS
+shasum -a 256 --check --strict SHASUMS

 echo "Installing SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -150,7 +163,7 @@ if [ "$BUILD_FFMPEG" -ne 0 ]; then
 	cd build
 	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
 		../configure --prefix="$INSTALLDIR" \
-		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' --disable-x86asm \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' \
 		--disable-all --disable-autodetect --disable-static --enable-shared \
 		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
 		--enable-audiotoolbox --enable-videotoolbox \
@@ -205,7 +218,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
+gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
 patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
@@ -257,7 +270,7 @@ echo "Building HarfBuzz..."
 rm -fr "harfbuzz-$HARFBUZZ"
 tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
-cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
 cmake --build build --parallel
 cmake --install build
 cd ..
@@ -274,7 +287,7 @@ cd ..
 # MoltenVK already builds universal binaries, nothing special to do here.
 echo "Installing MoltenVK..."
 rm -fr "MoltenVK-${MOLTENVK}"
-tar xf "v$MOLTENVK.tar.gz"
+tar xf "MoltenVK-$MOLTENVK.tar.gz"
 cd "MoltenVK-${MOLTENVK}"
 ./fetchDependencies --macos
 make macos MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=0 MVK_CONFIG_USE_METAL_PRIVATE_API=1
@@ -288,6 +301,8 @@ cd "qtbase-everywhere-src-$QT"

 # Patch Qt to support macOS 11
 patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
+# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
+patch -p1 < "$SCRIPTDIR/qt110-xcode264.patch"

 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
@@ -417,6 +432,15 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..

+echo "Building RapidYAML..."
+rm -fr "rapidyaml-$RAPIDYAML-src"
+tar xf "rapidyaml-$RAPIDYAML-src.tgz"
+cd "rapidyaml-$RAPIDYAML-src"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
 echo "Cleaning up..."
 cd ..
 rm -rf deps-build
@@ -20,26 +20,28 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-SDL=SDL3-3.4.0
+QT=6.11.0
+QTAPNG=1.3.0
+
+FREETYPE=2.14.3
+SDL=SDL3-3.4.8
+HARFBUZZ=14.0.0
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.53
-LIBJPEGTURBO=3.1.2
+LIBPNG=1.6.56
+LIBJPEGTURBO=3.1.4.1
 LIBWEBP=1.6.0
-FFMPEG=8.0
+FFMPEG=8.1
 MOLTENVK=1.4.1
-QT=6.10.1
-QTAPNG=1.3.0
 KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
+RAPIDYAML=0.11.1

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2026.1
+SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
+SHADERC_SPIRVHEADERS=04f10f650d514df88b76d25e83db360142c7b174
+SHADERC_SPIRVTOOLS=fbe4f3ad913c44fe8700545f8ffe35d1382b7093

 mkdir -p deps-build
 cd deps-build
@@ -58,66 +60,72 @@ CMAKE_COMMON=(
 	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
 )

-cat > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
+grep . > SHASUMS <<EOF
+231ad85979864d914dc9568a1b71c91d6cf20d7b2021d059103bf0eb51cb755e  qtbase-everywhere-src-$QT.tar.xz
+d3adb02ac5e2fe24068dbdaee0d7cc68cc3fa8553291c1bfce77c9fe8e940cc8  qtimageformats-everywhere-src-$QT.tar.xz
+dfa8d653be07087d9407ed4a4ebae847f8953e0b7abd829f089803ab652a30e6  qtsvg-everywhere-src-$QT.tar.xz
+cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76  qttools-everywhere-src-$QT.tar.xz
+54f48b2fe4316892ff930195f170a5385644acc7393505f3155c066b8e1ffe56  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+
+36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f  freetype-$FREETYPE.tar.xz
+e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
+f29db9470e0ca5cef484e04e27baeec233aa428e8fdabe9e51b0f706c0809d24  harfbuzz-$HARFBUZZ.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
+f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
+9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8  libpng-$LIBPNG-apng.patch.gz
+ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
 9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1  rapidyaml-$RAPIDYAML-src.tgz
+
+245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66  shaderc-$SHADERC.tar.gz
+bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+1b220e3eec1714f0451b0e3652979bd280edf10893f617837b88e6359a804ded  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+cabb35f4eef0da3ef72ad9edd596af4191d7507a8f35c05df526d2d5ff889f59  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-curl -L \
-	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
-	-O "https://libsdl.org/release/$SDL.tar.gz" \
-	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
-	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
-	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
-	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
-	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
-	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
-	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
-	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
-	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
-	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
-	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.tar.gz" \
-	-o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
-	-o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
+if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
+	curl -L \
+		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
+		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
+		-O "https://libsdl.org/release/$SDL.tar.gz" \
+		-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+		-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
+		-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+		-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
+		-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
+		-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+		-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+		-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
+		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+		-O "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
+		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
+		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
+		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
+		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
+		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
+		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
+		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
+fi

-shasum -a 256 --check SHASUMS
+shasum -a 256 --check --strict SHASUMS

 echo "Installing SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build "${CMAKE_COMMON[@]}" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
+cmake -B build "${CMAKE_COMMON[@]}" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -162,7 +170,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
+gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
 patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
@@ -203,7 +211,7 @@ echo "Building HarfBuzz..."
 rm -fr "harfbuzz-$HARFBUZZ"
 tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
-cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -236,6 +244,8 @@ cd "qtbase-everywhere-src-$QT"

 # Patch Qt to support macOS 11
 patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
+# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
+patch -p1 < "$SCRIPTDIR/qt110-xcode264.patch"

 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
@@ -365,6 +375,15 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..

+echo "Building RapidYAML..."
+rm -fr "rapidyaml-$RAPIDYAML-src"
+tar xf "rapidyaml-$RAPIDYAML-src.tgz"
+cd "rapidyaml-$RAPIDYAML-src"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
 echo "Cleaning up..."
 cd ..
 rm -rf deps-build
@@ -0,0 +1,25 @@
+diff --git a/src/corelib/thread/qyieldcpu.h b/src/corelib/thread/qyieldcpu.h
+index ab710ea..954c49a 100644
+--- a/src/corelib/thread/qyieldcpu.h
+++ b/src/corelib/thread/qyieldcpu.h
+@@ -33,7 +33,9 @@
+     noexcept
+ #endif
+ {
+-#if __has_builtin(__yield)
+#if __has_builtin(__builtin_arm_yield)
+    __builtin_arm_yield();
+#elif __has_builtin(__yield)
+     __yield();              // Generic
+ #elif defined(_YIELD_PROCESSOR) && defined(Q_CC_MSVC)
+     _YIELD_PROCESSOR();     // Generic; MSVC's <atomic>
+@@ -47,9 +49,6 @@
+     _mm_pause();
+ #elif defined(Q_PROCESSOR_X86)
+     __asm__("pause");           // hopefully asm() works in this compiler
+-
+-#elif __has_builtin(__builtin_arm_yield)
+-    __builtin_arm_yield();
+ #elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 && defined(Q_CC_GNU)
+     __asm__("yield");           // this works everywhere
+ 
@@ -2,12 +2,24 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
-  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
-) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
-  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+rem Favour VS2022 over VS2026 for now.
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
+  if defined VSINSTPATH (
+    echo VSINSTPATH=!VSINSTPATH!
+    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" || goto error
+  ) else (
+    for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[18, 19)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
+    if defined VSINSTPATH (
+      echo VSINSTPATH=!VSINSTPATH!
+      call "!VSINSTPATH!\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" || goto error
+    ) else (
+      echo Visual Studio not found.
+      goto error
+    )
+  )
 ) else (
-  echo Visual Studio 2022 not found.
+  echo Visual Studio not found.
  goto error
 )

@@ -42,53 +54,60 @@ echo INSTALLDIR=%INSTALLDIR%

 cd "%BUILDDIR%"

-set FREETYPE=2.14.1
-set HARFBUZZ=12.2.0
-set LIBJPEGTURBO=3.1.2
-set LIBPNG=1653
-set LIBPNGLONG=1.6.53
-set SDL=SDL3-3.4.0
-set QT=6.10.1
-set QTMINOR=6.10
+set QT=6.11.0
+set QTMINOR=6.11
 set QTAPNG=1.3.0
+
+set FREETYPE=2.14.3
+set HARFBUZZ=14.0.0
+set SDL=SDL3-3.4.8
+set LIBJPEGTURBO=3.1.4.1
+set LIBPNG=1656
+set LIBPNGLONG=1.6.56
 set LZ4=1.10.0
 set WEBP=1.6.0
-set ZLIB=1.3.1
-set ZLIBSHORT=131
+set ZLIB=1.3.2
+set ZLIBSHORT=132
 set ZSTD=1.5.7
 set KDDOCKWIDGETS=2.4.0
 set PLUTOVG=1.3.2
 set PLUTOSVG=0.0.7
+set RAPIDYAML=0.11.1

-set SHADERC=2025.4
-set SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-set SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+set SHADERC=2026.1
+set SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
+set SHADERC_SPIRVHEADERS=04f10f650d514df88b76d25e83db360142c7b174
+set SHADERC_SPIRVTOOLS=fbe4f3ad913c44fe8700545f8ffe35d1382b7093

-call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
+set AGILITYSDK=1.619.1
+
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 590d5ae246c85fa14d6458a36ff75a11236acfe8987c2475090aab1770acbdf8 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 5dfb3c0cb84d2c935c1716b3b86358ca496fb9216676e7e28fee1357fb4a050e || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" c92e1b46170b8671bbd46c783939f0c2dba4986882c5ebd37aaa9eba5b224fbe || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" ded4420823cb7b1bc49f38c5c56dd43ec27b6577ccbc7f620790abfabcc33b62 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" f9c4fd4fd73dff51e9043d2825b04361b678f63798ed798021ef47f1ff0bfccf || goto error
 call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip f4b86f4d107bc4f0b005c97d6cde43e548a125ee2810fa00d41844b46b6fe16a || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1656.zip 1ccf023c5f4ee1a7b75c5624f53acede5066f79b2fb14ddffaa28369adf9baac || goto error
+call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 506206e02f90c1f37e048eacaf9e8a3a7dc682fd27783eb0ff15a7d2dcc9c2af || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
 call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
 call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
+call :downloadfile "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" 9073a264301e93183844026239c9081717d52d13fb71aae68a0555c576b8de44 || goto error
+call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 30054b74abdf0ba35bf2cb435b6e49fcb6d62a8e78a240a018c36aa60dba765f || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" fab72d1a38eacea52710d18edb95dfd75db894ad869675d07a1eb26827da9b15 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 4a118247386ffba9160113f146f2189ba5abe3995db357114d7112ede6bd3cd1 || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 9a38cb3b14484f5038d78cd5df89404f2f5b389a6ad91f9f1df4ae71bb9490dc || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" a26383c836a84fab5b03aed5d98e8e27d6c0a9cdbc3b0f462ccfe0a11a3d91ea || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 3ac59c8216d367ab7858684d39c8faf872a64150aeb139335f4e083c5f79dde0 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 42a30acca4a35955370ed8ff6e54b823b4d4a5a86571baec1203d3fce87da447 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 00ecd73dcaaa956cf2221ce899ce096e9535ba20695483c5277adede462d1bde || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 65b23ace0ff0c64daf51f7741ebb6448899fa4aceefc72403e56f5b95607ca8e || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -152,7 +171,7 @@ echo Building HarfBuzz...
 rmdir /S /Q "harfbuzz-%HARFBUZZ%"
 %SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
 cd "harfbuzz-%HARFBUZZ%" || goto error
-cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -188,7 +207,7 @@ echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error
@@ -204,7 +223,7 @@ echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
+cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON -DQT_FEATURE_windows_ioring=OFF %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -305,6 +324,29 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

+echo "Building RapidYAML..."
+rmdir /S /Q "rapidyaml-%RAPIDYAML%-src"
+%SEVENZIP% x "rapidyaml-%RAPIDYAML%-src.zip" || goto error
+cd "rapidyaml-%RAPIDYAML%-src" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Unpacking Agility SDK
+rmdir /S /Q "agility-sdk-%AGILITYSDK%"
+%SEVENZIP% x -o"agility-sdk-%AGILITYSDK%" "agility-sdk-%AGILITYSDK%.nupkg" || goto error
+cd "agility-sdk-%AGILITYSDK%" || goto error
+if not exist "%INSTALLDIR%\bin\D3D12" (
+  mkdir "%INSTALLDIR%\bin\D3D12" || goto error
+)
+rem the pdbs aren't in the list of distributable files, so only copy the dlls.
+copy "build\native\bin\arm64\D3D12Core.dll" "%INSTALLDIR%\bin\D3D12\D3D12Core.dll" || goto error
+if %DEBUG%==1 (
+  copy "build\native\bin\arm64\d3d12SDKLayers.dll" "%INSTALLDIR%\bin\D3D12\d3d12SDKLayers.dll" || goto error
+)
+cd .. || goto error
+
 echo Building shaderc...
 rmdir /S /Q "shaderc-%SHADERC%"
 %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
@@ -2,17 +2,32 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" (
-  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
-  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+rem Favour VS2022 over VS2026 for now.
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
+  if defined VSINSTPATH (
+    echo VSINSTPATH=!VSINSTPATH!
+    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvars64.bat" || goto error
+  ) else (
+    for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[18, 19)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
+    if defined VSINSTPATH (
+      echo VSINSTPATH=!VSINSTPATH!
+      call "!VSINSTPATH!\VC\Auxiliary\Build\vcvars64.bat" || goto error
+    ) else (
+      echo Visual Studio not found.
+      goto error
+    )
+  )
 ) else (
-  echo Visual Studio 2022 not found.
+  echo Visual Studio not found.
  goto error
 )

 set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
 set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
+set BASH="C:\Program Files\Git\usr\bin\bash.exe"
+
+set "UNIX_TOOLS=C:\Program Files\Git\usr\bin\"

 if defined DEBUG (
  echo DEBUG=%DEBUG%
@@ -20,6 +35,12 @@ if defined DEBUG (
  set DEBUG=1
 )

+if defined BUILD_FFMPEG (
+  echo BUILD_FFMPEG=%BUILD_FFMPEG%
+) else (
+  set BUILD_FFMPEG=0
+)
+
 pushd %~dp0
 set "SCRIPTDIR=%CD%"
 cd ..\..\..\..
@@ -40,53 +61,80 @@ set "PATH=%PATH%;%INSTALLDIR%\bin"

 cd "%BUILDDIR%"

-set FREETYPE=2.14.1
-set HARFBUZZ=12.2.0
-set LIBJPEGTURBO=3.1.2
-set LIBPNG=1653
-set LIBPNGLONG=1.6.53
-set SDL=SDL3-3.4.0
-set QT=6.10.1
-set QTMINOR=6.10
+set QT=6.11.0
+set QTMINOR=6.11
 set QTAPNG=1.3.0
+
+set FFMPEG=8.1
+set MESON=1.10.2
+set PKGCONF=2.5.1
+set AMF=1.5.0
+set LIBVPL=2.16.0
+set NVENC=13.0.19.0
+set LIBOPUS=1.6.1
+set LIBSVTAV1=4.0.1
+set LIBX264=b35605ace3ddf7c1a5d67a2eb553f034aef41d55
+
+set FREETYPE=2.14.3
+set HARFBUZZ=14.0.0
+set SDL=SDL3-3.4.8
+set LIBJPEGTURBO=3.1.4.1
+set LIBPNG=1656
+set LIBPNGLONG=1.6.56
 set LZ4=1.10.0
 set WEBP=1.6.0
-set ZLIB=1.3.1
-set ZLIBSHORT=131
+set ZLIB=1.3.2
+set ZLIBSHORT=132
 set ZSTD=1.5.7
 set KDDOCKWIDGETS=2.4.0
 set PLUTOVG=1.3.2
 set PLUTOSVG=0.0.7
+set RAPIDYAML=0.11.1

-set SHADERC=2025.4
-set SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-set SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+set SHADERC=2026.1
+set SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
+set SHADERC_SPIRVHEADERS=04f10f650d514df88b76d25e83db360142c7b174
+set SHADERC_SPIRVTOOLS=fbe4f3ad913c44fe8700545f8ffe35d1382b7093

-call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
+set AGILITYSDK=1.619.1
+
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 590d5ae246c85fa14d6458a36ff75a11236acfe8987c2475090aab1770acbdf8 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 5dfb3c0cb84d2c935c1716b3b86358ca496fb9216676e7e28fee1357fb4a050e || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" c92e1b46170b8671bbd46c783939f0c2dba4986882c5ebd37aaa9eba5b224fbe || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" ded4420823cb7b1bc49f38c5c56dd43ec27b6577ccbc7f620790abfabcc33b62 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" f9c4fd4fd73dff51e9043d2825b04361b678f63798ed798021ef47f1ff0bfccf || goto error
 call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
+
+call :downloadfile "ffmpeg-%FFMPEG%.tar.xz" "https://ffmpeg.org/releases/ffmpeg-%FFMPEG%.tar.xz" b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a || goto error
+call :downloadfile "meson-%MESON%.tar.gz" "https://github.com/mesonbuild/meson/releases/download/%MESON%/meson-%MESON%.tar.gz" 7890287d911dd4ee1ebd0efb61ed0321bfcd87c725df923a837cf90c6508f96b || goto error
+call :downloadfile "pkgconf-pkgconf-%PKGCONF%.zip" "https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-%PKGCONF%.zip" c5b5f88a2ca2324dc5d857e35bb145e24290e326357ea94a86d47b8d7fa15477 || goto error
+call :downloadfile "amf-headers-v%AMF%.tar.gz" "https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v%AMF%/AMF-headers-v%AMF%.tar.gz" d569647fa26f289affe81a206259fa92f819d06db1e80cc334559953e82a3f01 || goto error
+call :downloadfile "libvpl-%LIBVPL%.zip" "https://github.com/intel/libvpl/archive/v%LIBVPL%.zip" 0b2ee8da8b9ef07ed4b52bf9ddee05008ec999b7c3c41944d7a9f804631c398e || goto error
+call :downloadfile "nv-codec-headers-%NVENC%.tar.gz" "https://github.com/FFmpeg/nv-codec-headers/releases/download/n%NVENC%/nv-codec-headers-%NVENC%.tar.gz" 13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee || goto error
+call :downloadfile "opus-%LIBOPUS%.tar.gz" "https://downloads.xiph.org/releases/opus/opus-%LIBOPUS%.tar.gz" 6ffcb593207be92584df15b32466ed64bbec99109f007c82205f0194572411a1 || goto error
+call :downloadfile "SVT-AV1-v%LIBSVTAV1%.zip" "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v%LIBSVTAV1%/SVT-AV1-v%LIBSVTAV1%.zip" bfafad9af17f87fff75e44ca9b2c10cdd83c576047c3e96229285a8a64c81afc || goto error
+call :downloadfile "x264-%LIBX264%.zip" "https://code.videolan.org/videolan/x264/-/archive/%LIBX264%.zip" d95d059eff81cc565165cd058b66e208f0cc9874106a8fe94a811a66cf8a85a2 || goto error
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip f4b86f4d107bc4f0b005c97d6cde43e548a125ee2810fa00d41844b46b6fe16a || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1656.zip 1ccf023c5f4ee1a7b75c5624f53acede5066f79b2fb14ddffaa28369adf9baac || goto error
+call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 506206e02f90c1f37e048eacaf9e8a3a7dc682fd27783eb0ff15a7d2dcc9c2af || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
 call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
 call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
+call :downloadfile "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" 9073a264301e93183844026239c9081717d52d13fb71aae68a0555c576b8de44 || goto error
+call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 30054b74abdf0ba35bf2cb435b6e49fcb6d62a8e78a240a018c36aa60dba765f || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" fab72d1a38eacea52710d18edb95dfd75db894ad869675d07a1eb26827da9b15 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 4a118247386ffba9160113f146f2189ba5abe3995db357114d7112ede6bd3cd1 || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 9a38cb3b14484f5038d78cd5df89404f2f5b389a6ad91f9f1df4ae71bb9490dc || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" a26383c836a84fab5b03aed5d98e8e27d6c0a9cdbc3b0f462ccfe0a11a3d91ea || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 3ac59c8216d367ab7858684d39c8faf872a64150aeb139335f4e083c5f79dde0 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 42a30acca4a35955370ed8ff6e54b823b4d4a5a86571baec1203d3fce87da447 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 00ecd73dcaaa956cf2221ce899ce096e9535ba20695483c5277adede462d1bde || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 65b23ace0ff0c64daf51f7741ebb6448899fa4aceefc72403e56f5b95607ca8e || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -96,6 +144,139 @@ if %DEBUG%==1 (

 set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_MINSIZEREL="/DEBUG"

+if %BUILD_FFMPEG%==1 (
+  if not "%INSTALLDIR%"=="%INSTALLDIR: =%" (
+    echo FFmpeg does not support building in paths with spaces.
+    goto error
+  )
+
+  where nasm /q
+  set FOUND_NASM=0
+  if !ERRORLEVEL!==0 (
+    set FOUND_NASM=1
+  )
+
+  echo "Installing AMF headers"
+  rmdir /S /Q "amf-headers-v%AMF%"
+  tar -xf "amf-headers-v%AMF%.tar.gz" || goto error
+  xcopy "%BUILDDIR%\amf-headers-v%AMF%\AMF" "%INSTALLDIR%\include\AMF\" /y /s || goto error
+  echo.
+
+  echo "Installing libvpl"
+  rmdir /S /Q "libvpl-%LIBVPL%"
+  %SEVENZIP% x "libvpl-%LIBVPL%.zip" || goto error
+  cd "libvpl-%LIBVPL%" || goto error
+  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DINSTALL_EXAMPLES=OFF -DINSTALL_LIB=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -B build -G Ninja || goto error
+  cmake --build build --parallel || goto error
+  ninja -C build install || goto error
+  cd .. || goto error
+
+  echo "Installing libopus"
+  rmdir /S /Q "opus-%LIBOPUS%"
+  tar -xf "opus-%LIBOPUS%.tar.gz" || goto error
+  cd "opus-%LIBOPUS%" || goto error
+  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -B build -G Ninja || goto error
+  cmake --build build --parallel || goto error
+  ninja -C build install || goto error
+  cd .. || goto error
+
+  echo "Installing libsvtav1"
+  rmdir /S /Q "SVT-AV1-v%LIBSVTAV1%"
+  tar -xf "SVT-AV1-v%LIBSVTAV1%.zip" || goto error
+  cd "SVT-AV1-v%LIBSVTAV1%" || goto error
+  if !FOUND_NASM!==0 (
+    set LIBSTVAV1_NASM=-DCOMPILE_C_ONLY=ON
+  )
+  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DBUILD_APPS=OFF -DSVT_AV1_LTO=ON !LIBSTVAV1_NASM! -B build -G Ninja || goto error
+  cmake --build build --parallel || goto error
+  ninja -C build install || goto error
+  cd .. || goto error
+
+  echo "Extracting meson"
+  rmdir /S /Q "meson-%MESON%"
+  tar xf "meson-%MESON%.tar.gz" || goto error
+  set MASON_PY=python "%BUILDDIR%\meson-%MESON%\meson.py"
+  !MASON_PY! -v || goto error
+  echo.
+
+  rem Alternatively we could grab pkg-config-lite from chocolatey or WinGet.
+  echo "Installing pkgconf"
+  rmdir /S /Q "pkgconf-pkgconf-%PKGCONF%"
+  %SEVENZIP% x "pkgconf-pkgconf-%PKGCONF%.zip" || goto error
+  cd "pkgconf-pkgconf-%PKGCONF%" || goto error
+  !MASON_PY! setup --buildtype=release --prefix="%INSTALLDIR%" -Dtests=disabled build --backend=ninja || goto error
+  !MASON_PY! compile -C build || goto error
+  ninja -C build install || goto error
+  set PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+  set PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+  Set "PKG_CONFIG_PATH=%INSTALLDIR%\lib\pkgconfig"
+  cd .. || goto error
+
+  set "OLD_PATH=%PATH%"
+  set "PATH=%PATH%;%UNIX_TOOLS%"
+
+  echo "Installing nvenc headers..."
+  rmdir /S /Q "nv-codec-headers-%NVENC%"
+  tar xf "nv-codec-headers-%NVENC%.tar.gz" || goto error
+  make -C "nv-codec-headers-%NVENC%" PREFIX="%INSTALLDIR%" install || goto error
+  echo.
+
+  set CC=cl
+  set CXX=cl
+
+  echo "Installing libx264"
+  rmdir /S /Q "x264-%LIBX264%"
+  %SEVENZIP% x "x264-%LIBX264%.zip" || goto error
+  cd "x264-%LIBX264%" || goto error
+  if !FOUND_NASM!==0 (
+    set LIBX264_NASM=--disable-asm
+  )
+  %BASH% configure --prefix="%INSTALLDIR%" --disable-cli --enable-static --extra-cflags="-MD -w -Os -GL" !LIBX264_NASM! || goto error
+  make -j%NUMBER_OF_PROCESSORS% || goto error
+  make install || goto error
+  cd .. || goto error
+  echo.
+
+  echo "Installing FFmpeg..."
+  rmdir /S /Q "ffmpeg-%FFMPEG%"
+  tar xf "ffmpeg-%FFMPEG%.tar.xz" || goto error
+  cd "ffmpeg-%FFMPEG%"
+  %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-configure-escape.patch" || goto error
+  if not !FOUND_NASM!==1 (
+    rem MSVC LTO gives linker errors when building without nasm.
+    rem The following patches fixes that issue.
+    %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-no-nasm-fix-avc-air.patch" || goto error
+    %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-no-nasm-fix-swc-air.patch" || goto error
+    set FFMPEG_NASM=--disable-x86asm
+  )
+  rem FFmpeg's build seems to choke when extra-cflags contain `\`, so use `/` as the path separator.
+  set VULKAN_INCLUDE=%INSTALLDIR:\=/%/../3rdparty/vulkan/include
+  rem libvpl needs to have advapi32.lib & ole32.lib added as extra libs.
+  rem For some reason QSV requires the hevc parser on windows.
+  rem --enable-small removes the display names of codecs, so instead we specify optflag for minsize
+  %BASH% configure --prefix="%INSTALLDIR%" --disable-all --disable-autodetect --disable-static --enable-shared --disable-debug ^
+    --toolchain=msvc --extra-ldflags="-LTCG" --extra-libs="advapi32.lib ole32.lib" !FFMPEG_NASM! --pkg-config="%INSTALLDIR%\bin\pkgconf.exe" ^
+    --extra-cflags="-MD -GL -I!VULKAN_INCLUDE!" --extra-cxxflags="-MD -GL -I!VULKAN_INCLUDE!" --optflags="-O1" ^
+    --enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale ^
+    --enable-gpl --enable-libx264 --enable-libsvtav1 --enable-libopus --enable-vulkan --enable-ffnvcodec --enable-nvenc --enable-libvpl --enable-amf ^
+    --enable-d3d11va --enable-mediafoundation ^
+    --enable-encoder=ffv1,qtrle,libx264*,libsvtav1,aac,flac,libopus,pcm_s16be,pcm_s16le ^
+    --enable-encoder=h264_qsv,hevc_qsv,av1_qsv ^
+    --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc ^
+    --enable-encoder=h264_amf,hevc_amf,av1_amf ^
+    --enable-encoder=h264_vulkan,hevc_vulkan,av1_vulkan ^
+    --enable-encoder=h264_mf,hevc_mf,av1_mf ^
+    --enable-parser=hevc ^
+    --enable-muxer=avi,matroska,mov,mp3,mp4,wav ^
+    --enable-protocol=file || goto error
+  make -j%NUMBER_OF_PROCESSORS% || goto error
+  make install || goto error
+  cd ..
+  echo.
+
+  set "PATH=!OLD_PATH!"
+)
+
 echo Building Zlib...
 rmdir /S /Q "zlib-%ZLIB%"
 %SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
@@ -149,7 +330,7 @@ echo Building HarfBuzz...
 rmdir /S /Q "harfbuzz-%HARFBUZZ%"
 %SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
 cd "harfbuzz-%HARFBUZZ%" || goto error
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -185,7 +366,7 @@ echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error
@@ -201,7 +382,7 @@ echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
+cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON -DQT_FEATURE_windows_ioring=OFF %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -302,6 +483,29 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

+echo "Building RapidYAML..."
+rmdir /S /Q "rapidyaml-%RAPIDYAML%-src"
+%SEVENZIP% x "rapidyaml-%RAPIDYAML%-src.zip" || goto error
+cd "rapidyaml-%RAPIDYAML%-src" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Unpacking Agility SDK
+rmdir /S /Q "agility-sdk-%AGILITYSDK%"
+%SEVENZIP% x -o"agility-sdk-%AGILITYSDK%" "agility-sdk-%AGILITYSDK%.nupkg" || goto error
+cd "agility-sdk-%AGILITYSDK%" || goto error
+if not exist "%INSTALLDIR%\bin\D3D12" (
+  mkdir "%INSTALLDIR%\bin\D3D12" || goto error
+)
+rem the pdbs aren't in the list of distributable files, so only copy the dlls.
+copy "build\native\bin\x64\D3D12Core.dll" "%INSTALLDIR%\bin\D3D12\D3D12Core.dll" || goto error
+if %DEBUG%==1 (
+  copy "build\native\bin\x64\d3d12SDKLayers.dll" "%INSTALLDIR%\bin\D3D12\d3d12SDKLayers.dll" || goto error
+)
+cd .. || goto error
+
 echo Building shaderc...
 rmdir /S /Q "shaderc-%SHADERC%"
 %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 747cbe6f40..c8a029cf19 100755
+--- a/configure
+++ b/configure
+@@ -5190,7 +5190,7 @@ probe_cc(){
+             _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); if (!match($$0, / /)) { print $$0 } }'\'' | xargs -r -d\\n -n1 wslpath -u | awk '\''BEGIN { printf "%s:", "$@" }; { sub(/\r/,""); printf " %s", $$0 }; END { print "" }'\'' > $(@:.o=.d)'
+ 
+         else
+-            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
+            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
+         fi
+         _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
+         _cflags_speed="-O2"
@@ -0,0 +1,29 @@
+diff --git a/libavcodec/x86/lpc_init.c b/libavcodec/x86/lpc_init.c
+index f2fca53799..da2c5a526d 100644
+--- a/libavcodec/x86/lpc_init.c
+++ b/libavcodec/x86/lpc_init.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+#include "config.h"
+ #include "libavutil/attributes.h"
+ #include "libavutil/x86/asm.h"
+ #include "libavutil/x86/cpu.h"
+@@ -112,9 +113,13 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
+         c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
+ #endif
+ 
+#if HAVE_SSE2_EXTERNAL
+     if (EXTERNAL_SSE2(cpu_flags))
+         c->lpc_apply_welch_window = ff_lpc_apply_welch_window_sse2;
+#endif
+ 
+#if HAVE_AVX2_EXTERNAL
+     if (EXTERNAL_AVX2(cpu_flags))
+         c->lpc_apply_welch_window = ff_lpc_apply_welch_window_avx2;
+#endif
+ }
+-- 
+2.43.0.windows.1
+
@@ -0,0 +1,177 @@
+diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
+index 48a73bd0b2..718b90ec81 100644
+--- a/libswscale/x86/rgb2rgb.c
+++ b/libswscale/x86/rgb2rgb.c
+@@ -2439,6 +2439,7 @@ av_cold void rgb2rgb_init_x86(void)
+         deinterleaveBytes = deinterleave_bytes_sse2;
+     }
+ #endif
+#if HAVE_SSE3_EXTERNAL
+     if (EXTERNAL_SSSE3(cpu_flags)) {
+         shuffle_bytes_0321 = ff_shuffle_bytes_0321_ssse3;
+         shuffle_bytes_2103 = ff_shuffle_bytes_2103_ssse3;
+@@ -2450,6 +2451,7 @@ av_cold void rgb2rgb_init_x86(void)
+         shuffle_bytes_2130 = ff_shuffle_bytes_2130_ssse3;
+         shuffle_bytes_1203 = ff_shuffle_bytes_1203_ssse3;
+     }
+#endif
+ #if HAVE_AVX_EXTERNAL
+     if (EXTERNAL_AVX(cpu_flags)) {
+         deinterleaveBytes = deinterleave_bytes_avx;
+diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
+index 8b6f9bd58a..33b9673779 100644
+--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
+@@ -473,6 +473,7 @@ RANGE_CONVERT_FUNCS_DECL(avx2, 16)
+ 
+ av_cold void ff_sws_init_range_convert_x86(SwsInternal *c)
+ {
+#if HAVE_X86ASM
+     int cpu_flags = av_get_cpu_flags();
+     if (EXTERNAL_AVX2_FAST(cpu_flags)) {
+         if (c->dstBpc <= 14) {
+@@ -485,6 +486,7 @@ av_cold void ff_sws_init_range_convert_x86(SwsInternal *c)
+     } else if (EXTERNAL_SSE4(cpu_flags) && c->dstBpc > 14) {
+         RANGE_CONVERT_FUNCS(sse4, 16);
+     }
+#endif
+ }
+ 
+ av_cold void ff_sws_init_swscale_x86(SwsInternal *c)
+@@ -569,6 +571,7 @@ switch(c->dstBpc){ \
+              else                ASSIGN_SCALE_FUNC2(hscalefn, X8, opt1, opt2); \
+              break; \
+     }
+#if HAVE_SSE2_EXTERNAL
+     if (EXTERNAL_SSE2(cpu_flags)) {
+         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, sse2, sse2);
+         ASSIGN_SSE_SCALE_FUNC(c->hcScale, c->hChrFilterSize, sse2, sse2);
+@@ -607,6 +610,8 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+#if HAVE_SSE3_EXTERNAL
+     if (EXTERNAL_SSSE3(cpu_flags)) {
+         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, ssse3, ssse3);
+         ASSIGN_SSE_SCALE_FUNC(c->hcScale, c->hChrFilterSize, ssse3, ssse3);
+@@ -617,6 +622,8 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+#if HAVE_SSE4_EXTERNAL
+     if (EXTERNAL_SSE4(cpu_flags)) {
+         /* Xto15 don't need special sse4 functions */
+         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, sse4, ssse3);
+@@ -627,7 +634,9 @@ switch(c->dstBpc){ \
+         if (c->dstBpc == 16 && !isBE(c->opts.dst_format) && !(c->opts.flags & SWS_ACCURATE_RND))
+             c->yuv2plane1 = ff_yuv2plane1_16_sse4;
+     }
+#endif
+ 
+#if HAVE_AVX_EXTERNAL
+     if (EXTERNAL_AVX(cpu_flags)) {
+         ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx, ,
+                             HAVE_ALIGNED_STACK || ARCH_X86_64);
+@@ -657,6 +666,7 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+ 
+ #if ARCH_X86_64
+ #define ASSIGN_AVX2_SCALE_FUNC(hscalefn, filtersize) \
+@@ -666,6 +676,7 @@ switch(c->dstBpc){ \
+              break; \
+     }
+ 
+#if HAVE_AVX2_EXTERNAL
+     if (EXTERNAL_AVX2_FAST(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_SLOW_GATHER)) {
+         if ((c->srcBpc == 8) && (c->dstBpc <= 14)) {
+             ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize);
+@@ -697,6 +708,7 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+ 
+ 
+ #define INPUT_PLANER_RGB_A_FUNC_CASE_NOBREAK(fmt, name, opt)          \
+@@ -756,6 +768,7 @@ switch(c->dstBpc){ \
+         INPUT_PLANER_RGBAXX_YUVA_FUNC_CASE(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, rgbf32, opt)
+ 
+ 
+#if HAVE_SSE2_EXTERNAL
+     if (EXTERNAL_SSE2(cpu_flags)) {
+         switch (c->opts.src_format) {
+         INPUT_PLANER_RGB_A_FUNC_CASE_NOBREAK(AV_PIX_FMT_GBRAP,                         rgb, sse2);
+@@ -770,7 +783,9 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+ 
+#if HAVE_SSE4_EXTERNAL
+     if (EXTERNAL_SSE4(cpu_flags)) {
+         switch (c->opts.src_format) {
+         case AV_PIX_FMT_GBRAP:
+@@ -785,7 +800,9 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+ 
+#if HAVE_AVX2_EXTERNAL
+     if (EXTERNAL_AVX2_FAST(cpu_flags)) {
+         switch (c->opts.src_format) {
+         INPUT_PLANER_RGB_YUVA_ALL_CASES(avx2)
+@@ -793,6 +810,7 @@ switch(c->dstBpc){ \
+             break;
+         }
+     }
+#endif
+ 
+     if(c->opts.flags & SWS_FULL_CHR_H_INT) {
+ 
+@@ -825,6 +843,7 @@ switch(c->dstBpc){ \
+         YUV2ANYX_FUNC_CASE(AV_PIX_FMT_GBRPF32BE,  gbrpf32be,  opt) \
+         YUV2ANYX_FUNC_CASE(AV_PIX_FMT_GBRAPF32BE, gbrapf32be, opt)
+ 
+#if HAVE_SSE2_EXTERNAL
+         if (EXTERNAL_SSE2(cpu_flags)) {
+             switch (c->opts.dst_format) {
+             YUV2ANYX_GBRAP_CASES(sse2)
+@@ -832,7 +851,9 @@ switch(c->dstBpc){ \
+                 break;
+             }
+         }
+#endif
+ 
+#if HAVE_SSE4_EXTERNAL
+         if (EXTERNAL_SSE4(cpu_flags)) {
+             switch (c->opts.dst_format) {
+             YUV2ANYX_GBRAP_CASES(sse4)
+@@ -840,7 +861,9 @@ switch(c->dstBpc){ \
+                 break;
+             }
+         }
+#endif
+ 
+#if HAVE_AVX2_EXTERNAL
+         if (EXTERNAL_AVX2_FAST(cpu_flags)) {
+             switch (c->opts.dst_format) {
+             YUV2ANYX_GBRAP_CASES(avx2)
+@@ -848,7 +871,8 @@ switch(c->dstBpc){ \
+                 break;
+             }
+         }
+#endif
+     }
+ 
+-#endif
+#endif /* ARCH_X86_64 */
+ }
+-- 
+2.43.0.windows.1
+
@@ -63,10 +63,10 @@ jobs:
        shell: pwsh
        run: |
          [string[]] $clang_cl = &clang-cl.exe --version
-          
+
          $version = [Regex]::Match($clang_cl[0], "(\d+\.\d+\.\d+)")
          $path = $clang_cl[3].TrimStart("InstalledDir: ").TrimEnd("\bin")
-          
+
          $output = @"
          <Project>
            <PropertyGroup>
@@ -75,9 +75,9 @@ jobs:
            </PropertyGroup>
          </Project>
          "@
-          
+
          Write-Host $output
-          
+
          $output | Out-File Directory.build.props

      # actions/checkout elides tags, fetch them primarily for releases
@@ -105,7 +105,14 @@ jobs:

      - name: Setup msbuild
        if: inputs.configuration != 'CMake'
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
+
+      - name: Locate vcvars
+        if: inputs.configuration == 'CMake'
+        shell: cmd
+        run: |
+            for /f "usebackq tokens=*" %%i in (`call vswhere -latest -property installationPath`) do set "VSINSTPATH=%%i"
+            echo VCVARSPATH=%VSINSTPATH%\VC\Auxiliary\Build\vcvars64.bat>>%GITHUB_ENV%

      - name: Download patches
        shell: cmd
@@ -124,6 +131,7 @@ jobs:
        if: steps.cache-deps.outputs.cache-hit != 'true'
        env:
          DEBUG: 0
+          BUILD_FFMPEG: 1
        run: .github/workflows/scripts/windows/build-dependencies.bat

      - name: Generate CMake
@@ -131,30 +139,32 @@ jobs:
        id: cmake
        shell: cmd
        run: |
-          call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "%VCVARSPATH%" || exit /b
          cmake . -B build ${{ inputs.cmakeFlags }} "-DCMAKE_PREFIX_PATH=%cd%\deps" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja

      - name: Build PCSX2
        shell: cmd
        run: |
          if "${{ inputs.configuration }}"=="CMake" (
-            call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+            call "%VCVARSPATH%" || exit /b
            cmake --build build --config Release || exit /b
            cmake --install build --config Release || exit /b
          ) else (
-            msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}"
+            msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}" || exit /b
          )
+          REM We can use Segoe UI Emoji so we don't need to bundle this
+          del bin\resources\fonts\Twemoji*

      - name: Run Tests
        if: inputs.configuration == 'CMake'
        shell: cmd
        run: |
-          call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "%VCVARSPATH%" || exit /b
          set PATH=%PATH%;%GITHUB_WORKSPACE%\bin
          cmake --build build --config Release --target unittests

      - name: Upload artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: |
@@ -168,7 +178,7 @@ jobs:
            !./bin/**/*.lib

      - name: Install the Breakpad Symbol Generator
-        uses: baptiste0928/cargo-install@b687c656bda5733207e629b50a22bf68974a0305
+        uses: baptiste0928/cargo-install@f204293d9709061b7bc1756fec3ec4e2cd57dec0
        with:
          crate: dump_syms

@@ -176,9 +186,9 @@ jobs:
        shell: pwsh
        run: |
          mkdir -Force symbols
-          Get-ChildItem -Path ./bin -Recurse -File | Where-Object { 
-            ($_.Extension -eq ".exe" -or $_.Extension -eq ".pdb") -and ($_.Name -notmatch "updater") 
-          } | ForEach-Object { 
+          Get-ChildItem -Path ./bin -Recurse -File | Where-Object {
+            ($_.Extension -eq ".exe" -or $_.Extension -eq ".pdb") -and ($_.Name -notmatch "updater")
+          } | ForEach-Object {
            & dump_syms $_.FullName >> symbols/pcsx2-qt.bpsym
          }
          Get-ChildItem -Path ./bin -Recurse -Filter "*.pdb" | ForEach-Object {
@@ -186,7 +196,7 @@ jobs:
          }

      - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
          path: |
@@ -155,15 +155,17 @@ executable(

 This project can be built using [Bazel](https://bazel.build/install). 

-You can also use this library as a dependency to your Bazel project. Add to the `WORKSPACE` file:
+You can also use this library as a dependency to your Bazel project. Add to your `MODULE.bazel` file:

 ```python
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+# fetch cpuinfo from Bazel Central Registry: https://registry.bazel.build/modules/cpuinfo
+bazel_dep(name = "cpuinfo", version = "0.0.0-20250925-877328f")

-git_repository(
-    name = "org_pytorch_cpuinfo",
-    branch = "master",
-    remote = "https://github.com/Vertexwahn/cpuinfo.git",
+# Optional: Override it with some specific commit hash
+git_override(
+    module_name = "cpuinfo",
+    commit = "<replace_with_commit_hash>"
+    remote = "https://github.com/pytorch/cpuinfo.git",
 )
 ```

@@ -176,7 +178,7 @@ cc_binary(
        # ...
    ],
    deps = [
-        "@org_pytorch_cpuinfo//:cpuinfo",
+        "@cpuinfo",
    ],
 )
 ```
@@ -1,11 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.18 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)

 PROJECT(googletest-download NONE)

 INCLUDE(ExternalProject)
 ExternalProject_Add(googletest
-	URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
-	URL_HASH SHA256=40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff
+	URL https://github.com/google/googletest/archive/release-1.8.0.zip
+	URL_HASH SHA256=f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf
 	SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest"
 	BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest"
 	CONFIGURE_COMMAND ""
@@ -431,6 +431,8 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_zen4 = 0x0020010C,
 	/** AMD Zen 5 microarchitecture. */
 	cpuinfo_uarch_zen5 = 0x0020010D,
+	/** AMD Zen 6 microarchitecture. */
+	cpuinfo_uarch_zen6 = 0x0020010E,

 	/** NSC Geode and AMD Geode GX and LX. */
 	cpuinfo_uarch_geode = 0x00200200,
@@ -526,6 +528,15 @@ enum cpuinfo_uarch {
 	/** ARM Cortex-A725. */
 	cpuinfo_uarch_cortex_a725 = 0x00300574,

+	/** ARM Lumex-C1-Ultra. */
+	cpuinfo_uarch_lumex_c1_ultra = 0x00300600,
+	/** ARM Lumex-C1-Premium. */
+	cpuinfo_uarch_lumex_c1_premium = 0x00300601,
+	/** ARM Lumex-C1-Pro. */
+	cpuinfo_uarch_lumex_c1_pro = 0x00300602,
+	/** ARM Lumex-C1-Nano. */
+	cpuinfo_uarch_lumex_c1_nano = 0x00300603,
+
 	/** Qualcomm Scorpion. */
 	cpuinfo_uarch_scorpion = 0x00400100,
 	/** Qualcomm Krait. */
@@ -538,6 +549,8 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_saphira = 0x00400104,
 	/** Qualcomm Oryon. */
 	cpuinfo_uarch_oryon = 0x00400105,
+	/** Qualcomm Oryon V3. */
+	cpuinfo_uarch_oryon_v3 = 0x00400106,

 	/** Nvidia Denver. */
 	cpuinfo_uarch_denver = 0x00500100,
@@ -612,6 +625,16 @@ enum cpuinfo_uarch {
 	/** Apple A18 pro processor (little cores). */
 	cpuinfo_uarch_tahiti_sawtooth = 0x00700207,

+	/** Apple A19 processor (big cores). */
+	cpuinfo_uarch_tilos_everest = 0x00700208,
+	/** Apple A19 processor (little cores). */
+	cpuinfo_uarch_tilos_sawtooth = 0x00700209,
+
+	/** Apple M4 processor (big cores). */
+	cpuinfo_uarch_donan_everest = 0x00700308,
+	/** Apple M4 processor (little cores). */
+	cpuinfo_uarch_donan_sawtooth = 0x00700309,
+
 	/** Cavium ThunderX. */
 	cpuinfo_uarch_thunderx = 0x00800100,
 	/** Cavium ThunderX2 (originally Broadcom Vulkan). */
@@ -69,6 +69,7 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Processors with Cortex-A77 cores
 		 * - Processors with Cortex-A78 cores
 		 * - Processors with Cortex-A510 cores
+		 * - Processors with Cortex-A520 cores
 		 * - Processors with Cortex-A710 cores
 		 * - Processors with Cortex-A715 cores
 		 * - Processors with Cortex-X1 cores
@@ -101,6 +102,7 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D470): /* Cortex-A710 */
 				case UINT32_C(0x4100D480): /* Cortex-X2 */
 				case UINT32_C(0x4100D490): /* Neoverse N2 */
+				case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
@@ -162,6 +164,7 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D470): /* Cortex-A710 */
 				case UINT32_C(0x4100D480): /* Cortex-X2 */
 				case UINT32_C(0x4100D490): /* Neoverse N2 */
+				case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
@@ -1314,7 +1314,7 @@ static bool match_omap(const char* start, const char* end, struct cpuinfo_arm_ch
 * ro.board.platform) to match.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 * @param[out] chipset - location where chipset information will be stored upon
 * a successful match and decoding.
 *
@@ -1607,7 +1607,7 @@ static bool match_and_parse_sunxi(
 * @param end - end of the /proc/cpuinfo Hardware string to match.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 * @param[out] chipset - location where chipset information will be stored upon
 * a successful match and decoding.
 *
@@ -2456,7 +2456,7 @@ static const struct special_map_entry tegra_hardware_map_entries[] = {
 * @param[in] platform - /proc/cpuinfo Hardware string.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -2857,7 +2857,7 @@ static const struct special_map_entry special_board_map_entries[] = {
 * @param[in] platform - ro.product.board value.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -3162,7 +3162,7 @@ static const struct special_map_entry special_platform_map_entries[] = {
 * @param[in] platform - ro.board.platform value.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -3499,7 +3499,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_chipname(
 * @param[in,out] chipset - chipset name to fix.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 */
 void cpuinfo_arm_fixup_chipset(
 	struct cpuinfo_arm_chipset chipset[restrict static 1],
@@ -4038,7 +4038,7 @@ static enum cpuinfo_arm_chipset_vendor disambiguate_chipset_vendor(
 * described above.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -4291,7 +4291,7 @@ void cpuinfo_arm_fixup_raspberry_pi_chipset(
 * @param[in] hardware - /proc/cpuinfo Hardware string.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -21,9 +21,11 @@
 #ifndef CPUFAMILY_ARM_LIGHTNING_THUNDER
 #define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504D2
 #endif
+// A14 / M1
 #ifndef CPUFAMILY_ARM_FIRESTORM_ICESTORM
 #define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
 #endif
+// A15 / M2
 #ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
 #define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
 #endif
@@ -66,6 +68,18 @@
 #ifndef CPUFAMILY_ARM_BRAVA
 #define CPUFAMILY_ARM_BRAVA 0x17d5b93a
 #endif
+// M5
+#ifndef CPUFAMILY_ARM_HIDRA
+#define CPUFAMILY_ARM_HIDRA 0x1d5a87e8
+#endif
+// A19
+#ifndef CPUFAMILY_ARM_TILOS
+#define CPUFAMILY_ARM_TILOS 0x01d7a72b
+#endif
+// A19 Pro
+#ifndef CPUFAMILY_ARM_THERA
+#define CPUFAMILY_ARM_THERA 0xab345f09
+#endif

 struct cpuinfo_arm_isa cpuinfo_isa = {
 	.aes = true,
@@ -118,37 +132,59 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 			/* 2x Monsoon + 4x Mistral cores */
 			return core_index < 2 ? cpuinfo_uarch_monsoon : cpuinfo_uarch_mistral;
 		case CPUFAMILY_ARM_VORTEX_TEMPEST:
-			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x
-			 * Cortex + 4x Tempest */
+			/* Hexa-core: 2x Vortex + 4x Tempest; */
+			/* Octa-core: 4x Cortex + 4x Tempest */
 			return core_index + 4 < core_count ? cpuinfo_uarch_vortex : cpuinfo_uarch_tempest;
 		case CPUFAMILY_ARM_LIGHTNING_THUNDER:
-			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core
-			 * (presumed): 4x Lightning + 4x Thunder */
+			/* Hexa-core: 2x Lightning + 4x Thunder; */
+			/* Octa-core: 4x Lightning + 4x Thunder */
 			return core_index + 4 < core_count ? cpuinfo_uarch_lightning : cpuinfo_uarch_thunder;
 		case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
-			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x
-			 * Firestorm + 4x Icestorm */
+			/* Hexa-core: 2x Firestorm + 4x Icestorm; */
+			/* Octa-core: 4x Firestorm + 4x Icestorm */
 			return core_index + 4 < core_count ? cpuinfo_uarch_firestorm : cpuinfo_uarch_icestorm;
 		case CPUFAMILY_ARM_AVALANCHE_BLIZZARD:
 			/* Hexa-core: 2x Avalanche + 4x Blizzard */
 			return core_index + 4 < core_count ? cpuinfo_uarch_avalanche : cpuinfo_uarch_blizzard;
 		case CPUFAMILY_ARM_EVEREST_SAWTOOTH:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
+			/* Hexa-core: 2x Everest + 4x Sawtooth */
 			return core_index + 4 < core_count ? cpuinfo_uarch_everest : cpuinfo_uarch_sawtooth;
-			return core_index + 4 < core_count ? cpuinfo_uarch_avalanche : cpuinfo_uarch_blizzard;
+
+		case CPUFAMILY_ARM_IBIZA: /* M3 */
+			/* 8-core: 4x Coll Everest v2 + 4x Coll Sawtooth v2*/
+		case CPUFAMILY_ARM_PALMA: /* M3 Max */
+			/* 14-core: 10x Coll Everest v2 + 4x Coll Sawtooth v2*/
 		case CPUFAMILY_ARM_COLL:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
+			/* Hexa-core: 2x Coll Everest v2 + 4x Coll Sawtooth v2 */
 			return core_index + 4 < core_count ? cpuinfo_uarch_coll_everest : cpuinfo_uarch_coll_sawtooth;
+		case CPUFAMILY_ARM_LOBOS: /* M3 Pro */
+			/* 12-core: 6x Coll Everest v2 + 6x Coll Sawtooth v2v2 */
+			return core_index + 6 < core_count ? cpuinfo_uarch_coll_everest : cpuinfo_uarch_coll_sawtooth;

 		case CPUFAMILY_ARM_TUPAI:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
+			/* Hexa-core: 2x Tupai Everest v3 + 4x Tupai Sawtooth v3 */
 			return core_index + 4 < core_count ? cpuinfo_uarch_tupai_everest : cpuinfo_uarch_tupai_sawtooth;

 		case CPUFAMILY_ARM_TAHITI:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
+			/* Hexa-core: 2x Tahiti Everest + 4x Tahiti Sawtooth */
 			return core_index + 4 < core_count ? cpuinfo_uarch_tahiti_everest
 							   : cpuinfo_uarch_tahiti_sawtooth;

+		case CPUFAMILY_ARM_DONAN: /* M4 */
+			/* 10-core: 4x Donan Everest v3 + 6x Donan Sawtooth v3 */
+			return core_index + 6 < core_count ? cpuinfo_uarch_donan_everest : cpuinfo_uarch_donan_sawtooth;
+		case CPUFAMILY_ARM_BRAVA: /* M4 Pro */
+			/* 14-core: 10x Donan Everest v3 + 4x Donan Sawtooth v3 */
+			return core_index + 4 < core_count ? cpuinfo_uarch_donan_everest : cpuinfo_uarch_donan_sawtooth;
+
+		case CPUFAMILY_ARM_TILOS: /* A19 */
+		case CPUFAMILY_ARM_THERA: /* A19 Pro */
+			/* Hexa-core: 2x Tilos Everest v4 + 4x Tilos Sawtooth v4 */
+			return core_index + 4 < core_count ? cpuinfo_uarch_tilos_everest : cpuinfo_uarch_tilos_sawtooth;
+		case CPUFAMILY_ARM_HIDRA: /* M5 */
+			/* 10-core: 4x Tilos Everest v4 + 6x Tilos Sawtooth v4 */
+			return core_index + 6 < core_count ? cpuinfo_uarch_tilos_everest : cpuinfo_uarch_tilos_sawtooth;
+
 		default:
 			/* Use hw.cpusubtype for detection */
 			break;
@@ -361,10 +397,8 @@ void cpuinfo_arm_mach_init(void) {
 	 * possible. Otherwise, fallback to hardcoded set of CPUs with known
 	 * support.
 	 */
-	const uint32_t has_feat_lse = get_sys_info_by_name("hw.optional.arm.FEAT_LSE");
-	if (has_feat_lse != 0) {
-		cpuinfo_isa.atomics = true;
-	} else {
+	cpuinfo_isa.atomics = get_sys_info_by_name("hw.optional.arm.FEAT_LSE") != 0;
+	if (!cpuinfo_isa.atomics) {
 		// Mandatory in ARMv8.1-A, list only cores released before iOS
 		// 15 / macOS 12
 		switch (cpu_family) {
@@ -376,10 +410,8 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_rdm = get_sys_info_by_name("hw.optional.arm.FEAT_RDM");
-	if (has_feat_rdm != 0) {
-		cpuinfo_isa.rdm = true;
-	} else {
+	cpuinfo_isa.rdm = get_sys_info_by_name("hw.optional.arm.FEAT_RDM") != 0;
+	if (!cpuinfo_isa.rdm) {
 		// Optional in ARMv8.2-A (implemented in Apple cores),
 		// list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
@@ -391,10 +423,8 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_fp16 = get_sys_info_by_name("hw.optional.arm.FEAT_FP16");
-	if (has_feat_fp16 != 0) {
-		cpuinfo_isa.fp16arith = true;
-	} else {
+	cpuinfo_isa.fp16arith = get_sys_info_by_name("hw.optional.arm.FEAT_FP16") != 0;
+	if (!cpuinfo_isa.fp16arith) {
 		// Optional in ARMv8.2-A (implemented in Apple cores),
 		// list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
@@ -406,15 +436,11 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_fhm = get_sys_info_by_name("hw.optional.arm.FEAT_FHM");
-	if (has_feat_fhm != 0) {
-		cpuinfo_isa.fhm = true;
-	} else {
+	cpuinfo_isa.fhm = get_sys_info_by_name("hw.optional.arm.FEAT_FHM") != 0;
+	if (!cpuinfo_isa.fhm) {
 		// Prior to iOS 15, use 'hw.optional.armv8_2_fhm'
-		const uint32_t has_feat_fhm_legacy = get_sys_info_by_name("hw.optional.armv8_2_fhm");
-		if (has_feat_fhm_legacy != 0) {
-			cpuinfo_isa.fhm = true;
-		} else {
+		cpuinfo_isa.fhm = get_sys_info_by_name("hw.optional.armv8_2_fhm") != 0;
+		if (!cpuinfo_isa.fhm) {
 			// Mandatory in ARMv8.4-A when FP16 arithmetics is
 			// implemented, list only cores released before iOS 15 /
 			// macOS 12
@@ -426,17 +452,10 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_bf16 = get_sys_info_by_name("hw.optional.arm.FEAT_BF16");
-	if (has_feat_bf16 != 0) {
-		cpuinfo_isa.bf16 = true;
-	}
-
-	const uint32_t has_feat_fcma = get_sys_info_by_name("hw.optional.arm.FEAT_FCMA");
-	if (has_feat_fcma != 0) {
-		cpuinfo_isa.fcma = true;
-	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS
-		// 15 / macOS 12
+	cpuinfo_isa.bf16 = get_sys_info_by_name("hw.optional.arm.FEAT_BF16") != 0;
+	cpuinfo_isa.fcma = get_sys_info_by_name("hw.optional.arm.FEAT_FCMA") != 0;
+	if (!cpuinfo_isa.fcma) {
+		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -444,12 +463,9 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_jscvt = get_sys_info_by_name("hw.optional.arm.FEAT_JSCVT");
-	if (has_feat_jscvt != 0) {
-		cpuinfo_isa.jscvt = true;
-	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS
-		// 15 / macOS 12
+	cpuinfo_isa.jscvt = get_sys_info_by_name("hw.optional.arm.FEAT_JSCVT") != 0;
+	if (!cpuinfo_isa.jscvt) {
+		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -457,12 +473,9 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_dotprod = get_sys_info_by_name("hw.optional.arm.FEAT_DotProd");
-	if (has_feat_dotprod != 0) {
-		cpuinfo_isa.dot = true;
-	} else {
-		// Mandatory in ARMv8.4-A, list only cores released before iOS
-		// 15 / macOS 12
+	cpuinfo_isa.dot = get_sys_info_by_name("hw.optional.arm.FEAT_DotProd") != 0;
+	if (!cpuinfo_isa.dot) {
+		// Mandatory in ARMv8.4-A, list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -470,20 +483,16 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	const uint32_t has_feat_i8mm = get_sys_info_by_name("hw.optional.arm.FEAT_I8MM");
-	if (has_feat_i8mm != 0) {
-		cpuinfo_isa.i8mm = true;
-	}
+	cpuinfo_isa.i8mm = get_sys_info_by_name("hw.optional.arm.FEAT_I8MM") != 0;
+	cpuinfo_isa.sme = get_sys_info_by_name("hw.optional.arm.FEAT_SME") != 0;
+	cpuinfo_isa.sme2 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2") != 0;
+	cpuinfo_isa.sme2p1 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2p1") != 0;
+	cpuinfo_isa.sme_i16i32 = get_sys_info_by_name("hw.optional.arm.SME_I16I32") != 0;
+	cpuinfo_isa.sme_bi32i32 = get_sys_info_by_name("hw.optional.arm.SME_BI32I32") != 0;
+	cpuinfo_isa.sme_b16b16 = get_sys_info_by_name("hw.optional.arm.FEAT_SME_B16B16") != 0;
+	cpuinfo_isa.sme_f16f16 = get_sys_info_by_name("hw.optional.arm.FEAT_SME_F16F16") != 0;

-	const uint32_t has_feat_sme = get_sys_info_by_name("hw.optional.arm.FEAT_SME");
-	if (has_feat_sme != 0) {
-		cpuinfo_isa.sme = true;
-	}
-
-	const uint32_t has_feat_sme2 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2");
-	if (has_feat_sme2 != 0) {
-		cpuinfo_isa.sme2 = true;
-	}
+	cpuinfo_isa.smelen = get_sys_info_by_name("hw.optional.arm.sme_max_svl_b");

 	uint32_t num_clusters = 1;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
@@ -192,6 +192,7 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D0D0): /* Cortex-A77 */
 		case UINT32_C(0x4100D0E0): /* Cortex-A76AE */
 		case UINT32_C(0x4100D410): /* Cortex-A78 */
+		case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 		case UINT32_C(0x4100D470): /* Cortex-A710 */
 		case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 		case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
@@ -220,6 +221,9 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D030): /* Cortex-A53 */
 		case UINT32_C(0x4100D050): /* Cortex-A55 */
 		case UINT32_C(0x4100D460): /* Cortex-A510 */
+#if CPUINFO_ARCH_ARM64
+		case UINT32_C(0x4100D800): /* Cortex-A520 */
+#endif /* CPUINFO_ARCH_ARM64 */
 			/* Cortex-A53 is usually in LITTLE role, but can be in
 			 * big role w.r.t. Cortex-A35 */
 			return 2;
@@ -94,6 +94,7 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_neoverse_v1;
 					break;
 				case 0xD41: /* Cortex-A78 */
+				case 0xD4B: /* Cortex-A78C */
 					*uarch = cpuinfo_uarch_cortex_a78;
 					break;
 				case 0xD44: /* Cortex-X1 */
@@ -125,6 +126,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0xD4F: /* Neoverse V2 */
 					*uarch = cpuinfo_uarch_neoverse_v2;
 					break;
+				case 0xD80: /* Cortex-A520 */
+					*uarch = cpuinfo_uarch_cortex_a520;
+					break;
 				case 0xD81: /* Cortex-A720 */
 					*uarch = cpuinfo_uarch_cortex_a720;
 					break;
@@ -137,6 +141,18 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0xD87: /* Cortex-A725 */
 					*uarch = cpuinfo_uarch_cortex_a725;
 					break;
+				case 0xD8C:
+					*uarch = cpuinfo_uarch_lumex_c1_ultra;
+					break;
+				case 0xD90:
+					*uarch = cpuinfo_uarch_lumex_c1_premium;
+					break;
+				case 0xD8B:
+					*uarch = cpuinfo_uarch_lumex_c1_pro;
+					break;
+				case 0xD8A:
+					*uarch = cpuinfo_uarch_lumex_c1_nano;
+					break;
 				default:
 					switch (midr_get_part(midr) >> 8) {
 #if CPUINFO_ARCH_ARM
@@ -347,6 +363,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0x001:
 					*uarch = cpuinfo_uarch_oryon;
 					break;
+				case 0x002:
+					*uarch = cpuinfo_uarch_oryon_v3;
+					break;
 				case 0xC00:
 					*uarch = cpuinfo_uarch_falkor;
 					break;
@@ -249,6 +249,14 @@ static void set_cpuinfo_isa_fields(void) {
 	// guarantee that, but it holds in practice.
 	cpuinfo_isa.rdm = dotprod;

+	// PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE may not be available in older
+	// Windows versions. If fp16arith was not detected with
+	// IsProcessorFeaturePresent(PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE), fall
+	// back to using the value of dotprod.
+	if (!cpuinfo_isa.fp16arith) {
+		cpuinfo_isa.fp16arith = dotprod;
+	}
+
 	/* Windows API reports all or nothing for cryptographic instructions. */
 	const bool crypto = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) != 0;
 	cpuinfo_isa.aes = crypto;
@@ -231,7 +231,7 @@ uint32_t cpuinfo_linux_get_processor_min_frequency(uint32_t processor) {
 }

 bool cpuinfo_linux_get_processor_core_id(uint32_t processor, uint32_t core_id_ptr[restrict static 1]) {
-	char core_id_filename[PACKAGE_ID_FILENAME_SIZE];
+	char core_id_filename[CORE_ID_FILENAME_SIZE];
 	const int chars_formatted =
 		snprintf(core_id_filename, CORE_ID_FILENAME_SIZE, CORE_ID_FILENAME_FORMAT, processor);
 	if ((unsigned int)chars_formatted >= CORE_ID_FILENAME_SIZE) {
@@ -612,6 +612,8 @@ uint32_t cpuinfo_x86_normalize_brand_string(const char raw_name[48], char normal
 					break;
 				case '@':
 					parser_state.frequency_separator = char_ptr;
+					*char_ptr = ' ';
+					break;
 				case '\0':
 				case '\t':
 					*char_ptr = ' ';
@@ -402,7 +402,21 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 					}
 					break;
 				case 0x1a:
-					return cpuinfo_uarch_zen5;
+					switch (model_info->extended_model) {
+						case 0x0: // model 00h..2Fh
+						case 0x1:
+						case 0x2:
+						case 0x4: // model 40h..4Fh
+							return cpuinfo_uarch_zen5;
+
+						case 0x5: // model 50h..5Fh
+						case 0x8: // model 80h..AFh
+						case 0x9:
+						case 0xA:
+						case 0xC: // model C0h..CFh
+							return cpuinfo_uarch_zen6;
+					}
+					break;
 			}
 			break;
 		case cpuinfo_vendor_hygon:
@@ -1,3 +1,14 @@
+# 3.1.0 (2026-02-23)
+
+- Added supported for resource tight alignment (feature added in Agility SDK 1.618.1). It is used automatically when available.
+  - Added function `Allocator::IsTightAlignmentSupported`.
+  - Added `ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT`.
+- Fixes and improvements in the internal function `AllocatorPimpl::GetResourceAllocationInfo` (which decides when to use small alignment or tight alignment), including:
+  - Added support for 1D and 3D textures when `D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 2` (#78, #79).
+  - Fix for cases when `D3D12_TEXTURE_LAYOUT_64KB_*_SWIZZLE` is used (#86).
+- Fixes for build errors in MinGW (#77).
+- Fixes and improvements in documentation and tests.
+
 # 3.0.1 (2025-05-08)

 - Fixed macros `D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS`, `D3D12MA_RECOMMENDED_POOL_FLAGS` (#73).
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -8,7 +8,7 @@ Easy to integrate memory allocation library for Direct3D 12.

 **Changelog:** See [CHANGELOG.md](CHANGELOG.md)

-**Product page:** [D3D12 Memory Allocator on GPUOpen](https://gpuopen.com/gaming-product/d3d12-memory-allocator/)
+**Product page:** [D3D12 Memory Allocator on GPUOpen](https://gpuopen.com/d3d12-memory-allocator/)

 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.svg)](http://isitmaintained.com/project/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator "Average time to resolve an issue")

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,9 +24,9 @@

 /** \mainpage D3D12 Memory Allocator

-<b>Version 3.0.1</b> (2025-05-08)
+<b>Version 3.1.0</b> (2026-02-23)

-Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved. \n
+Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved. \n
 License: MIT

 Documentation of all members: D3D12MemAlloc.h
@@ -64,7 +64,7 @@ Documentation of all members: D3D12MemAlloc.h
        
 \section main_see_also Web links

- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/gaming-product/d3d12-memory-allocator/) - product page
+- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/d3d12-memory-allocator/) - product page
 - [GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator at GitHub.com](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator) - source code repository
 */

@@ -1112,8 +1112,19 @@ enum ALLOCATOR_FLAGS
    which may take longer than creating placed resources in existing heaps.
    Passing this flag will disable this committed preference globally for the allocator.
    It can also be disabled for a single allocation by using #ALLOCATION_FLAG_STRATEGY_MIN_TIME.
+
+    If the tight resource alignment feature is used by the library (which happens automatically whenever supported,
+    unless you use flag #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT), then small buffers are not preferred as committed.
+    Long story short, you don't need to specify any of these flags.
+    The library chooses the most optimal method automatically.
    */
    ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED = 0x10,
+    /** Disables the use of the tight alignment feature even when it is supported on the current system.
+    By default, the feature is used whenever available.
+
+    Support can be checked by D3D12MA::Allocator::IsTightAlignmentSupported() regardless of using this flag.
+    */
+    ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT = 0x20,
 };

 /// \brief Parameters of created Allocator object. To be used with CreateAllocator().
@@ -1189,6 +1200,12 @@ public:
    This flag is fetched from `D3D12_FEATURE_D3D12_OPTIONS16::GPUUploadHeapSupported`.
    */
    BOOL IsGPUUploadHeapSupported() const;
+    /** \brief Returns true if resource tight alignment is supported on the current system.
+    When supported, it is automatically used by the library, unless
+    #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT flag was specified on allocator creation.
+    This flag is fetched from `D3D12_FEATURE_DATA_TIGHT_ALIGNMENT::SupportTier`.
+    */
+    BOOL IsTightAlignmentSupported() const;
    /** \brief Returns total amount of memory of specific segment group, in bytes.
    
    \param memorySegmentGroup use `DXGI_MEMORY_SEGMENT_GROUP_LOCAL` or `DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL`.
@@ -1800,7 +1817,7 @@ DEFINE_ENUM_FLAG_OPERATORS(D3D12MA::VIRTUAL_ALLOCATION_FLAGS);
 /// \endcond

 /**
-\page faq Frequenty asked questions
+\page faq Frequently asked questions

 <b>What is %D3D12MA?</b>

@@ -2864,6 +2881,23 @@ and D3D12MA::POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED on the creation of any cus
 With those flags, the alignment of the heaps created by %D3D12MA can be lower, but any MSAA textures are created as committed.
 You should always use these flags in your code unless you really need to create some MSAA textures as placed.

+With DirectX 12 Agility SDK 1.618.1, Microsoft added a new feature called **"tight alignment"**.
+Note this is a separate feature than the "small alignment" described earlier.
+When using this new SDK and a compatible graphics driver, the API exposes support for this new feature.
+Then, a new flag `D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT` can be added when creating a resource.
+D3D12 can then return the alignment required for the resource smaller than the default ones described above.
+This library automatically makes use of the tight alignment feature when available and adds that new resource flag.
+When the tight alignment is enabled, the heuristics that creates small buffers as committed described above is deactivated,
+as it is no longer needed.
+
+You can check if the tight alignment it is available in the current system by calling D3D12MA::Allocator::IsTightAlignmentSupported().
+You can tell the library to not use it by specifying D3D12MA::ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT.
+Typically, you don't need to do any of those.
+
+The library automatically aligns all buffers to at least 256 B, even when the system supports smaller alignment.
+This is the alignment required for constant buffers, expressed by `D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT` constant.
+You can override this logic for \subpage custom_pools with a specific D3D12MA::POOL_DESC::MinAllocationAlignment.
+
 \page defragmentation Defragmentation

 Interleaved allocations and deallocations of many objects of varying size can
@@ -3558,7 +3592,7 @@ Features deliberately excluded from the scope of this library:
 - **Descriptor allocation.** Although also called "heaps", objects that represent
  descriptors are separate part of the D3D12 API from buffers and textures.
  You can still use \ref virtual_allocator to manage descriptors and their ranges inside a descriptor heap.
- **Support for reserved (tiled) resources.** We don't recommend using them.
+- **Support for reserved (tiled) resources.** We don't recommend using them. For more information, see [1].
 - Support for `ID3D12Device::Evict` and `MakeResident`. We don't recommend using them.
  You can call them on the D3D12 objects manually.
  Plese keep in mind, however, that eviction happens on the level of entire `ID3D12Heap` memory blocks
@@ -3575,4 +3609,6 @@ Features deliberately excluded from the scope of this library:
  It is recommended to disable such warnings instead.
 - This is a C++ library. **Bindings or ports to any other programming languages** are welcome as external projects but
  are not going to be included into this repository.
+
+[1] Antoine Richermoz, Fabrice Neyret. The Sad State of Hardware Virtual Textures. UGA - Universite Grenoble Alpes; INRIA Grenoble - Rhone-Alpes. 2025, pp.13. hal-05138369
 */
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -33,11 +33,24 @@
    #include <shared_mutex>
 #endif

-// Includes needed for MinGW - see #71.
-#ifndef _MSC_VER
-    #include <guiddef.h>
-    // guiddef.h must be included first.
-    #include <dxguids.h>
+// On older mingw versions, using the Agility SDK will cause linker errors unless dxguids.h is included.
+// But on newer mingw versions, the includes aren't necessary thus no need to grab DirectX-Headers.
+// Release cycles are slow for LTS distros on Linux, so this codeblock will need to stay for a few years.
+#if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR) && \
+	defined(__MINGW64_VERSION_BUGFIX) && defined(__ID3D12Device8_INTERFACE_DEFINED__)
+    #define D3D12MA_MAKE_MINGW_VERSION(x, y, z) ((x << 20u) | (y << 10u) | (z))
+    #if D3D12MA_MAKE_MINGW_VERSION(__MINGW64_VERSION_MAJOR, __MINGW64_VERSION_MINOR, \
+								  __MINGW64_VERSION_BUGFIX) <= D3D12MA_MAKE_MINGW_VERSION(11, 0, 1)
+        #if defined(__has_include)
+            #if !__has_include(<dxguids.h>)
+                #error "mingw or gcc detected. dxguids.h is needed. You can grab it from https://github.com/microsoft/DirectX-Headers or if you're on Ubuntu just run sudo apt install directx-headers-dev"
+            #endif
+        #endif
+        #include <guiddef.h>
+        // // guiddef.h must be included first.
+        #include <dxguids.h>
+    #endif
+    #undef D3D12MA_MAKE_MINGW_VERSION
 #endif

 ////////////////////////////////////////////////////////////////////////////////
@@ -93,6 +106,14 @@
    #endif
 #endif

+#ifndef D3D12MA_DEFAULT_ALIGNMENT
+    /*
+    Default alignment of allocations in default pools and custom pools with MinAllocationAlignment == 0.
+    Can be lowered for custom pools by specifying custom MinAllocationAlignment > 0.
+    */
+    #define D3D12MA_DEFAULT_ALIGNMENT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT
+#endif
+
 #ifndef D3D12MA_DEBUG_ALIGNMENT
    /*
    Minimum alignment of all allocations, in bytes.
@@ -126,6 +147,14 @@ especially to test compatibility with D3D12_RESOURCE_HEAP_TIER_1 on modern GPUs.
   #define D3D12MA_DEFAULT_BLOCK_SIZE (64ull * 1024 * 1024)
 #endif

+#ifndef D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
+    #if D3D12_SDK_VERSION >= 618
+        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 1
+    #else
+        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 0
+    #endif
+#endif
+
 #ifndef D3D12MA_OPTIONS16_SUPPORTED
    #if D3D12_SDK_VERSION >= 610
        #define D3D12MA_OPTIONS16_SUPPORTED 1
@@ -186,6 +215,7 @@ static const D3D12_HEAP_FLAGS RESOURCE_CLASS_HEAP_FLAGS =
 static const D3D12_RESIDENCY_PRIORITY D3D12_RESIDENCY_PRIORITY_NONE = D3D12_RESIDENCY_PRIORITY(0);

 static const D3D12_HEAP_TYPE D3D12_HEAP_TYPE_GPU_UPLOAD_COPY = (D3D12_HEAP_TYPE)5;
+static const D3D12_RESOURCE_FLAGS D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY = (D3D12_RESOURCE_FLAGS)0x400;

 #ifndef _D3D12MA_ENUM_DECLARATIONS

@@ -787,11 +817,9 @@ static bool ValidateAllocateMemoryParameters(
    return pAllocDesc &&
        pAllocInfo &&
        ppAllocation &&
-        (pAllocInfo->Alignment == 0 ||
-            pAllocInfo->Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT ||
-            pAllocInfo->Alignment == D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) &&
-        pAllocInfo->SizeInBytes != 0 &&
-        pAllocInfo->SizeInBytes % (64ull * 1024) == 0;
+        IsPow2(pAllocInfo->Alignment) &&
+        pAllocInfo->SizeInBytes > 0 &&
+        pAllocInfo->SizeInBytes % 4 == 0;
 }

 #endif // _D3D12MA_FUNCTIONS
@@ -5960,6 +5988,8 @@ public:
    BOOL IsCacheCoherentUMA() const { return m_D3D12Architecture.CacheCoherentUMA; }
    bool SupportsResourceHeapTier2() const { return m_D3D12Options.ResourceHeapTier >= D3D12_RESOURCE_HEAP_TIER_2; }
    bool IsGPUUploadHeapSupported() const { return m_GPUUploadHeapSupported != FALSE; }
+    bool IsTightAlignmentSupported() const { return m_TightAlignmentSupported != FALSE; }
+    bool IsTightAlignmentEnabled() const { return IsTightAlignmentSupported() && m_UseTightAlignment; }
    bool UseMutex() const { return m_UseMutex; }
    AllocationObjectAllocator& GetAllocationObjectAllocator() { return m_AllocationObjectAllocator; }
    UINT GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
@@ -6046,7 +6076,8 @@ private:
    const bool m_UseMutex;
    const bool m_AlwaysCommitted;
    const bool m_MsaaAlwaysCommitted;
-    const bool m_PreferSmallBuffersCommitted;
+    bool m_PreferSmallBuffersCommitted;
+    const bool m_UseTightAlignment;
    bool m_DefaultPoolsNotZeroed = false;
    ID3D12Device* m_Device; // AddRef
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
@@ -6074,6 +6105,7 @@ private:
    DXGI_ADAPTER_DESC m_AdapterDesc;
    D3D12_FEATURE_DATA_D3D12_OPTIONS m_D3D12Options;
    BOOL m_GPUUploadHeapSupported = FALSE;
+    BOOL m_TightAlignmentSupported = FALSE;
    D3D12_FEATURE_DATA_ARCHITECTURE m_D3D12Architecture;
    AllocationObjectAllocator m_AllocationObjectAllocator;

@@ -6155,7 +6187,8 @@ AllocatorPimpl::AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks,
    : m_UseMutex((desc.Flags & ALLOCATOR_FLAG_SINGLETHREADED) == 0),
    m_AlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_ALWAYS_COMMITTED) != 0),
    m_MsaaAlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0),
-    m_PreferSmallBuffersCommitted((desc.Flags & ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
+    m_PreferSmallBuffersCommitted((desc.Flags& ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
+    m_UseTightAlignment((desc.Flags & ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT) == 0),
    m_Device(desc.pDevice),
    m_Adapter(desc.pAdapter),
    m_PreferredBlockSize(desc.PreferredBlockSize != 0 ? desc.PreferredBlockSize : D3D12MA_DEFAULT_BLOCK_SIZE),
@@ -6244,6 +6277,25 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
    }
 #endif // #if D3D12MA_OPTIONS16_SUPPORTED

+#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
+    {
+        D3D12_FEATURE_DATA_TIGHT_ALIGNMENT tightAlignment = {};
+        hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_TIGHT_ALIGNMENT, &tightAlignment, sizeof(tightAlignment));
+        if (SUCCEEDED(hr))
+        {
+            m_TightAlignmentSupported = tightAlignment.SupportTier >= D3D12_TIGHT_ALIGNMENT_TIER_1;
+            
+            // If tight alignment is supported (checked by the code above) and wasn't disabled by the developer
+            // (with ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT), disable the preference for creating small buffers as committed,
+            // as if ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED was specified.
+            if (IsTightAlignmentEnabled())
+            {
+                m_PreferSmallBuffersCommitted = false;
+            }
+        }
+    }
+#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
+
    hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &m_D3D12Architecture, sizeof(m_D3D12Architecture));
    if (FAILED(hr))
    {
@@ -6273,7 +6325,7 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
            0, // minBlockCount
            SIZE_MAX, // maxBlockCount
            false, // explicitBlockSize
-            D3D12MA_DEBUG_ALIGNMENT, // minAllocationAlignment
+            (UINT64)D3D12MA_DEFAULT_ALIGNMENT, // minAllocationAlignment
            0, // Default algorithm,
            m_MsaaAlwaysCommitted,
            NULL, // pProtectedSession
@@ -6940,6 +6992,9 @@ void AllocatorPimpl::BuildStatsString(WCHAR** ppStatsString, BOOL detailedMap)

                json.WriteString(L"GPUUploadHeapSupported");
                json.WriteBool(m_GPUUploadHeapSupported != FALSE);
+
+                json.WriteString(L"TightAlignmentSupported");
+                json.WriteBool(m_TightAlignmentSupported != FALSE);
            }
            json.EndObject();
        }
@@ -7758,8 +7813,24 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
 {
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
-    /* Optional optimization: Microsoft documentation says:
-    https://docs.microsoft.com/en-us/windows/win32/api/d3d12/nf-d3d12-id3d12device-getresourceallocationinfo
+
+#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
+    if (IsTightAlignmentEnabled())
+    {
+        // Don't allow USE_TIGHT_ALIGNMENT together with ALLOW_CROSS_ADAPTER as there is a D3D Debug Layer error:
+        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT will be ignored since D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER is set. [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
+        // Also don't allow it together with D3D12_TEXTURE_LAYOUT_64KB_*_SWIZZLE, as there is this error (see issue #86):
+        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT is not valid when the layout is either D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE or D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE (...). [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
+        if((inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER) == 0
+            && (inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE && inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE))
+        {
+            inOutResourceDesc.Flags |= D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT;
+        }
+    }
+#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
+
+    /* Optional optimization: Microsoft documentation of the ID3D12Device::
+    GetResourceAllocationInfo function says:

    Your application can forgo using GetResourceAllocationInfo for buffer resources
    (D3D12_RESOURCE_DIMENSION_BUFFER). Buffers have the same size on all adapters,
@@ -7767,20 +7838,25 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    D3D12_RESOURCE_DESC::Width.
    */
    if (inOutResourceDesc.Alignment == 0 &&
-        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
+        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
+        !IsTightAlignmentEnabled())
    {
        outAllocInfo = {
            AlignUp<UINT64>(inOutResourceDesc.Width, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT), // SizeInBytes
            D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT }; // Alignment
        return S_OK;
    }
+
 #endif // #ifdef __ID3D12Device1_INTERFACE_DEFINED__

    HRESULT hr = S_OK;

 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT
    if (inOutResourceDesc.Alignment == 0 &&
-        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
+        (inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY) == 0 &&
+        (inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE1D ||
+            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D ||
+            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) &&
        (inOutResourceDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) == 0
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT == 1
        && CanUseSmallAlignment(inOutResourceDesc)
@@ -8088,7 +8164,7 @@ BlockVector::BlockVector(
    m_MinBlockCount(minBlockCount),
    m_MaxBlockCount(maxBlockCount),
    m_ExplicitBlockSize(explicitBlockSize),
-    m_MinAllocationAlignment(minAllocationAlignment),
+    m_MinAllocationAlignment(D3D12MA_MAX(minAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT)),
    m_Algorithm(algorithm),
    m_DenyMsaaTextures(denyMsaaTextures),
    m_ProtectedSession(pProtectedSession),
@@ -9241,12 +9317,14 @@ PoolPimpl::PoolPimpl(AllocatorPimpl* allocator, const POOL_DESC& desc)
    D3D12MA_ASSERT(m_Desc.pProtectedSession == NULL);
 #endif

+    const UINT64 minAlignment = desc.MinAllocationAlignment > 0 ? desc.MinAllocationAlignment : D3D12MA_DEFAULT_ALIGNMENT;
+
    m_BlockVector = D3D12MA_NEW(allocator->GetAllocs(), BlockVector)(
        allocator, desc.HeapProperties, desc.HeapFlags,
        preferredBlockSize,
        desc.MinBlockCount, maxBlockCount,
        explicitBlockSize,
-        D3D12MA_MAX(desc.MinAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT),
+        minAlignment,
        (desc.Flags & POOL_FLAG_ALGORITHM_MASK) != 0,
        (desc.Flags & POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0,
        desc.pProtectedSession,
@@ -9709,6 +9787,11 @@ BOOL Allocator::IsGPUUploadHeapSupported() const
    return m_Pimpl->IsGPUUploadHeapSupported();
 }

+BOOL Allocator::IsTightAlignmentSupported() const
+{
+    return m_Pimpl->IsTightAlignmentSupported();
+}
+
 UINT64 Allocator::GetMemoryCapacity(UINT memorySegmentGroup) const
 {
    return m_Pimpl->GetMemoryCapacity(memorySegmentGroup);
@@ -9800,7 +9883,7 @@ HRESULT Allocator::AllocateMemory(
        return E_INVALIDARG;
    }
    D3D12MA_DEBUG_GLOBAL_MUTEX_LOCK
-        return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
+    return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
 }

 HRESULT Allocator::CreateAliasingResource(
@@ -4,8 +4,6 @@ add_library(demanglegnu STATIC
 	src/cplus-dem.c
 	src/d-demangle.c
 	src/dyn-string.c
-	src/getopt1.c
-	src/getopt.c
 	src/rust-demangle.c
 	src/safe-ctype.c
 	src/xexit.c
@@ -19,9 +17,11 @@ set(GNU_DEMANGLER_FLAGS -DHAVE_DECL_BASENAME=1 -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H
 target_include_directories(demanglegnu PUBLIC include)
 target_compile_definitions(demanglegnu PUBLIC ${GNU_DEMANGLER_FLAGS})

-add_executable(demangler_fuzzer testsuite/demangler-fuzzer.c)
+if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
+	add_executable(demangler_fuzzer testsuite/demangler-fuzzer.c)
+	target_link_libraries(demangler_fuzzer demanglegnu)
+	target_compile_definitions(demangler_fuzzer PUBLIC ${GNU_DEMANGLER_FLAGS})
+endif()
 add_executable(demangler_test testsuite/test-demangle.c)
-target_link_libraries(demangler_fuzzer demanglegnu)
 target_link_libraries(demangler_test demanglegnu)
-target_compile_definitions(demangler_fuzzer PUBLIC ${GNU_DEMANGLER_FLAGS})
 target_compile_definitions(demangler_test PUBLIC ${GNU_DEMANGLER_FLAGS})
@@ -17,7 +17,6 @@ cp "$GCC_DIR/include/ansidecl.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/demangle.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/dyn-string.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/environ.h" "$OUT_DIR/include/"
-cp "$GCC_DIR/include/getopt.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/libiberty.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/safe-ctype.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/libiberty/alloca.c" "$OUT_DIR/src/"
@@ -27,8 +26,6 @@ cp "$GCC_DIR/libiberty/cp-demangle.h" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/cplus-dem.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/d-demangle.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/dyn-string.c" "$OUT_DIR/src/"
-cp "$GCC_DIR/libiberty/getopt.c" "$OUT_DIR/src/"
-cp "$GCC_DIR/libiberty/getopt1.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/rust-demangle.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/safe-ctype.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/xexit.c" "$OUT_DIR/src/"
@@ -35,7 +35,6 @@
    <ClInclude Include="include\demangle.h" />
    <ClInclude Include="include\dyn-string.h" />
    <ClInclude Include="include\environ.h" />
-    <ClInclude Include="include\getopt.h" />
    <ClInclude Include="include\libiberty.h" />
    <ClInclude Include="include\safe-ctype.h" />
  </ItemGroup>
@@ -46,8 +45,6 @@
    <ClCompile Include="src\cplus-dem.c" />
    <ClCompile Include="src\d-demangle.c" />
    <ClCompile Include="src\dyn-string.c" />
-    <ClCompile Include="src\getopt.c" />
-    <ClCompile Include="src\getopt1.c" />
    <ClCompile Include="src\rust-demangle.c" />
    <ClCompile Include="src\safe-ctype.c" />
    <ClCompile Include="src\xexit.c" />
@@ -30,9 +30,6 @@
    <ClInclude Include="include\environ.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="include\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="include\libiberty.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -59,12 +56,6 @@
    <ClCompile Include="src\dyn-string.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="src\getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\getopt1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="src\rust-demangle.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -1,143 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989-2023 Free Software Foundation, Inc.
-
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@gnu.org.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-#if defined (__STDC__) && __STDC__
-  const char *name;
-#else
-  char *name;
-#endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if defined (__STDC__) && __STDC__
-/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
-   undefined, we haven't run the autoconf check so provide the
-   declaration without arguments.  If it is 0, we checked and failed
-   to find the declaration so provide a fully prototyped one.  If it
-   is 1, we found it so don't provide any declaration at all.  */
-#if !HAVE_DECL_GETOPT
-#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in unistd.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else
-#ifndef __cplusplus
-extern int getopt ();
-#endif /* __cplusplus */
-#endif
-#endif /* !HAVE_DECL_GETOPT */
-
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* getopt.h */
@@ -1,179 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2023 Free Software Foundation, Inc.
-
-   NOTE: This source is derived from an old version taken from the GNU C
-   Library (glibc).
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-#include "getopt.h"
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef	NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (int argc,  char *const *argv,  const char *options,
-             const struct option *long_options, int *opt_index)
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
-   If an option that starts with '-' (not '--') doesn't match a long option,
-   but does match a short option, it is parsed as a short option
-   instead.  */
-
-int
-getopt_long_only (int argc, char *const *argv, const char *options,
-                  const struct option *long_options, int *opt_index)
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif	/* Not ELIDE_CODE.  */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-      int option_index = 0;
-      static struct option long_options[] =
-      {
-	{"add", 1, 0, 0},
-	{"append", 0, 0, 0},
-	{"delete", 1, 0, 0},
-	{"verbose", 0, 0, 0},
-	{"create", 0, 0, 0},
-	{"file", 1, 0, 0},
-	{0, 0, 0, 0}
-      };
-
-      c = getopt_long (argc, argv, "abc:d:0123456789",
-		       long_options, &option_index);
-      if (c == -1)
-	break;
-
-      switch (c)
-	{
-	case 0:
-	  printf ("option %s", long_options[option_index].name);
-	  if (optarg)
-	    printf (" with arg %s", optarg);
-	  printf ("\n");
-	  break;
-
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
-
-	case 'a':
-	  printf ("option a\n");
-	  break;
-
-	case 'b':
-	  printf ("option b\n");
-	  break;
-
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
-
-	case 'd':
-	  printf ("option d with value `%s'\n", optarg);
-	  break;
-
-	case '?':
-	  break;
-
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-	printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
@@ -1,38 +1,19 @@
 # We need to use a custom CMakeLists for GoogleTest, because we can't compile with exceptions on.

 add_library(gtest
-	googletest/src/gtest.cc
-	googletest/src/gtest-assertion-result.cc
-	googletest/src/gtest-death-test.cc
-	googletest/src/gtest-filepath.cc
-	googletest/src/gtest-matchers.cc
-	googletest/src/gtest-port.cc
-	googletest/src/gtest-printers.cc
-	googletest/src/gtest-test-part.cc
-	googletest/src/gtest-typed-test.cc
+	googletest/src/gtest-all.cc
+	googlemock/src/gmock-all.cc
+	googlemock/src/gmock_main.cc
+)
+target_include_directories(gtest PUBLIC
+	googletest/include
+	googlemock/include
 )
 target_include_directories(gtest PRIVATE
 	googletest
-	googletest/include
-)
-target_include_directories(gtest INTERFACE
-	googletest/include
+	googlemock
 )
 target_link_libraries(gtest Threads::Threads)
 set_property(TARGET gtest PROPERTY CXX_STANDARD 17)
 set_property(TARGET gtest PROPERTY CXX_STANDARD_REQUIRED ON)

-add_library(gtest_main
-	googletest/src/gtest_main.cc
-)
-target_include_directories(gtest_main PRIVATE
-	googletest
-	googletest/include
-)
-target_include_directories(gtest_main INTERFACE
-	googletest/include
-)
-target_link_libraries(gtest_main Threads::Threads)
-set_property(TARGET gtest_main PROPERTY CXX_STANDARD 17)
-set_property(TARGET gtest_main PROPERTY CXX_STANDARD_REQUIRED ON)
-
@@ -1,6 +1,10 @@
 dear imgui
 CHANGELOG

+PCSX2 Changes (must be reapplied after each update, use git blame on this changelog to inspect the commit that originally applied the change):
+- Don't shrink fonts based on their line height, and allow PCSX2 to specify a line height
+  - Issue: https://github.com/ocornut/imgui/issues/9063
+
 This document holds the user-facing changelog that we also use in release notes.
 We generally fold multiple commits pertaining to the same topic as a single entry.
 Changes to backends are also included within the individual .cpp files of each backend.
@@ -35,6 +39,413 @@ HOW TO UPDATE?
  and API updates have been a little more frequent lately. They are documented below and in imgui.cpp and should not affect all users.
 - Please report any issue!

+-----------------------------------------------------------------------
+ VERSION 1.92.7 (Released 2026-04-02)
+-----------------------------------------------------------------------
+
+Decorated log and release notes: https://github.com/ocornut/imgui/releases/tag/v1.92.7
+
+Breaking Changes:
+
+ - Separator: fixed a legacy quirk where `Separator()` was submitting a zero-height
+   item for layout purpose, even though it draws a 1-pixel separator.
+   The fix could affect code e.g. computing height from multiple widgets in order to
+   allocate vertical space for a footer or multi-line status bar. (#2657, #9263)
+   The "Console" example had such a bug:
+      float footer_height = style.ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
+      BeginChild("ScrollingRegion", { 0, -footer_height });
+   Should be:
+      float footer_height = style.ItemSpacing.y + style.SeparatorSize + ImGui::GetFrameHeightWithSpacing();
+      BeginChild("ScrollingRegion", { 0, -footer_height });
+   When such idiom was used and assuming zero-height Separator, it is likely that
+   in 1.92.7 the resulting window will have unexpected 1 pixel scrolling range.
+ - Multi-Select: renamed `ImGuiMultiSelectFlags_SelectOnClick` to `ImGuiMultiSelectFlags_SelectOnAuto`.
+   Kept inline redirection enum (will obsolete).
+ - Combo(), ListBox(): commented out legacy signatures which were obsoleted in 1.90
+   (Nov 2023), when the getter callback type was changed from:
+      bool (*getter)(void* user_data, int idx, const char** out_text)
+   To:
+      const char* (*getter)(void* user_data, int idx)
+
+Other Changes:
+
+- TreeNode:
+   - Moved `TreeNodeGetOpen()` helper to public API. I was hesitant to make this public
+     because I intend to provide a more generic and feature-full version, but in the meanwhile
+     this will do. (#3823, #9251, #7553, #6754, #5423, #2958, #2079, #1947, #1131, #722)
+   - In 'Demo->Property Editor' demonstrate a way to perform tree clipping by fast-forwarding
+     through non-visible chunks. (#3823, #9251, #6990, #6042)
+     Using SetNextItemStorageID() + TreeNodeGetOpen() makes this notably easier than
+     it was prior to 1.91.
+- InputText:
+  - Shift+Enter in multi-line editor always adds a new line, regardless of
+    `ImGuiInputTextFlags_CtrlEnterForNewLine` being set or not. (#9239)
+  - Reworked `io.ConfigInputTextEnterKeepActive` mode so that pressing Enter will
+    deactivate/reactivate the item in order for e.g. `IsItemDeactivatedAfterEdit()`
+    signals to be emitted the same way regardless of that setting. (#9001, #9115)
+  - Fixed a glitch when using `ImGuiInputTextFlags_ElideLeft` where the local x offset
+    would be incorrect during the deactivation frame. (#9298)
+  - Fixed a crash introduced in 1.92.6 when handling `ImGuiInputTextFlags_CallbackResize`
+    in certain situations. (#9174)
+  - Fixed selection highlight Y1 offset being very slightly off (since 1.92.3). (#9311) [@v-ein]
+  - InputTextMultiline: fixed an issue introduced in 1.92.3 where line count calculated
+    for vertical scrollbar range would be +1 when the widget is inactive, word-wrap is
+    disabled and the text buffer ends with '\n'. Fixed a similar issue related to clipping
+    large amount of text.
+  - InputTextMultiline: avoid going through reactivation code and fixed losing revert value
+    when activating scrollbar.
+  - InputTextMultiline: fixed an issue where edit buffer wouldn't be reapplied to back
+    buffer on the `IsItemDeactivatedAfterEdit()` frame. This could create issues when
+    using the idiom of not applying edits before `IsItemDeactivatedAfterEdit()`.
+    (#9308, #8915, #8273)
+- Tables:
+  - Allow reordering columns by dragging them in the context menu. (#9312)
+  - Context menu now presents columns in display order. (#9312)
+  - Fixed and clarified the behavior of using `TableSetupScrollFreeze()` with columns>1,
+    and where some of the columns within that range were Hidable.
+    - Before: `TableSetupScrollFreeze(N, 0)`: include the N left-most visible columns as
+              part of the scroll freeze. So if you intentionally hide columns <N, the scroll
+              freeze area would start covering the subsequent/following columns (N+1) etc.
+    - After:  `TableSetupScrollFreeze(N, 0)`: include the N left-most columns (regardless of visibility),
+              as part of the scroll freeze. So if you intentionally hide columns <N, the scroll
+              freeze area will cover less columns.
+    - This is generally more sane and logical.
+  - Fixed dragging a header to reorder outside of visible bounds (due to horizontal scrolling)
+    from losing active id.
+  - Angled Headers: angled section for column being reordered via the regular headers
+    stays highlighted during reordering.
+- Style:
+  - Fonts: fixed an issue introduced in 1.92.6 where `style.FontBaseSize` would be
+    cleared during the first frame if no fonts was explicitly added before.
+  - Border sizes are now scaled (and rounded) by `ScaleAllSizes()`.
+  - When using large values with `ScallAllSizes()`, the following items thickness
+    are scaled to integer amounts:
+    - `InputText()` caret/cursor thickness. (#7031)
+    - `CloseButton()` thickness.
+    - `TextLink()` underline thickness.
+    - `ColorButton()` border thickness.
+    - `Separator()` thickness, via scaling newly added `style.SeparatorSize`. (#2657, #9263)
+- Nav:
+  - Popups: Shift+F10 or Menu key can now open popups menus when using
+    `BeginPopupContextItem()`, `BeginPopupContextWindow()` or `OpenPopupOnItemClick()`.
+    (#8803, #9270) [@exelix11, @ocornut]
+  - Changed Gamepad mapping for "Activate with Text Input" action: (#8803, #787)
+    - Previously: press North button (PS4/PS5 triangle, Switch X, Xbox Y).
+    - Now: long press (hold) Activate button (PS4/PS5 cross, Switch B, Xbox A) for ~0.60 secs.
+    This is rarely used, somehow easier to discover, and frees a button for other uses.
+    See updated Gamepad Control Sheets: https://www.dearimgui.com/controls_sheets
+  - Short Gamepad Activation press on InputText() always activate with Text Input mode.
+  - Popups: pressing North button (PS4/PS5 triangle, SwitchX, Xbox Y) also open popups menus.
+- Multi-Select:
+  - Added `ImGuiMultiSelectFlags_SelectOnClickAlways` mode (rarely used).
+    This prevents Drag and Drop of multiple items, but it allows to start a new Box-Selection
+    from inside an existing selection (Excel style). (#9307, #1861)
+- Clipper:
+  - Clear `DisplayStart`/`DisplayEnd` fields when `Step()` returns false.
+  - Added `UserIndex` helper storage. This is solely a convenience for cases where
+    you may want to carry an index around.
+  - Always pulls current context on `ImGuiListClipper::Begin()`, consistent with public
+    API design, and avoids issues with clipper instances outliving contexts. (#9324, #5856)
+- Scrollbar:
+  - Implemented a custom tweak to extend hit-testing bounding box when window is sitting
+    at the edge of a viewport (e.g. fullscreen or docked window), so that e.g. mouse the
+    mouse at the extreme of the screen will reach the scrollbar. (#9276)
+  - Fixed an issue which could lead initial click to move the current scroll by a pixel.
+- Button:
+  - Moved `ImGuiButtonFlags_AllowOverlap` from imgui_internal.h to imgui.h,
+    as a convenience for when using e.g. `InvisibleButton()`.
+- Focus: fixed fallback "Debug" window temporarily taking focus and setting `io.WantCaptureKeyboard`
+  for one frame on e.g. application boot if no other windows are submitted. (#9243)
+- DrawList:
+  - PathArcTo(): fixed erroneous segment count for pathologically small arcs on large 
+    circles. (#9331, #9313) [@thedmd, @epajarre]
+- Memory:
+  - Discard/GC of ImDrawList buffers for unused windows favor restoring them to
+    ~Size*1.05 instead of Capacity when awakening again. Facilitate releasing ImDrawList
+    buffers after unusual usage spike. (#9303)
+  - Fixed `GetForegroundDrawList()`/`GetBackgroundDrawList()` per-viewport buffers not being
+    collected when unused for `io.ConfigMemoryCompactTimer` amount of time. (#9303)
+- Demo: fixed `IMGUI_DEMO_MARKER` locations for examples applets. (#9261, #3689) [@pthom]
+- Misc: added missing ImVec2/ImVec4 operators. (#9339, #8258) [@dkosmari, @ArashPartow]
+- Internals:
+  - ButtonBehavior: fixed internal/low-level `ImGuiButtonFlags_PressedOnRelease`
+    (as well as equivalent `ImGuiSelectableFlags_SelectOnRelease` for Selectable) from
+    not taking current active id. `ImGuiButtonFlags_NoHoldingActiveID` allows that.
+    This was only used internally by MenuItem().
+- Backends:
+  - DirectX9, OpenGL2, OpenGL3, Metal, SDLGPU3, SDLRenderer2, SDLRenderer3: fixed easy-to-fix
+    issues in code assuming ImTextureID_Invalid is always defined to 0. (#9295, #9310)
+  - GLFW: mouse cursor is properly restored if changed by user app/code while using
+    `glfwSetInputMode(..., GLFW_CURSOR_DISABLED)` or `ImGuiConfigFlags_NoMouseCursorChange`.
+    Amend optimization done in 1.92.6.
+  - SDLGPU3: removed unnecessary call to `SDL_WaitForGPUIdle()` when releasing
+    vertex/index buffers. (#9262) [@jaenis]
+  - WebGPU: fixed version check for Emscripten 5.0.0+.
+  - WebGPU: removed support for Emscripten <4.0.10. (#9281) [@ypujante]
+  - WebGPU: added support for WGVK native backend via `IMGUI_IMPL_WEBGPU_BACKEND_WGVK`,
+    using SPIRV shaders if WGSL is not available. (#9316, #9246, #9257) [@r-lyeh]
+    (WGVK is a lightweight alternative to Dawn or WGPU for native applications,
+    which is easier to build/setup, see: https://github.com/manuel5975p/WGVK)
+- Examples:
+  - Emscripten: added `tabindex=-1` to canvas in our shell_minimal.htm. Without it,
+    the canvas was not focusable in the DOM, which in turn make some backends
+    (e.g. pongasoft/emscripten-glfw) not receive focus loss events. (#9259) [@pthom]
+  - Emscripten: fixed minor rendering issues with our HTML shell. (#9281) [@ypujante]
+    - hidden small blue outline when canvas is focused on Chrome.
+    - hidden scrollbar in Firefox.
+  - Vulkan: added `ImGui_ImplVulkan_PipelineInfo::ExtraDynamicStates[]` to allow specifying
+    extra dynamic states to add when creating the VkPipeline. (#9211) [@DziubanMaciej]
+  - Vulkan: `ImGui_ImplVulkan_AddTexture()` skips updating descriptor_set if failing
+    to allocate one. (#8677) [@micb25]
+  - WebGPU: fixed undefined behaviors in example code for requesting adapter
+    and device. (#9246, #9256) [@r-lyeh]
+  - SDL2+WebGPU: fixed hi-dpi handling. (#9300) [@ypujante]
+  - GLFW/SDL2/SDL3+WebGPU: added support for WGVK. (#9316, #9246, #9257) [@r-lyeh, @ocornut]
+  - GLFW/SDL2/SDL3+WebGPU: removed support for Emscripten <4.0.10. (#9281) [@ypujante]
+
+
+-----------------------------------------------------------------------
+ VERSION 1.92.6 (2026-02-17)
+-----------------------------------------------------------------------
+
+Decorated log and release notes: https://github.com/ocornut/imgui/releases/tag/v1.92.6
+
+Breaking Changes:
+
+- Fonts:
+  - `AddFontDefault()` now automatically selects an embedded font between:
+    - `AddFontDefaultBitmap()`: classic pixel-clean font. Recommended at Size 13px with no scaling.
+    - `AddFontDefaultVector()`: new scalable font. Recommended at any higher size.
+    - The default selection is based on (style.FontSizeBase * FontScaleMain * FontScaleDpi)
+      reaching a small threshold, but old codebases may not set any of them properly.
+      As as a result, it is likely that old codebase may still default to AddFontDefaultBitmap().
+    - Prefer explicitly calling either of them based on your own logic!
+      You can call `AddFontDefaultBitmap()` to ensure legacy behavior.
+  - Fixed handling of `ImFontConfig::FontDataOwnedByAtlas = false` which did
+    erroneously make a copy of the font data, essentially defeating the purpose
+    of this flag and wasting memory (undetected since July 2015 and now spotted
+    by @TellowKrinkle, this is perhaps the oldest bug in Dear ImGui history,
+    albeit for a rarely used feature!) (#9086, #8465)
+    HOWEVER, fixing this bug is likely to surface bugs in user/app code:
+    - Prior to 1.92, font data only needs to be available during the `atlas->AddFontXXX()` call.
+      Since 1.92, font data needs to available until `atlas->RemoveFont()`, or more typically
+      until a shutdown of the owning context or font atlas.
+    - The fact that handling of `FontDataOwnedByAtlas = false` was broken bypassed
+      the issue altogether.
+  - Removed `ImFontConfig::PixelSnapV` added in 1.92 which turns out is unnecessary
+    (and was mis-documented). Post-rescale `GlyphOffset` is always rounded.
+ - Popups: changed compile-time `ImGuiPopupFlags popup_flags = 1` default value to be `= 0` for
+   `BeginPopupContextItem()`, `BeginPopupContextWindow()`, `BeginPopupContextVoid()`, `OpenPopupOnItemClick()`.
+   The default value has same meaning before and after. (#9157, #9146)
+   - Before this version, those functions had a `ImGuiPopupFlags popup_flags = 1` default
+     value in their function signature. This was introduced by a change on 2020/06/23 (1.77)
+     while changing the signature from `int mouse_button` to `ImGuiPopupFlags popup_flags`
+     and trying to preserve then-legacy behavior.
+   - We have now changed this behavior to: cleanup a very old API quirk, facilitate use by
+     bindings, and to remove the last and error-prone non-zero default value. Also because we
+     deemed it extremely rare to use those helper functions with the Left mouse button!
+     As using the LMB would generally be triggered via another widget,
+     e.g. a Button() + a OpenPopup()/BeginPopup() call.
+   - Before: The default = 1 means `ImGuiPopupFlags_MouseButtonRight`.
+             Explicitly passing a literal 0 means `ImGuiPopupFlags_MouseButtonLeft`.
+   - After:  The default = 0 means `ImGuiPopupFlags_MouseButtonRight`.
+             Explicitly passing a literal 1 also means `ImGuiPopupFlags_MouseButtonRight`.
+             (if legacy behavior are enabled) or will assert (if legacy behavior are disabled).
+   - TL;DR: if you don't want to use right mouse button for popups, always specify it
+     explicitly using a named `ImGuiPopupFlags_MouseButtonXXXX` value.
+   Recap:
+   - BeginPopupContextItem("foo");                                         // Behavior unchanged (use Right button)
+   - BeginPopupContextItem("foo", ImGuiPopupFlags_MouseButtonLeft);        // Behavior unchanged (use Left button)
+   - BeginPopupContextItem("foo", ImGuiPopupFlags_MouseButtonLeft | xxx);  // Behavior unchanged (use Left button + flags)
+   - BeginPopupContextItem("foo", ImGuiPopupFlags_MouseButtonRight | xxx); // Behavior unchanged (use Right button + flags)
+   - BeginPopupContextItem("foo", 1);                                      // Behavior unchanged (as a courtesy we legacy interpret 1 as ImGuiPopupFlags_MouseButtonRight, will assert if disabling legacy behaviors.
+   - BeginPopupContextItem("foo", 0);                                      // !! Behavior changed !! Was Left button. Now will defaults to Right button! --> Use ImGuiPopupFlags_MouseButtonLeft.
+   - BeginPopupContextItem("foo", ImGuiPopupFlags_NoReopen);               // !! Behavior changed !! Was Left button + flags. Now will defaults to Right button! --> Use ImGuiPopupFlags_MouseButtonLeft | xxx.
+- Commented out legacy names obsoleted in 1.90 (Sept 2023):
+  - `BeginChildFrame()`     --> `BeginChild()` with `ImGuiChildFlags_FrameStyle` flag.
+  - `EndChildFrame()`       --> `EndChild()`.
+  - `ShowStackToolWindow()` --> `ShowIDStackToolWindow()`.
+  - `IM_OFFSETOF()`         --> `offsetof()`.
+  - `IM_FLOOR()`            --> `IM_TRUNC()` [internal, for positive values only]
+- Hashing: handling of "###" operator to reset to seed within a string identifier
+  doesn't include the "###" characters in the output hash anymore:
+      Before: `GetID("Hello###World") == GetID("###World") != GetID("World")`
+      After:  `GetID("Hello###World") == GetID("###World") == GetID("World")`
+  - This has the property of facilitating concatenating and manipulating
+    identifiers using "###", and will allow fixing other dangling issues.
+  - This will invalidate hashes (stored in .ini data) for Tables and Windows
+    that are using the "###" operators. (#713, #1698)
+- Renamed helper macro `IM_ARRAYSIZE()` -> `IM_COUNTOF()`. Kept redirection/legacy name.
+- Backends:
+  - Vulkan: optional `ImGui_ImplVulkanH_DestroyWindow()` helper used by our example
+    code does not call `vkDestroySurfaceKHR()`: because surface is created by caller
+    of `ImGui_ImplVulkanH_CreateOrResizeWindow()`, it is more consistent. (#9163)
+
+Other Changes:
+
+- Fonts:
+  - Added `AddFontDefaultVector()`: a new embedded monospace scalable font: ProggyForever!
+    From https://github.com/ocornut/proggyforever:
+      "ProggyForever is an MIT-licensed partial reimplementation of the ProggyVector
+       font (originally by Tristan Grimmer), which itself is a vector-based
+       reinterpretation of the ProggyClean bitmap font that happily served as
+       Dear ImGui default font for over 10 years." [...]
+      "I commissioned Thiebault Courot to recreate this, applied various minor tweaks
+       and fixes, and reworked his editing pipeline toward shipping FontForge source
+       files so we can allow and track future changes."
+    - TL;DR; there was no strictly MIT-licensed matching font. We made it!
+    - The font data was carefully subsetted, trimmed and compressed so the embedded
+      data is ~14 KB. Embedding a scalable default font ensures that Dear ImGui can
+      be easily and readily used in all contexts, even without file system access.
+    - Expect minor fixes/improvements in following releases.
+    - As always you can opt-out of the embedded font data if desired.
+  - `AddFontDefault()` now automatically selects an embedded font between
+    the classic pixel-looking one and the new scalable one.
+    Prefer calling `AddFontDefaultVector()` or `AddFontDefaultBitmap()` explicitly.
+  - Fixed a crash when trying to use `AddFont()` with `MergeMode==true` on a font that
+    has already been rendered. (#9162) [@ocornut, @cyfewlp]
+  - Fixed an issue where using `PushFont()` from the implicit/fallback "Debug" window
+    when its recorded state is collapsed would incorrectly early out. This would break
+    e.g. using direct draw-list calls such as `GetForegroundDrawList()` with current font.
+    (#9210, #8865)
+  - Fixed an issue related to `EllipsisChar` handling, while changing
+    font loader or font loader flags dynamically in Style->Fonts menus.
+  - imgui_freetype: fixed overwriting `ImFontConfig::PixelSnapH` when hinting
+    is enabled, creating side-effects when later disabling hinting or
+    dynamically switching to stb_truetype rasterizer.
+  - Adding new fonts after removing all fonts mid-frame properly updates current state.
+- Textures:
+  - Fixed a building issue when `ImTextureID` is defined as a struct.
+  - Fixed displaying texture # in Metrics/Debugger window.
+- Menus:
+  - Fixed `MenuItem()` label position and `BeginMenu()` arrow/icon/popup positions,
+    when used inside a line with a baseline offset.
+  - Made navigation into menu-bar auto wrap on X axis. (#9178)
+- TreeNode:
+  - Fixed highlight position when used inside a line with a large text baseline offset.
+    (it never quite worked in this situation; but then most of the time the text
+    baseline offset ends up being zero or `FramePadding.y` for a given line).
+- Tables:
+  - Fixed an issue where a very thin scrolling table would advance parent layout
+    slightly differently depending on its visibility (caused by a mismatch
+    between hard minimum window size and table minimum size).
+  - Fixed an issue where submitting non-integer row heights would eventually
+    advance table parent layout by +0/+1 depending on its visibility.
+  - Fixed losing stored display order when reducing column count or when .ini
+    data has missing or duplicate values. (#9108, #4046)
+- ColorEdit:
+  - Added R/G/B/A color markers next to each component (enabled by default).
+  - Added `ImGuiColorEditFlags_NoColorMarkers` to disable them.
+  - Added `style.ColorMarkerSize` to configure width of color component markers.
+- Sliders, Drags:
+  - Added `ImGuiSliderFlags_ColorMarkers` to opt-in adding R/G/B/A color markers
+    next to each components, in multi-components functions.
+  - Added a way to select a specific marker color.
+- InputText:
+  - InputTextMultiline(): fixed a minor bug where Shift+Wheel would allow a small
+    horizontal scroll offset when there should be none. (#9249)
+  - ImGuiInputTextCallbackData: `SelectAll()` also sets `CursorPos` to `SelectionEnd`.
+  - ImGuiInputTextCallbackData: Added `SetSelection()` helper.
+  - ImGuiInputTextCallbackData: Added `ID` and `EventActivated` members. (#9174)
+- Text, InputText:
+  - Reworked word-wrapping logic:
+    - Try to not wrap in the middle of contiguous punctuation. (#8139, #8439, #9094)
+    - Try to not wrap between a punctuation and a digit. (#8503)
+    - Inside `InputTextMultiline()` with WordWrap enabled: prefer keeping blanks at
+      the end of a line rather than at the beginning of next line. (#8990, #3237)
+  - Fixed low-level word-wrapping function reading from `*text_end` when passed
+    a string range. (#9107) [@achabense]
+  - Changed `RenderTextEllipsis()` logic to not trim trailing blanks before
+    the ellipsis, making ellipsis position more consistent and not arbitrary
+    hiding the possibility of multiple blanks. (#9229)
+- Nav:
+  - Fixed remote/shortcut InputText() not teleporting mouse cursor when
+    nav cursor is visible and `io.ConfigNavMoveSetMousePos` is enabled.
+  - Fixed a looping/wrapping issue when used in menu layer. (#9178)
+  - Fixed speed scale for resizing/moving with keyboard/gamepad. We incorrectly
+    used `io.DisplayFramebufferScale` as a scaling factor (very old code),
+    effectively making those actions faster on macOS/iOS retina screens.
+    (changed this to use a style scale factor that's not fully formalized yet)
+  - Fixed an UBSan warning when using in a `ImGuiListClipper` region . (#9160)
+- Scrollbar: fixed a code-path leading to a divide-by-zero (which would not be
+  noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
+- InvisibleButton: allow calling with size (0,0) to fit to available content 
+  size. (#9166, #7623)
+- Tooltips, Disabled: fixed `EndDisabledOverrideReenable()` assertion when
+  nesting a tooltip in a disabled block. (#9180, #7640) [@RegimantasSimkus]
+- Added `GetItemFlags()` in public API for consistency and to expose generic
+  flags of last submitted item. (#9127)
+- Misc: fixed build on ARM64/ARM64EC targets trying to use SSE/immintrin.h.
+  (#9209, #5943, #4091) [@navvyswethgraphics]
+- Log/Capture:
+  - Fixed erroneously injecting extra carriage returns in output text buffer
+    when `ItemSpacing.y` > `FramePadding.y + 1` while emitting items.
+- Images:
+  - Added `style.ImageRounding`, `ImGuiStyleVar_ImageRounding `to configure
+    rounding of `Image()` widgets. (#2942, #845)
+  - `ImageButton()` doesn't use a clamped `style.FrameRounding` value but instead
+    adjust inner image rounding when `FramePadding > `FrameRounding`. (#2942, #845)
+- Shortcuts:
+  - IsItemHovered() without `ImGuiHoveredFlags_AllowWhenBlockedByActiveItem`
+    doesn't filter out the signal when activated item is a shortcut remote activation;
+    (which mimics what's done internally in the `ItemHoverable()` function). (#9138)
+  - Fixed tooltip placement being affected for a frame when located over an item
+    activated by `SetNextItemShortcut()`. (#9138)
+- Error Handling:
+  - Improved error handling and recovery for `EndMenu()`/`EndCombo()`. (#1651, #9165, #8499)
+  - Improved error handling and recovery for `TableSetupColumn()`.
+- Debug Tools:
+  - Debug Log: fixed incorrectly printing characters in IO log when submitting
+    non-ASCII values to `io.AddInputCharacter()`. (#9099)
+  - Debug Log: can output to debugger on Windows via Win32 `OutputDebugString()` (#5855)
+- Demo:
+  - Slightly improve `Selectable()` demos. (#9193)
+- Backends:
+  - DirectX10: added `SamplerNearest` in `ImGui_ImplDX10_RenderState`.
+    (+renamed `SamplerDefault` to `SamplerLinear`, which was tagged as beta API)
+  - DirectX11: added `SamplerNearest` in ImGui_ImplDX11_RenderState.
+    (+renamed `SamplerDefault` to `SamplerLinear`, which was tagged as beta API)
+  - GLFW: Avoid repeated `glfwSetCursor()` / `glfwSetInputMode()` unnecessary calls.
+    Lowers overhead for very high framerates (e.g. 10k+ FPS). [@maxliani]
+  - GLFW: Added `IMGUI_IMPL_GLFW_DISABLE_X11` / `IMGUI_IMPL_GLFW_DISABLE_WAYLAND` to
+    forcefully disable either. (#9109, #9116)
+    Try to set them automatically if headers are not accessible. (#9225)
+  - OpenGL3: Fixed embedded loader multiple init/shutdown cycles broken on some
+    platforms. (#8792, #9112)
+  - SDL2, SDL3: changed `GetClipboardText()` handler to return NULL on error aka
+    clipboard contents is not text. Consistent with other backends. (#9168)
+  - SDL2, SDL3: systems other than X11 are back to starting mouse capture on mouse down
+    (reverts 1.91.9 change). Only X11 requires waiting for a drag by default (not ideal,
+    but a better default for X11 users). Waiting for a drag to start mouse capture leads to
+    input drops when dragging after clicking on the edge of a window.
+    (#3650, #6410, #9235, #3956, #3835)
+  - SDL2, SDL3: added `ImGui_ImplSDL2_SetMouseCaptureMode()`/`ImGui_ImplSDL3_SetMouseCaptureMode()`
+    function for X11 users to disable mouse capturing/grabbing. (#3650, #6410, #9235, #3956, #3835)
+    - When attached to a debugger may want to call:
+      - `ImGui_ImplSDL3_SetMouseCaptureMode(ImGui_ImplSDL3_MouseCaptureMode_Disabled);`
+    - But you can also configure your system or debugger to automatically release
+      mouse grab when crashing/breaking in debugger, e.g.
+      - console: `setxkbmap -option grab:break_actions && xdotool key XF86Ungrab`
+      - or use a GDB script to call `SDL_CaptureMouse(false)`. See #3650.
+    - On platforms other than X11 this is unnecessary.
+  - SDL_GPU3: added `SamplerNearest` in `ImGui_ImplSDLGPU3_RenderState`.
+  - SDL_GPU3: macOS version can use MSL shaders in order to support macOS 10.14+
+    (vs Metallib shaders requiring macOS 14+). Requires application calling
+    `SDL_CreateGPUDevice()` with `SDL_GPU_SHADERFORMAT_MSL`. (#9076) [@Niminem]
+  - Vulkan: helper for creating a swapchain (used by examples and multi-viewports)
+    selects `VkSwapchainCreateInfoKHR`'s `compositeAlpha` value based on
+    `cap.supportedCompositeAlpha`, which seems to be required on some Android
+     devices. (#8784) [@FelixStach]
+  - WebGPU: fixes for Emscripten 5.0.0 (note: current examples do not build with 5.0.1).
+  - Win32: handle `WM_IME_CHAR`/`WM_IME_COMPOSITION` to support Unicode inputs on
+    MBCS (non-Unicode) Windows. (#9099, #3653, #5961) [@ulhc, @ocornut, @Othereum]
+  - Win32: minor optimization not submitting gamepad input if packet number has not
+    changed (reworked previous 1.92.4). (#9202, #8556) [@AhmedSamyMousa, @MidTerm-CN]
+- Examples:
+   - Win32+DirectX12: ignore seemingly incorrect `D3D12_MESSAGE_ID_FENCE_ZERO_WAIT`
+     warning on startups on some setups. (#9084, #9093) [@RT2Code, @LeoGautheron]
+
+
 -----------------------------------------------------------------------
 VERSION 1.92.5 (Released 2025-11-20)
 -----------------------------------------------------------------------
@@ -141,7 +552,7 @@ Other Changes:
     debug/metrics window is not in the same viewport as the table.
 - Backends:
  - NULL: added imgui_impl_null platform/renderer backend.
-    This is designed if you need to run e.g. context with no input or no ouput.
+    This is designed if you need to run e.g. context with no input or no output.
  - GLFW: fixed building on Linux platforms where Wayland headers
    are not available. (#9024, #8969, #8921, #8920) [@jagot]
  - GLFW: lower minimum requirement from GLFW 3.1 to GLFW 3.0. Though
@@ -219,6 +630,8 @@ Other Changes:
  using ImGuiWindowFlags_UnsavedDocument/ImGuiTabItemFlags_UnsavedDocument. (#8983)
 - IO: added ImGuiPlatformIO::ClearPlatformHandlers(), ClearRendererHandlers()
  helpers to null all handlers. (#8945, #2769)
+- Tables: changed ImGuiTableFlags_NoBordersInBody behavior to not draw border in
+  body even when resizing. (#8893)
 - Inputs:
  - Shortcuts: added support for combining ImGuiInputFlags_RouteFocused
    (which is the default route) with ImGuiInputFlags_RouteOverActive, allowing
@@ -621,7 +1034,7 @@ Breaking changes:
      which font input is providing which glyph.
 - Fonts: **IMPORTANT** on Thread Safety:
  - A few functions such as font->CalcTextSizeA() were by sheer luck (== accidentally)
-    thread-safe even thou we had never provided that guarantee before. They are
+    thread-safe even though we had never provided that guarantee before. They are
    definitively not thread-safe anymore as new glyphs may be loaded.

 - Textures:
@@ -1374,6 +1787,7 @@ Breaking changes:
 - Commented out pre-1.87 IO system (equivalent to using IMGUI_DISABLE_OBSOLETE_KEYIO or IMGUI_DISABLE_OBSOLETE_FUNCTIONS before).
  - io.KeyMap[] and io.KeysDown[] are removed (obsoleted February 2022). Use IsKeyDown() instead.
  - io.NavInputs[] and ImGuiNavInput are removed (obsoleted July 2022).
+  - GetKeyIndex() is removed (obsoleted March 2022). The indirection is now unnecessary.
  - Pre-1.87 backends are not supported:
    - backends need to call io.AddKeyEvent(), io.AddMouseEvent() instead of writing to io.KeysDown[], io.MouseDown[] fields.
    - backends need to call io.AddKeyAnalogEvent() for gamepad values instead of writing to io.NavInputs[] fields.
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2026 Omar Cornut
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -49,7 +49,7 @@
 //#define IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
 //#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
 //#define IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
-//#define IMGUI_DISABLE_DEFAULT_FONT                        // Disable default embedded font (ProggyClean.ttf), remove ~9.5 KB from output binary. AddFontDefault() will assert.
+//#define IMGUI_DISABLE_DEFAULT_FONT                        // Disable default embedded fonts (ProggyClean/ProggyForever), remove ~9 KB + ~14 KB from output binary. AddFontDefaultXXX() functions will assert.
 //#define IMGUI_DISABLE_SSE                                 // Disable use of SSE intrinsics even if available

 //---- Enable Test Engine / Automation features.
@@ -93,7 +93,7 @@
 // - plutosvg is currently easier to install, as e.g. it is part of vcpkg. It will support more fonts and may load them faster. See misc/freetype/README for instructions.
 // - Both require headers to be available in the include path + program to be linked with the library code (not provided).
 // - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
-#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
+//#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
 //#define IMGUI_ENABLE_FREETYPE_LUNASVG

 //---- Use stb_truetype to build and rasterize the font atlas (default)
@@ -1,4 +1,4 @@
-// dear imgui, v1.92.5
+// dear imgui, v1.92.7
 // (headers)

 // Help:
@@ -20,7 +20,7 @@
 //   - Software using Dear ImGui  https://github.com/ocornut/imgui/wiki/Software-using-dear-imgui
 // - Issues & support ........... https://github.com/ocornut/imgui/issues
 // - Test Engine & Automation ... https://github.com/ocornut/imgui_test_engine (test suite, test engine to automate your apps)
-// - Web version of the Demo .... https://pthom.github.io/imgui_manual_online/manual/imgui_manual.html (w/ source code browser)
+// - Web version of the Demo .... https://pthom.github.io/imgui_explorer (w/ source code browser)

 // For FIRST-TIME users having issues compiling/linking/running:
 // please post in https://github.com/ocornut/imgui/discussions if you cannot find a solution in resources above.
@@ -29,8 +29,8 @@

 // Library Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
-#define IMGUI_VERSION       "1.92.5"
-#define IMGUI_VERSION_NUM   19250
+#define IMGUI_VERSION       "1.92.7"
+#define IMGUI_VERSION_NUM   19270
 #define IMGUI_HAS_TABLE             // Added BeginTable() - from IMGUI_VERSION_NUM >= 18000
 #define IMGUI_HAS_TEXTURES          // Added ImGuiBackendFlags_RendererHasTextures - from IMGUI_VERSION_NUM >= 19198

@@ -95,7 +95,7 @@ Index of this file:
 #include <assert.h>
 #define IM_ASSERT(_EXPR)            assert(_EXPR)                               // You can override the default assert handler by editing imconfig.h
 #endif
-#define IM_ARRAYSIZE(_ARR)          ((int)(sizeof(_ARR) / sizeof(*(_ARR))))     // Size of a static C-style array. Don't use on pointers!
+#define IM_COUNTOF(_ARR)            ((int)(sizeof(_ARR) / sizeof(*(_ARR))))     // Size of a static C-style array. Don't use on pointers!
 #define IM_UNUSED(_VAR)             ((void)(_VAR))                              // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds.
 #define IM_STRINGIFY_HELPER(_EXPR)  #_EXPR
 #define IM_STRINGIFY(_EXPR)         IM_STRINGIFY_HELPER(_EXPR)                  // Preprocessor idiom to stringify e.g. an integer or a macro.
@@ -340,7 +340,9 @@ IM_MSVC_RUNTIME_CHECKS_RESTORE
 typedef ImU64 ImTextureID;      // Default: store up to 64-bits (any pointer or integer). A majority of backends are ok with that.
 #endif

-// Define this if you need 0 to be a valid ImTextureID for your backend.
+// Define this if you need to change the invalid value for your backend.
+// - If your backend is using ImTextureID to store an index/offset and you need 0 to be valid, You can add '#define ImTextureID_Invalid ((ImTextureID)-1)' in your imconfig.h file.
+// - From 2026/03/12 to 2026/03/19 we experimented with changing to default to -1, but I worried it would cause too many issues in third-party code so it was reverted.
 #ifndef ImTextureID_Invalid
 #define ImTextureID_Invalid     ((ImTextureID)0)
 #endif
@@ -349,7 +351,7 @@ typedef ImU64 ImTextureID;      // Default: store up to 64-bits (any pointer or
 // The identifier is valid even before the texture has been uploaded to the GPU/graphics system.
 // This is what gets passed to functions such as `ImGui::Image()`, `ImDrawList::AddImage()`.
 // This is what gets stored in draw commands (`ImDrawCmd`) to identify a texture during rendering.
-// - When a texture is created by user code (e.g. custom images), we directly stores the low-level ImTextureID.
+// - When a texture is created by user code (e.g. custom images), we directly store the low-level ImTextureID.
 //   Because of this, when displaying your own texture you are likely to ever only manage ImTextureID values on your side.
 // - When a texture is created by the backend, we stores a ImTextureData* which becomes an indirection
 //   to extract the ImTextureID value during rendering, after texture upload has happened.
@@ -756,6 +758,7 @@ namespace ImGui
    IMGUI_API bool          CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags = 0); // when 'p_visible != NULL': if '*p_visible==true' display an additional small close button on upper right of the header which will set the bool to false when clicked, if '*p_visible==false' don't display the header.
    IMGUI_API void          SetNextItemOpen(bool is_open, ImGuiCond cond = 0);                  // set next TreeNode/CollapsingHeader open state.
    IMGUI_API void          SetNextItemStorageID(ImGuiID storage_id);                           // set id to use for open/close storage (default to same as item id).
+    IMGUI_API bool          TreeNodeGetOpen(ImGuiID storage_id);                                // retrieve tree node open/close state.

    // Widgets: Selectables
    // - A selectable highlights when hovered, and can display another color when selected.
@@ -853,20 +856,23 @@ namespace ImGui
    //  - CloseCurrentPopup() is called by default by Selectable()/MenuItem() when activated (FIXME: need some options).
    //  - Use ImGuiPopupFlags_NoOpenOverExistingPopup to avoid opening a popup if there's already one at the same level. This is equivalent to e.g. testing for !IsAnyPopupOpen() prior to OpenPopup().
    //  - Use IsWindowAppearing() after BeginPopup() to tell if a window just opened.
-    //  - IMPORTANT: Notice that for OpenPopupOnItemClick() we exceptionally default flags to 1 (== ImGuiPopupFlags_MouseButtonRight) for backward compatibility with older API taking 'int mouse_button = 1' parameter
    IMGUI_API void          OpenPopup(const char* str_id, ImGuiPopupFlags popup_flags = 0);                     // call to mark popup as open (don't call every frame!).
    IMGUI_API void          OpenPopup(ImGuiID id, ImGuiPopupFlags popup_flags = 0);                             // id overload to facilitate calling from nested stacks
-    IMGUI_API void          OpenPopupOnItemClick(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);   // helper to open popup when clicked on last item. Default to ImGuiPopupFlags_MouseButtonRight == 1. (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors)
+    IMGUI_API void          OpenPopupOnItemClick(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 0);   // helper to open popup when clicked on last item. Default to ImGuiPopupFlags_MouseButtonRight == 1. (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors)
    IMGUI_API void          CloseCurrentPopup();                                                                // manually close the popup we have begin-ed into.

-    // Popups: open+begin combined functions helpers
+    // Popups: Open+Begin popup combined functions helpers to create context menus.
    //  - Helpers to do OpenPopup+BeginPopup where the Open action is triggered by e.g. hovering an item and right-clicking.
-    //  - They are convenient to easily create context menus, hence the name.
    //  - IMPORTANT: Notice that BeginPopupContextXXX takes ImGuiPopupFlags just like OpenPopup() and unlike BeginPopup(). For full consistency, we may add ImGuiWindowFlags to the BeginPopupContextXXX functions in the future.
-    //  - IMPORTANT: Notice that we exceptionally default their flags to 1 (== ImGuiPopupFlags_MouseButtonRight) for backward compatibility with older API taking 'int mouse_button = 1' parameter, so if you add other flags remember to re-add the ImGuiPopupFlags_MouseButtonRight.
-    IMGUI_API bool          BeginPopupContextItem(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);  // open+begin popup when clicked on last item. Use str_id==NULL to associate the popup to previous item. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp!
-    IMGUI_API bool          BeginPopupContextWindow(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);// open+begin popup when clicked on current window.
-    IMGUI_API bool          BeginPopupContextVoid(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);  // open+begin popup when clicked in void (where there are no windows).
+    //  - IMPORTANT: If you ever used the left mouse button with BeginPopupContextXXX() helpers before 1.92.6:
+    //    - Before this version, OpenPopupOnItemClick(), BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid() had 'a ImGuiPopupFlags popup_flags = 1' default value in their function signature.
+    //    - Before: Explicitly passing a literal 0 meant ImGuiPopupFlags_MouseButtonLeft. The default = 1 meant ImGuiPopupFlags_MouseButtonRight.
+    //    - After: The default = 0 means ImGuiPopupFlags_MouseButtonRight. Explicitly passing a literal 1 also means ImGuiPopupFlags_MouseButtonRight (if legacy behavior are enabled) or will assert (if legacy behavior are disabled).
+    //    - TL;DR: if you don't want to use right mouse button for popups, always specify it explicitly using a named ImGuiPopupFlags_MouseButtonXXXX value.
+    //    - Read "API BREAKING CHANGES" 2026/01/07 (1.92.6) entry in imgui.cpp or GitHub topic #9157 for all details.
+    IMGUI_API bool          BeginPopupContextItem(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 0);  // open+begin popup when clicked on last item. Use str_id==NULL to associate the popup to previous item. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp!
+    IMGUI_API bool          BeginPopupContextWindow(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 0);// open+begin popup when clicked on current window.
+    IMGUI_API bool          BeginPopupContextVoid(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 0);  // open+begin popup when clicked in void (where there are no windows).

    // Popups: query functions
    //  - IsPopupOpen(): return true if the popup is open at the current BeginPopup() level of the popup stack.
@@ -897,7 +903,7 @@ namespace ImGui
    // - 5. Call EndTable()
    IMGUI_API bool          BeginTable(const char* str_id, int columns, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0.0f, 0.0f), float inner_width = 0.0f);
    IMGUI_API void          EndTable();                                         // only call EndTable() if BeginTable() returns true!
-    IMGUI_API void          TableNextRow(ImGuiTableRowFlags row_flags = 0, float min_row_height = 0.0f); // append into the first cell of a new row.
+    IMGUI_API void          TableNextRow(ImGuiTableRowFlags row_flags = 0, float min_row_height = 0.0f); // append into the first cell of a new row. 'min_row_height' include the minimum top and bottom padding aka CellPadding.y * 2.0f.
    IMGUI_API bool          TableNextColumn();                                  // append into the next column (or first column of next row if currently in last column). Return true when column is visible.
    IMGUI_API bool          TableSetColumnIndex(int column_n);                  // append into the specified column. Return true when column is visible.

@@ -908,7 +914,7 @@ namespace ImGui
    //   The context menu can also be made available in columns body using ImGuiTableFlags_ContextMenuInBody.
    // - You may manually submit headers using TableNextRow() + TableHeader() calls, but this is only useful in
    //   some advanced use cases (e.g. adding custom widgets in header row).
-    // - Use TableSetupScrollFreeze() to lock columns/rows so they stay visible when scrolled.
+    // - Use TableSetupScrollFreeze() to lock columns/rows so they stay visible when scrolled. When freezing columns you would usually also use ImGuiTableColumnFlags_NoHide on them.
    IMGUI_API void          TableSetupColumn(const char* label, ImGuiTableColumnFlags flags = 0, float init_width_or_weight = 0.0f, ImGuiID user_id = 0);
    IMGUI_API void          TableSetupScrollFreeze(int cols, int rows);         // lock columns/rows so they stay visible when scrolled.
    IMGUI_API void          TableHeader(const char* label);                     // submit one header cell manually (rarely used)
@@ -977,7 +983,7 @@ namespace ImGui
    // Disabling [BETA API]
    // - Disable all user interactions and dim items visuals (applying style.DisabledAlpha over current colors)
    // - Those can be nested but it cannot be used to enable an already disabled section (a single BeginDisabled(true) in the stack is enough to keep everything disabled)
-    // - Tooltips windows are automatically opted out of disabling. Note that IsItemHovered() by default returns false on disabled items, unless using ImGuiHoveredFlags_AllowWhenDisabled. 
+    // - Tooltips windows are automatically opted out of disabling. Note that IsItemHovered() by default returns false on disabled items, unless using ImGuiHoveredFlags_AllowWhenDisabled.
    // - BeginDisabled(false)/EndDisabled() essentially does nothing but is provided to facilitate use of boolean expressions (as a micro-optimization: if you have tens of thousands of BeginDisabled(false)/EndDisabled() pairs, you might want to reformulate your code to avoid making those calls)
    IMGUI_API void          BeginDisabled(bool disabled = true);
    IMGUI_API void          EndDisabled();
@@ -995,7 +1001,7 @@ namespace ImGui
    IMGUI_API void          SetNavCursorVisible(bool visible);                                  // alter visibility of keyboard/gamepad cursor. by default: show when using an arrow key, hide when clicking with mouse.

    // Overlapping mode
-    IMGUI_API void          SetNextItemAllowOverlap();                                          // allow next item to be overlapped by a subsequent item. Useful with invisible buttons, selectable, treenode covering an area where subsequent items may need to be added. Note that both Selectable() and TreeNode() have dedicated flags doing this.
+    IMGUI_API void          SetNextItemAllowOverlap();                                          // allow next item to be overlapped by a subsequent item. Typically useful with InvisibleButton(), Selectable(), TreeNode() covering an area where subsequent items may need to be added. Note that both Selectable() and TreeNode() have dedicated flags doing this.

    // Item/Widgets Utilities and Query Functions
    // - Most of the functions are referring to the previous Item that has been submitted.
@@ -1017,6 +1023,7 @@ namespace ImGui
    IMGUI_API ImVec2        GetItemRectMin();                                                   // get upper-left bounding rectangle of the last item (screen space)
    IMGUI_API ImVec2        GetItemRectMax();                                                   // get lower-right bounding rectangle of the last item (screen space)
    IMGUI_API ImVec2        GetItemRectSize();                                                  // get size of last item
+    IMGUI_API ImGuiItemFlags GetItemFlags();                                                    // get generic flags of last item

    // Viewports
    // - Currently represents the Platform Window created by the application which is hosting our Dear ImGui windows.
@@ -1047,19 +1054,22 @@ namespace ImGui
    IMGUI_API void          ColorConvertRGBtoHSV(float r, float g, float b, float& out_h, float& out_s, float& out_v);
    IMGUI_API void          ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& out_g, float& out_b);

-    // Inputs Utilities: Keyboard/Mouse/Gamepad
+    // Inputs Utilities: Raw Keyboard/Mouse/Gamepad Access
+    // - Consider using the Shortcut() function instead of IsKeyPressed()/IsKeyChordPressed()! Shortcut() is easier to use and better featured (can do focus routing check).
    // - the ImGuiKey enum contains all possible keyboard, mouse and gamepad inputs (e.g. ImGuiKey_A, ImGuiKey_MouseLeft, ImGuiKey_GamepadDpadUp...).
-    // - (legacy: before v1.87, we used ImGuiKey to carry native/user indices as defined by each backends. This was obsoleted in 1.87 (2022-02) and completely removed in 1.91.5 (2024-11). See https://github.com/ocornut/imgui/issues/4921)
-    // - (legacy: any use of ImGuiKey will assert when key < 512 to detect passing legacy native/user indices)
+    // - (legacy: before v1.87 (2022-02), we used ImGuiKey < 512 values to carry native/user indices as defined by each backends. This was obsoleted in 1.87 (2022-02) and completely removed in 1.91.5 (2024-11). See https://github.com/ocornut/imgui/issues/4921)
    IMGUI_API bool          IsKeyDown(ImGuiKey key);                                            // is key being held.
-    IMGUI_API bool          IsKeyPressed(ImGuiKey key, bool repeat = true);                     // was key pressed (went from !Down to Down)? if repeat=true, uses io.KeyRepeatDelay / KeyRepeatRate
+    IMGUI_API bool          IsKeyPressed(ImGuiKey key, bool repeat = true);                     // was key pressed (went from !Down to Down)? Repeat rate uses io.KeyRepeatDelay / KeyRepeatRate.
    IMGUI_API bool          IsKeyReleased(ImGuiKey key);                                        // was key released (went from Down to !Down)?
    IMGUI_API bool          IsKeyChordPressed(ImGuiKeyChord key_chord);                         // was key chord (mods + key) pressed, e.g. you can pass 'ImGuiMod_Ctrl | ImGuiKey_S' as a key-chord. This doesn't do any routing or focus check, please consider using Shortcut() function instead.
    IMGUI_API int           GetKeyPressedAmount(ImGuiKey key, float repeat_delay, float rate);  // uses provided repeat rate/delay. return a count, most often 0 or 1 but might be >1 if RepeatRate is small enough that DeltaTime > RepeatRate
    IMGUI_API const char*   GetKeyName(ImGuiKey key);                                           // [DEBUG] returns English name of the key. Those names are provided for debugging purpose and are not meant to be saved persistently nor compared.
    IMGUI_API void          SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard);        // Override io.WantCaptureKeyboard flag next frame (said flag is left for your application to handle, typically when true it instructs your app to ignore inputs). e.g. force capture keyboard when your widget is being hovered. This is equivalent to setting "io.WantCaptureKeyboard = want_capture_keyboard"; after the next NewFrame() call.

-    // Inputs Utilities: Shortcut Testing & Routing [BETA]
+    // Inputs Utilities: Shortcut Testing & Routing
+    // - Typical use is e.g.: 'if (ImGui::Shortcut(ImGuiMod_Ctrl | ImGuiKey_S)) { ... }'.
+    // - Flags: Default route use ImGuiInputFlags_RouteFocused, but see ImGuiInputFlags_RouteGlobal and other options in ImGuiInputFlags_!
+    // - Flags: Use ImGuiInputFlags_Repeat to support repeat.
    // - ImGuiKeyChord = a ImGuiKey + optional ImGuiMod_Alt/ImGuiMod_Ctrl/ImGuiMod_Shift/ImGuiMod_Super.
    //       ImGuiKey_C                          // Accepted by functions taking ImGuiKey or ImGuiKeyChord arguments
    //       ImGuiMod_Ctrl | ImGuiKey_C          // Accepted by functions taking ImGuiKeyChord arguments
@@ -1071,8 +1081,10 @@ namespace ImGui
    //   The whole system is order independent, so if Child1 makes its calls before Parent, results will be identical.
    //   This is an important property as it facilitate working with foreign code or larger codebase.
    // - To understand the difference:
-    //   - IsKeyChordPressed() compares mods and call IsKeyPressed() -> function has no side-effect.
-    //   - Shortcut() submits a route, routes are resolved, if it currently can be routed it calls IsKeyChordPressed() -> function has (desirable) side-effects as it can prevents another call from getting the route.
+    //   - IsKeyChordPressed() compares mods and call IsKeyPressed()
+    //     -> the function has no side-effect.
+    //   - Shortcut() submits a route, routes are resolved, if it currently can be routed it calls IsKeyChordPressed()
+    //     -> the function has (desirable) side-effects as it can prevents another call from getting the route.
    // - Visualize registered routes in 'Metrics/Debugger->Inputs'.
    IMGUI_API bool          Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags = 0);
    IMGUI_API void          SetNextItemShortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags = 0);
@@ -1122,7 +1134,9 @@ namespace ImGui
    IMGUI_API const char*   SaveIniSettingsToMemory(size_t* out_ini_size = NULL);               // return a zero-terminated string with the .ini data which you can save by your own mean. call when io.WantSaveIniSettings is set, then save data by your own mean and clear io.WantSaveIniSettings.

    // Debug Utilities
-    // - Your main debugging friend is the ShowMetricsWindow() function, which is also accessible from Demo->Tools->Metrics Debugger
+    // - Your main debugging friend is the ShowMetricsWindow() function.
+    // - Interactive tools are all accessible from the 'Dear ImGui Demo->Tools' menu.
+    // - Read https://github.com/ocornut/imgui/wiki/Debug-Tools for a description of all available debug tools.
    IMGUI_API void          DebugTextEncoding(const char* text);
    IMGUI_API void          DebugFlashStyleColor(ImGuiCol idx);
    IMGUI_API void          DebugStartItemPicker();
@@ -1218,7 +1232,7 @@ enum ImGuiChildFlags_
 };

 // Flags for ImGui::PushItemFlag()
-// (Those are shared by all items)
+// (Those are shared by all submitted items)
 enum ImGuiItemFlags_
 {
    ImGuiItemFlags_None                     = 0,        // (Default)
@@ -1228,6 +1242,7 @@ enum ImGuiItemFlags_
    ImGuiItemFlags_ButtonRepeat             = 1 << 3,   // false    // Any button-like behavior will have repeat mode enabled (based on io.KeyRepeatDelay and io.KeyRepeatRate values). Note that you can also call IsItemActive() after any button to tell if it is being held.
    ImGuiItemFlags_AutoClosePopups          = 1 << 4,   // true     // MenuItem()/Selectable() automatically close their parent popup window.
    ImGuiItemFlags_AllowDuplicateId         = 1 << 5,   // false    // Allow submitting an item with the same identifier as an item already submitted this frame without triggering a warning tooltip if io.ConfigDebugHighlightIdConflicts is set.
+    ImGuiItemFlags_Disabled                 = 1 << 6,   // false    // [Internal] Disable interactions. DOES NOT affect visuals. This is used by BeginDisabled()/EndDisabled() and only provided here so you can read back via GetItemFlags().
 };

 // Flags for ImGui::InputText()
@@ -1246,7 +1261,7 @@ enum ImGuiInputTextFlags_
    ImGuiInputTextFlags_AllowTabInput       = 1 << 5,   // Pressing TAB input a '\t' character into the text field
    ImGuiInputTextFlags_EnterReturnsTrue    = 1 << 6,   // Return 'true' when Enter is pressed (as opposed to every time the value was modified). Consider using IsItemDeactivatedAfterEdit() instead!
    ImGuiInputTextFlags_EscapeClearsAll     = 1 << 7,   // Escape key clears content if not empty, and deactivate otherwise (contrast to default behavior of Escape to revert)
-    ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 8,   // In multi-line mode, validate with Enter, add new line with Ctrl+Enter (default is opposite: validate with Ctrl+Enter, add line with Enter).
+    ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 8,   // In multi-line mode: validate with Enter, add new line with Ctrl+Enter (default is opposite: validate with Ctrl+Enter, add line with Enter). Note that Shift+Enter always enter a new line either way.

    // Other options
    ImGuiInputTextFlags_ReadOnly            = 1 << 9,   // Read-only mode
@@ -1288,13 +1303,13 @@ enum ImGuiTreeNodeFlags_
    ImGuiTreeNodeFlags_None                 = 0,
    ImGuiTreeNodeFlags_Selected             = 1 << 0,   // Draw as selected
    ImGuiTreeNodeFlags_Framed               = 1 << 1,   // Draw frame with background (e.g. for CollapsingHeader)
-    ImGuiTreeNodeFlags_AllowOverlap         = 1 << 2,   // Hit testing to allow subsequent widgets to overlap this one
+    ImGuiTreeNodeFlags_AllowOverlap         = 1 << 2,   // Hit testing will allow subsequent widgets to overlap this one. Require previous frame HoveredId to match before being usable. Shortcut to calling SetNextItemAllowOverlap().
    ImGuiTreeNodeFlags_NoTreePushOnOpen     = 1 << 3,   // Don't do a TreePush() when open (e.g. for CollapsingHeader) = no extra indent nor pushing on ID stack
    ImGuiTreeNodeFlags_NoAutoOpenOnLog      = 1 << 4,   // Don't automatically and temporarily open node when Logging is active (by default logging will automatically open tree nodes)
    ImGuiTreeNodeFlags_DefaultOpen          = 1 << 5,   // Default node to be open
    ImGuiTreeNodeFlags_OpenOnDoubleClick    = 1 << 6,   // Open on double-click instead of simple click (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
    ImGuiTreeNodeFlags_OpenOnArrow          = 1 << 7,   // Open when clicking on the arrow part (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
-    ImGuiTreeNodeFlags_Leaf                 = 1 << 8,   // No collapsing, no arrow (use as a convenience for leaf nodes).
+    ImGuiTreeNodeFlags_Leaf                 = 1 << 8,   // No collapsing, no arrow (use as a convenience for leaf nodes). Note: will always open a tree/id scope and return true. If you never use that scope, add ImGuiTreeNodeFlags_NoTreePushOnOpen.
    ImGuiTreeNodeFlags_Bullet               = 1 << 9,   // Display a bullet instead of arrow. IMPORTANT: node can still be marked open/close if you don't set the _Leaf flag!
    ImGuiTreeNodeFlags_FramePadding         = 1 << 10,  // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding() before the node.
    ImGuiTreeNodeFlags_SpanAvailWidth       = 1 << 11,  // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line without using AllowOverlap mode.
@@ -1320,21 +1335,14 @@ enum ImGuiTreeNodeFlags_
 };

 // Flags for OpenPopup*(), BeginPopupContext*(), IsPopupOpen() functions.
-// - To be backward compatible with older API which took an 'int mouse_button = 1' argument instead of 'ImGuiPopupFlags flags',
-//   we need to treat small flags values as a mouse button index, so we encode the mouse button in the first few bits of the flags.
-//   It is therefore guaranteed to be legal to pass a mouse button index in ImGuiPopupFlags.
-// - For the same reason, we exceptionally default the ImGuiPopupFlags argument of BeginPopupContextXXX functions to 1 instead of 0.
-//   IMPORTANT: because the default parameter is 1 (==ImGuiPopupFlags_MouseButtonRight), if you rely on the default parameter
-//   and want to use another flag, you need to pass in the ImGuiPopupFlags_MouseButtonRight flag explicitly.
+// - IMPORTANT: If you ever used the left mouse button with BeginPopupContextXXX() helpers before 1.92.6: Read "API BREAKING CHANGES" 2026/01/07 (1.92.6) entry in imgui.cpp or GitHub topic #9157.
 // - Multiple buttons currently cannot be combined/or-ed in those functions (we could allow it later).
 enum ImGuiPopupFlags_
 {
    ImGuiPopupFlags_None                    = 0,
-    ImGuiPopupFlags_MouseButtonLeft         = 0,        // For BeginPopupContext*(): open on Left Mouse release. Guaranteed to always be == 0 (same as ImGuiMouseButton_Left)
-    ImGuiPopupFlags_MouseButtonRight        = 1,        // For BeginPopupContext*(): open on Right Mouse release. Guaranteed to always be == 1 (same as ImGuiMouseButton_Right)
-    ImGuiPopupFlags_MouseButtonMiddle       = 2,        // For BeginPopupContext*(): open on Middle Mouse release. Guaranteed to always be == 2 (same as ImGuiMouseButton_Middle)
-    ImGuiPopupFlags_MouseButtonMask_        = 0x1F,
-    ImGuiPopupFlags_MouseButtonDefault_     = 1,
+    ImGuiPopupFlags_MouseButtonLeft         = 1 << 2,   // For BeginPopupContext*(): open on Left Mouse release. Only one button allowed!
+    ImGuiPopupFlags_MouseButtonRight        = 2 << 2,   // For BeginPopupContext*(): open on Right Mouse release. Only one button allowed! (default)
+    ImGuiPopupFlags_MouseButtonMiddle       = 3 << 2,   // For BeginPopupContext*(): open on Middle Mouse release. Only one button allowed!
    ImGuiPopupFlags_NoReopen                = 1 << 5,   // For OpenPopup*(), BeginPopupContext*(): don't reopen same popup if already open (won't reposition, won't reinitialize navigation)
    //ImGuiPopupFlags_NoReopenAlwaysNavInit = 1 << 6,   // For OpenPopup*(), BeginPopupContext*(): focus and initialize navigation even when not reopening.
    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 7,   // For OpenPopup*(), BeginPopupContext*(): don't open if there's already a popup at the same level of the popup stack
@@ -1342,6 +1350,9 @@ enum ImGuiPopupFlags_
    ImGuiPopupFlags_AnyPopupId              = 1 << 10,  // For IsPopupOpen(): ignore the ImGuiID parameter and test for any popup.
    ImGuiPopupFlags_AnyPopupLevel           = 1 << 11,  // For IsPopupOpen(): search/test at any level of the popup stack (default test in the current level)
    ImGuiPopupFlags_AnyPopup                = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel,
+    ImGuiPopupFlags_MouseButtonShift_       = 2,        // [Internal]
+    ImGuiPopupFlags_MouseButtonMask_        = 0x0C,     // [Internal]
+    ImGuiPopupFlags_InvalidMask_            = 0x03,     // [Internal] Reserve legacy bits 0-1 to detect incorrectly passing 1 or 2 to the function.
 };

 // Flags for ImGui::Selectable()
@@ -1352,7 +1363,7 @@ enum ImGuiSelectableFlags_
    ImGuiSelectableFlags_SpanAllColumns     = 1 << 1,   // Frame will span all columns of its container table (text will still fit in current column)
    ImGuiSelectableFlags_AllowDoubleClick   = 1 << 2,   // Generate press events on double clicks too
    ImGuiSelectableFlags_Disabled           = 1 << 3,   // Cannot be selected, display grayed out text
-    ImGuiSelectableFlags_AllowOverlap       = 1 << 4,   // (WIP) Hit testing to allow subsequent widgets to overlap this one
+    ImGuiSelectableFlags_AllowOverlap       = 1 << 4,   // Hit testing will allow subsequent widgets to overlap this one. Require previous frame HoveredId to match before being usable. Shortcut to calling SetNextItemAllowOverlap().
    ImGuiSelectableFlags_Highlight          = 1 << 5,   // Make the item be displayed as if it is hovered
    ImGuiSelectableFlags_SelectOnNav        = 1 << 6,   // Auto-select when moved into, unless Ctrl is held. Automatic when in a BeginMultiSelect() block.

@@ -1538,7 +1549,7 @@ enum ImGuiSortDirection : ImU8
 // All our named keys are >= 512. Keys value 0 to 511 are left unused and were legacy native/opaque key values (< 1.87).
 // Support for legacy keys was completely removed in 1.91.5.
 // Read details about the 1.87+ transition : https://github.com/ocornut/imgui/issues/4921
-// Note that "Keys" related to physical keys and are not the same concept as input "Characters", the later are submitted via io.AddInputCharacter().
+// Note that "Keys" related to physical keys and are not the same concept as input "Characters", the latter are submitted via io.AddInputCharacter().
 // The keyboard key enum values are named after the keys on a standard US keyboard, and on other keyboard types the keys reported may not match the keycaps.
 enum ImGuiKey : int
 {
@@ -1607,10 +1618,10 @@ enum ImGuiKey : int
    //                              // XBOX        | SWITCH  | PLAYSTA. | -> ACTION
    ImGuiKey_GamepadStart,          // Menu        | +       | Options  |
    ImGuiKey_GamepadBack,           // View        | -       | Share    |
-    ImGuiKey_GamepadFaceLeft,       // X           | Y       | Square   | Tap: Toggle Menu. Hold: Windowing mode (Focus/Move/Resize windows)
+    ImGuiKey_GamepadFaceLeft,       // X           | Y       | Square   | Toggle Menu. Hold for Windowing mode (Focus/Move/Resize windows)
    ImGuiKey_GamepadFaceRight,      // B           | A       | Circle   | Cancel / Close / Exit
-    ImGuiKey_GamepadFaceUp,         // Y           | X       | Triangle | Text Input / On-screen Keyboard
-    ImGuiKey_GamepadFaceDown,       // A           | B       | Cross    | Activate / Open / Toggle / Tweak
+    ImGuiKey_GamepadFaceUp,         // Y           | X       | Triangle | Open Context Menu
+    ImGuiKey_GamepadFaceDown,       // A           | B       | Cross    | Activate / Open / Toggle. Hold for 0.60f to Activate in Text Input mode (e.g. wired to an on-screen keyboard).
    ImGuiKey_GamepadDpadLeft,       // D-pad Left  | "       | "        | Move / Tweak / Resize Window (in Windowing mode)
    ImGuiKey_GamepadDpadRight,      // D-pad Right | "       | "        | Move / Tweak / Resize Window (in Windowing mode)
    ImGuiKey_GamepadDpadUp,         // D-pad Up    | "       | "        | Move / Tweak / Resize Window (in Windowing mode)
@@ -1692,19 +1703,19 @@ enum ImGuiInputFlags_
 };

 // Configuration flags stored in io.ConfigFlags. Set by user/application.
+// Note that nowadays most of our configuration options are in other ImGuiIO fields, e.g. io.ConfigWindowsMoveFromTitleBarOnly.
 enum ImGuiConfigFlags_
 {
    ImGuiConfigFlags_None                   = 0,
-    ImGuiConfigFlags_NavEnableKeyboard      = 1 << 0,   // Master keyboard navigation enable flag. Enable full Tabbing + directional arrows + space/enter to activate.
+    ImGuiConfigFlags_NavEnableKeyboard      = 1 << 0,   // Master keyboard navigation enable flag. Enable full Tabbing + directional arrows + Space/Enter to activate. Note: some features such as basic Tabbing and CtrL+Tab are enabled by regardless of this flag (and may be disabled via other means, see #4828, #9218).
    ImGuiConfigFlags_NavEnableGamepad       = 1 << 1,   // Master gamepad navigation enable flag. Backend also needs to set ImGuiBackendFlags_HasGamepad.
    ImGuiConfigFlags_NoMouse                = 1 << 4,   // Instruct dear imgui to disable mouse inputs and interactions.
    ImGuiConfigFlags_NoMouseCursorChange    = 1 << 5,   // Instruct backend to not alter mouse cursor shape and visibility. Use if the backend cursor changes are interfering with yours and you don't want to use SetMouseCursor() to change mouse cursor. You may want to honor requests from imgui by reading GetMouseCursor() yourself instead.
    ImGuiConfigFlags_NoKeyboard             = 1 << 6,   // Instruct dear imgui to disable keyboard inputs and interactions. This is done by ignoring keyboard events and clearing existing states.

-    // User storage (to allow your backend/engine to communicate to code that may be shared between multiple projects. Those flags are NOT used by core Dear ImGui)
+    // [Unused] User storage (to allow your backend/engine to communicate to code that may be shared between multiple projects. Those flags are NOT used by core Dear ImGui)
    ImGuiConfigFlags_IsSRGB                 = 1 << 20,  // Application is SRGB-aware.
    ImGuiConfigFlags_IsTouchScreen          = 1 << 21,  // Application is using a touch screen instead of a mouse.
-
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
    ImGuiConfigFlags_NavEnableSetMousePos   = 1 << 2,   // [moved/renamed in 1.91.4] -> use bool io.ConfigNavMoveSetMousePos
    ImGuiConfigFlags_NavNoCaptureKeyboard   = 1 << 3,   // [moved/renamed in 1.91.4] -> use bool io.ConfigNavCaptureKeyboard
@@ -1829,6 +1840,7 @@ enum ImGuiStyleVar_
    ImGuiStyleVar_ScrollbarPadding,         // float     ScrollbarPadding
    ImGuiStyleVar_GrabMinSize,              // float     GrabMinSize
    ImGuiStyleVar_GrabRounding,             // float     GrabRounding
+    ImGuiStyleVar_ImageRounding,            // float     ImageRounding
    ImGuiStyleVar_ImageBorderSize,          // float     ImageBorderSize
    ImGuiStyleVar_TabRounding,              // float     TabRounding
    ImGuiStyleVar_TabBorderSize,            // float     TabBorderSize
@@ -1842,6 +1854,7 @@ enum ImGuiStyleVar_
    ImGuiStyleVar_TreeLinesRounding,        // float     TreeLinesRounding
    ImGuiStyleVar_ButtonTextAlign,          // ImVec2    ButtonTextAlign
    ImGuiStyleVar_SelectableTextAlign,      // ImVec2    SelectableTextAlign
+    ImGuiStyleVar_SeparatorSize,            // float     SeparatorSize
    ImGuiStyleVar_SeparatorTextBorderSize,  // float     SeparatorTextBorderSize
    ImGuiStyleVar_SeparatorTextAlign,       // ImVec2    SeparatorTextAlign
    ImGuiStyleVar_SeparatorTextPadding,     // ImVec2    SeparatorTextPadding
@@ -1857,6 +1870,7 @@ enum ImGuiButtonFlags_
    ImGuiButtonFlags_MouseButtonMiddle      = 1 << 2,   // React on center mouse button
    ImGuiButtonFlags_MouseButtonMask_       = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle, // [Internal]
    ImGuiButtonFlags_EnableNav              = 1 << 3,   // InvisibleButton(): do not disable navigation/tabbing. Otherwise disabled by default.
+    ImGuiButtonFlags_AllowOverlap           = 1 << 12,  // Hit testing will allow subsequent widgets to overlap this one. Require previous frame HoveredId to match before being usable. Shortcut to calling SetNextItemAllowOverlap().
 };

 // Flags for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4() / ColorButton()
@@ -1871,19 +1885,20 @@ enum ImGuiColorEditFlags_
    ImGuiColorEditFlags_NoTooltip       = 1 << 6,   //              // ColorEdit, ColorPicker, ColorButton: disable tooltip when hovering the preview.
    ImGuiColorEditFlags_NoLabel         = 1 << 7,   //              // ColorEdit, ColorPicker: disable display of inline text label (the label is still forwarded to the tooltip and picker).
    ImGuiColorEditFlags_NoSidePreview   = 1 << 8,   //              // ColorPicker: disable bigger color preview on right side of the picker, use small color square preview instead.
-    ImGuiColorEditFlags_NoDragDrop      = 1 << 9,   //              // ColorEdit: disable drag and drop target. ColorButton: disable drag and drop source.
+    ImGuiColorEditFlags_NoDragDrop      = 1 << 9,   //              // ColorEdit: disable drag and drop target/source. ColorButton: disable drag and drop source.
    ImGuiColorEditFlags_NoBorder        = 1 << 10,  //              // ColorButton: disable border (which is enforced by default)
+    ImGuiColorEditFlags_NoColorMarkers  = 1 << 11,  //              // ColorEdit: disable rendering R/G/B/A color marker. May also be disabled globally by setting style.ColorMarkerSize = 0.

    // Alpha preview
    // - Prior to 1.91.8 (2025/01/21): alpha was made opaque in the preview by default using old name ImGuiColorEditFlags_AlphaPreview.
    // - We now display the preview as transparent by default. You can use ImGuiColorEditFlags_AlphaOpaque to use old behavior.
    // - The new flags may be combined better and allow finer controls.
-    ImGuiColorEditFlags_AlphaOpaque     = 1 << 11,  //              // ColorEdit, ColorPicker, ColorButton: disable alpha in the preview,. Contrary to _NoAlpha it may still be edited when calling ColorEdit4()/ColorPicker4(). For ColorButton() this does the same as _NoAlpha.
-    ImGuiColorEditFlags_AlphaNoBg       = 1 << 12,  //              // ColorEdit, ColorPicker, ColorButton: disable rendering a checkerboard background behind transparent color.
-    ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 13,  //              // ColorEdit, ColorPicker, ColorButton: display half opaque / half transparent preview.
+    ImGuiColorEditFlags_AlphaOpaque     = 1 << 12,  //              // ColorEdit, ColorPicker, ColorButton: disable alpha in the preview,. Contrary to _NoAlpha it may still be edited when calling ColorEdit4()/ColorPicker4(). For ColorButton() this does the same as _NoAlpha.
+    ImGuiColorEditFlags_AlphaNoBg       = 1 << 13,  //              // ColorEdit, ColorPicker, ColorButton: disable rendering a checkerboard background behind transparent color.
+    ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 14,  //              // ColorEdit, ColorPicker, ColorButton: display half opaque / half transparent preview.

    // User Options (right-click on widget to change some of them).
-    ImGuiColorEditFlags_AlphaBar        = 1 << 16,  //              // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker.
+    ImGuiColorEditFlags_AlphaBar        = 1 << 18,  //              // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker.
    ImGuiColorEditFlags_HDR             = 1 << 19,  //              // (WIP) ColorEdit: Currently only disable 0.0f..1.0f limits in RGBA edition (note: you probably want to use ImGuiColorEditFlags_Float flag as well).
    ImGuiColorEditFlags_DisplayRGB      = 1 << 20,  // [Display]    // ColorEdit: override _display_ type among RGB/HSV/Hex. ColorPicker: select any combination using one or more of RGB/HSV/Hex.
    ImGuiColorEditFlags_DisplayHSV      = 1 << 21,  // [Display]    // "
@@ -1926,8 +1941,9 @@ enum ImGuiSliderFlags_
    ImGuiSliderFlags_ClampOnInput       = 1 << 9,       // Clamp value to min/max bounds when input manually with Ctrl+Click. By default Ctrl+Click allows going out of bounds.
    ImGuiSliderFlags_ClampZeroRange     = 1 << 10,      // Clamp even if min==max==0.0f. Otherwise due to legacy reason DragXXX functions don't clamp with those values. When your clamping limits are dynamic you almost always want to use it.
    ImGuiSliderFlags_NoSpeedTweaks      = 1 << 11,      // Disable keyboard modifiers altering tweak speed. Useful if you want to alter tweak speed yourself based on your own logic.
+    ImGuiSliderFlags_ColorMarkers       = 1 << 12,      // DragScalarN(), SliderScalarN(): Draw R/G/B/A color markers on each component.
    ImGuiSliderFlags_AlwaysClamp        = ImGuiSliderFlags_ClampOnInput | ImGuiSliderFlags_ClampZeroRange,
-    ImGuiSliderFlags_InvalidMask_       = 0x7000000F,   // [Internal] We treat using those bits as being potentially a 'float power' argument from the previous API that has got miscast to this enum, and will trigger an assert if needed.
+    ImGuiSliderFlags_InvalidMask_       = 0x7000000F,   // [Internal] We treat using those bits as being potentially a 'float power' argument from legacy API (obsoleted 2020-08) that has got miscast to this enum, and will trigger an assert if needed.
 };

 // Identify a mouse button.
@@ -2014,11 +2030,11 @@ enum ImGuiTableFlags_
    // Features
    ImGuiTableFlags_None                       = 0,
    ImGuiTableFlags_Resizable                  = 1 << 0,   // Enable resizing columns.
-    ImGuiTableFlags_Reorderable                = 1 << 1,   // Enable reordering columns in header row (need calling TableSetupColumn() + TableHeadersRow() to display headers)
+    ImGuiTableFlags_Reorderable                = 1 << 1,   // Enable reordering columns in header row. (Need calling TableSetupColumn() + TableHeadersRow() to display headers, or using ImGuiTableFlags_ContextMenuInBody to access context-menu without headers).
    ImGuiTableFlags_Hideable                   = 1 << 2,   // Enable hiding/disabling columns in context menu.
    ImGuiTableFlags_Sortable                   = 1 << 3,   // Enable sorting. Call TableGetSortSpecs() to obtain sort specs. Also see ImGuiTableFlags_SortMulti and ImGuiTableFlags_SortTristate.
-    ImGuiTableFlags_NoSavedSettings            = 1 << 4,   // Disable persisting columns order, width and sort settings in the .ini file.
-    ImGuiTableFlags_ContextMenuInBody          = 1 << 5,   // Right-click on columns body/contents will display table context menu. By default it is available in TableHeadersRow().
+    ImGuiTableFlags_NoSavedSettings            = 1 << 4,   // Disable persisting columns order, width, visibility and sort settings in the .ini file.
+    ImGuiTableFlags_ContextMenuInBody          = 1 << 5,   // Right-click on columns body/contents will also display table context menu. By default it is available in TableHeadersRow().
    // Decorations
    ImGuiTableFlags_RowBg                      = 1 << 6,   // Set each RowBg color with ImGuiCol_TableRowBg or ImGuiCol_TableRowBgAlt (equivalent of calling TableSetBgColor with ImGuiTableBgFlags_RowBg0 on each row manually)
    ImGuiTableFlags_BordersInnerH              = 1 << 7,   // Draw horizontal borders between rows.
@@ -2133,7 +2149,7 @@ struct ImGuiTableSortSpecs
    int                         SpecsCount;     // Sort spec count. Most often 1. May be > 1 when ImGuiTableFlags_SortMulti is enabled. May be == 0 when ImGuiTableFlags_SortTristate is enabled.
    bool                        SpecsDirty;     // Set to true when specs have changed since last time! Use this to sort again, then clear the flag.

-    ImGuiTableSortSpecs()       { memset(this, 0, sizeof(*this)); }
+    ImGuiTableSortSpecs()       { memset((void*)this, 0, sizeof(*this)); }
 };

 // Sorting specification for one column of a table (sizeof == 12 bytes)
@@ -2144,7 +2160,7 @@ struct ImGuiTableColumnSortSpecs
    ImS16                       SortOrder;          // Index within parent ImGuiTableSortSpecs (always stored in order starting from 0, tables sorted on a single criteria will always have a 0 here)
    ImGuiSortDirection          SortDirection;      // ImGuiSortDirection_Ascending or ImGuiSortDirection_Descending

-    ImGuiTableColumnSortSpecs() { memset(this, 0, sizeof(*this)); }
+    ImGuiTableColumnSortSpecs() { memset((void*)this, 0, sizeof(*this)); }
 };

 //-----------------------------------------------------------------------------
@@ -2267,7 +2283,7 @@ struct ImGuiStyle
    // - recap: ImGui::GetFontSize() == FontSizeBase * (FontScaleMain * FontScaleDpi * other_scaling_factors)
    float       FontSizeBase;               // Current base font size before external global factors are applied. Use PushFont(NULL, size) to modify. Use ImGui::GetFontSize() to obtain scaled value.
    float       FontScaleMain;              // Main global scale factor. May be set by application once, or exposed to end-user.
-    float       FontScaleDpi;               // Additional global scale factor from viewport/monitor contents scale. When io.ConfigDpiScaleFonts is enabled, this is automatically overwritten when changing monitor DPI.
+    float       FontScaleDpi;               // Additional global scale factor from viewport/monitor contents scale. In docking branch: when io.ConfigDpiScaleFonts is enabled, this is automatically overwritten when changing monitor DPI.

    float       Alpha;                      // Global alpha applies to everything in Dear ImGui.
    float       DisabledAlpha;              // Additional alpha multiplier applied by BeginDisabled(). Multiply over current value of Alpha.
@@ -2297,6 +2313,7 @@ struct ImGuiStyle
    float       GrabMinSize;                // Minimum width/height of a grab box for slider/scrollbar.
    float       GrabRounding;               // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
    float       LogSliderDeadzone;          // The size in pixels of the dead-zone around zero on logarithmic sliders that cross zero.
+    float       ImageRounding;              // Rounding of Image() calls.
    float       ImageBorderSize;            // Thickness of border around Image() calls.
    float       TabRounding;                // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
    float       TabBorderSize;              // Thickness of border around tabs.
@@ -2314,9 +2331,11 @@ struct ImGuiStyle
    float       DragDropTargetRounding;     // Radius of the drag and drop target frame.
    float       DragDropTargetBorderSize;   // Thickness of the drag and drop target border.
    float       DragDropTargetPadding;      // Size to expand the drag and drop target from actual target item size.
+    float       ColorMarkerSize;            // Size of R/G/B/A color markers for ColorEdit4() and for Drags/Sliders when using ImGuiSliderFlags_ColorMarkers.
    ImGuiDir    ColorButtonPosition;        // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right.
    ImVec2      ButtonTextAlign;            // Alignment of button text when button is larger than text. Defaults to (0.5f, 0.5f) (centered).
    ImVec2      SelectableTextAlign;        // Alignment of selectable text. Defaults to (0.0f, 0.0f) (top-left aligned). It's generally important to keep this left-aligned if you want to lay multiple items on a same line.
+    float       SeparatorSize;              // Thickness of border in Separator()
    float       SeparatorTextBorderSize;    // Thickness of border in SeparatorText()
    ImVec2      SeparatorTextAlign;         // Alignment of text within the separator. Defaults to (0.0f, 0.5f) (left aligned, center).
    ImVec2      SeparatorTextPadding;       // Horizontal offset of text from each edge of the separator + spacing on other axis. Generally small values. .y is recommended to be == FramePadding.y.
@@ -2341,7 +2360,7 @@ struct ImGuiStyle
    ImGuiHoveredFlags HoverFlagsForTooltipNav;  // Default flags when using IsItemHovered(ImGuiHoveredFlags_ForTooltip) or BeginItemTooltip()/SetItemTooltip() while using keyboard/gamepad.

    // [Internal]
-    float       _MainScale;                 // FIXME-WIP: Reference scale, as applied by ScaleAllSizes().
+    float       _MainScale;                 // FIXME-WIP: Reference scale, as applied by ScaleAllSizes(). PLEASE DO NOT USE THIS FOR NOW.
    float       _NextFrameFontSizeBase;     // FIXME: Temporary hack until we finish remaining work.

    // Functions
@@ -2412,7 +2431,7 @@ struct ImGuiIO
    bool        ConfigMacOSXBehaviors;          // = defined(__APPLE__) // Swap Cmd<>Ctrl keys + OS X style text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl.
    bool        ConfigInputTrickleEventQueue;   // = true           // Enable input queue trickling: some types of events submitted during the same frame (e.g. button down + up) will be spread over multiple frames, improving interactions with low framerates.
    bool        ConfigInputTextCursorBlink;     // = true           // Enable blinking cursor (optional as some users consider it to be distracting).
-    bool        ConfigInputTextEnterKeepActive; // = false          // [BETA] Pressing Enter will keep item active and select contents (single-line only).
+    bool        ConfigInputTextEnterKeepActive; // = false          // [BETA] Pressing Enter will reactivate item and select all text (single-line only).
    bool        ConfigDragClickToInputText;     // = false          // [BETA] Enable turning DragXXX widgets into text input with a simple mouse click-release (without moving). Not desirable on devices without a keyboard.
    bool        ConfigWindowsResizeFromEdges;   // = true           // Enable resizing of windows from their edges and from the lower-left corner. This requires ImGuiBackendFlags_HasMouseCursors for better mouse cursor feedback. (This used to be a per-window ImGuiWindowFlags_ResizeFromAnySide flag)
    bool        ConfigWindowsMoveFromTitleBarOnly;  // = false      // Enable allowing to move windows only when clicking on their title bar. Does not apply to windows without a title bar.
@@ -2434,7 +2453,7 @@ struct ImGuiIO

    // Options to configure Error Handling and how we handle recoverable errors [EXPERIMENTAL]
    // - Error recovery is provided as a way to facilitate:
-    //    - Recovery after a programming error (native code or scripting language - the later tends to facilitate iterating on code while running).
+    //    - Recovery after a programming error (native code or scripting language - the latter tends to facilitate iterating on code while running).
    //    - Recovery after running an exception handler or any error processing which may skip code after an error has been detected.
    // - Error recovery is not perfect nor guaranteed! It is a feature to ease development.
    //   You not are not supposed to rely on it in the course of a normal application run.
@@ -2623,18 +2642,20 @@ struct ImGuiInputTextCallbackData
    ImGuiInputTextFlags EventFlag;      // One ImGuiInputTextFlags_Callback*    // Read-only
    ImGuiInputTextFlags Flags;          // What user passed to InputText()      // Read-only
    void*               UserData;       // What user passed to InputText()      // Read-only
+    ImGuiID             ID;             // Widget ID                             // Read-only

    // Arguments for the different callback events
    // - During Resize callback, Buf will be same as your input buffer.
    // - However, during Completion/History/Always callback, Buf always points to our own internal data (it is not the same as your buffer)! Changes to it will be reflected into your own buffer shortly after the callback.
    // - To modify the text buffer in a callback, prefer using the InsertChars() / DeleteChars() function. InsertChars() will take care of calling the resize callback if necessary.
    // - If you know your edits are not going to resize the underlying buffer allocation, you may modify the contents of 'Buf[]' directly. You need to update 'BufTextLen' accordingly (0 <= BufTextLen < BufSize) and set 'BufDirty'' to true so InputText can update its internal state.
-    ImWchar             EventChar;      // Character input                      // Read-write   // [CharFilter] Replace character with another one, or set to zero to drop. return 1 is equivalent to setting EventChar=0;
    ImGuiKey            EventKey;       // Key pressed (Up/Down/TAB)            // Read-only    // [Completion,History]
+    ImWchar             EventChar;      // Character input                      // Read-write   // [CharFilter] Replace character with another one, or set to zero to drop. return 1 is equivalent to setting EventChar=0;
+    bool                EventActivated; // Input field just got activated       // Read-only    // [Always]
+    bool                BufDirty;       // Set if you modify Buf/BufTextLen!    // Write        // [Completion,History,Always]
    char*               Buf;            // Text buffer                          // Read-write   // [Resize] Can replace pointer / [Completion,History,Always] Only write to pointed data, don't replace the actual pointer!
    int                 BufTextLen;     // Text length (in bytes)               // Read-write   // [Resize,Completion,History,Always] Exclude zero-terminator storage. In C land: == strlen(some_text), in C++ land: string.length()
    int                 BufSize;        // Buffer size (in bytes) = capacity+1  // Read-only    // [Resize,Completion,History,Always] Include zero-terminator storage. In C land: == ARRAYSIZE(my_char_array), in C++ land: string.capacity()+1
-    bool                BufDirty;       // Set if you modify Buf/BufTextLen!    // Write        // [Completion,History,Always]
    int                 CursorPos;      //                                      // Read-write   // [Completion,History,Always]
    int                 SelectionStart; //                                      // Read-write   // [Completion,History,Always] == to SelectionEnd when no selection
    int                 SelectionEnd;   //                                      // Read-write   // [Completion,History,Always]
@@ -2644,9 +2665,10 @@ struct ImGuiInputTextCallbackData
    IMGUI_API ImGuiInputTextCallbackData();
    IMGUI_API void      DeleteChars(int pos, int bytes_count);
    IMGUI_API void      InsertChars(int pos, const char* text, const char* text_end = NULL);
-    void                SelectAll()             { SelectionStart = 0; SelectionEnd = BufTextLen; }
-    void                ClearSelection()        { SelectionStart = SelectionEnd = BufTextLen; }
-    bool                HasSelection() const    { return SelectionStart != SelectionEnd; }
+    void                SelectAll()                 { SelectionStart = 0; CursorPos = SelectionEnd = BufTextLen; }
+    void                SetSelection(int s, int e)  { IM_ASSERT(s >= 0 && s <= BufTextLen); IM_ASSERT(e >= 0 && e <= BufTextLen); SelectionStart = s; CursorPos = SelectionEnd = e; }
+    void                ClearSelection()            { SelectionStart = SelectionEnd = BufTextLen; }
+    bool                HasSelection() const        { return SelectionStart != SelectionEnd; }
 };

 // Resizing callback data to apply custom constraint. As enabled by SetNextWindowSizeConstraints(). Callback is called during the next Begin().
@@ -2834,15 +2856,16 @@ enum ImGuiListClipperFlags_
 // - The clipper also handles various subtleties related to keyboard/gamepad navigation, wrapping etc.
 struct ImGuiListClipper
 {
-    ImGuiContext*   Ctx;                // Parent UI context
    int             DisplayStart;       // First item to display, updated by each call to Step()
    int             DisplayEnd;         // End of items to display (exclusive)
+    int             UserIndex;          // Helper storage for user convenience/code. Optional, and otherwise unused if you don't use it.
    int             ItemsCount;         // [Internal] Number of items
    float           ItemsHeight;        // [Internal] Height of item after a first step and item submission can calculate it
+    ImGuiListClipperFlags Flags;        // [Internal] Flags, currently not yet well exposed.
    double          StartPosY;          // [Internal] Cursor position at the time of Begin() or after table frozen rows are all processed
    double          StartSeekOffsetY;   // [Internal] Account for frozen rows in a table and initial loss of precision in very large windows.
+    ImGuiContext*   Ctx;                // [Internal] Parent UI context
    void*           TempData;           // [Internal] Internal data
-    ImGuiListClipperFlags Flags;        // [Internal] Flags, currently not yet well exposed.

    // items_count: Use INT_MAX if you don't know how many items you have (in which case the cursor won't be advanced in the final step, and you can call SeekCursorForItem() manually if you need)
    // items_height: Use -1.0f to be calculated automatically on first step. Otherwise pass in the distance between your items, typically GetTextLineHeightWithSpacing() or GetFrameHeightWithSpacing().
@@ -2865,7 +2888,7 @@ struct ImGuiListClipper
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
    //inline void IncludeRangeByIndices(int item_begin, int item_end)      { IncludeItemsByIndex(item_begin, item_end); } // [renamed in 1.89.9]
    //inline void ForceDisplayRangeByIndices(int item_begin, int item_end) { IncludeItemsByIndex(item_begin, item_end); } // [renamed in 1.89.6]
-    //inline ImGuiListClipper(int items_count, float items_height = -1.0f) { memset(this, 0, sizeof(*this)); ItemsCount = -1; Begin(items_count, items_height); } // [removed in 1.79]
+    //inline ImGuiListClipper(int items_count, float items_height = -1.0f) { memset((void*)this, 0, sizeof(*this)); ItemsCount = -1; Begin(items_count, items_height); } // [removed in 1.79]
 #endif
 };

@@ -2873,17 +2896,18 @@ struct ImGuiListClipper
 // - It is important that we are keeping those disabled by default so they don't leak in user space.
 // - This is in order to allow user enabling implicit cast operators between ImVec2/ImVec4 and their own types (using IM_VEC2_CLASS_EXTRA in imconfig.h)
 // - Add '#define IMGUI_DEFINE_MATH_OPERATORS' before including this file (or in imconfig.h) to access courtesy maths operators for ImVec2 and ImVec4.
-// - We intentionally provide ImVec2*float but not float*ImVec2: this is rare enough and we want to reduce the surface for possible user mistake.
 #ifdef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS_IMPLEMENTED
 IM_MSVC_RUNTIME_CHECKS_OFF
 // ImVec2 operators
 inline ImVec2  operator*(const ImVec2& lhs, const float rhs)    { return ImVec2(lhs.x * rhs, lhs.y * rhs); }
+inline ImVec2  operator*(const float lhs, const ImVec2& rhs)    { return ImVec2(lhs * rhs.x, lhs * rhs.y); }
 inline ImVec2  operator/(const ImVec2& lhs, const float rhs)    { return ImVec2(lhs.x / rhs, lhs.y / rhs); }
 inline ImVec2  operator+(const ImVec2& lhs, const ImVec2& rhs)  { return ImVec2(lhs.x + rhs.x, lhs.y + rhs.y); }
 inline ImVec2  operator-(const ImVec2& lhs, const ImVec2& rhs)  { return ImVec2(lhs.x - rhs.x, lhs.y - rhs.y); }
 inline ImVec2  operator*(const ImVec2& lhs, const ImVec2& rhs)  { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); }
 inline ImVec2  operator/(const ImVec2& lhs, const ImVec2& rhs)  { return ImVec2(lhs.x / rhs.x, lhs.y / rhs.y); }
+inline ImVec2  operator+(const ImVec2& lhs)                     { return lhs; }
 inline ImVec2  operator-(const ImVec2& lhs)                     { return ImVec2(-lhs.x, -lhs.y); }
 inline ImVec2& operator*=(ImVec2& lhs, const float rhs)         { lhs.x *= rhs; lhs.y *= rhs; return lhs; }
 inline ImVec2& operator/=(ImVec2& lhs, const float rhs)         { lhs.x /= rhs; lhs.y /= rhs; return lhs; }
@@ -2895,12 +2919,20 @@ inline bool    operator==(const ImVec2& lhs, const ImVec2& rhs) { return lhs.x =
 inline bool    operator!=(const ImVec2& lhs, const ImVec2& rhs) { return lhs.x != rhs.x || lhs.y != rhs.y; }
 // ImVec4 operators
 inline ImVec4  operator*(const ImVec4& lhs, const float rhs)    { return ImVec4(lhs.x * rhs, lhs.y * rhs, lhs.z * rhs, lhs.w * rhs); }
+inline ImVec4  operator*(const float lhs, const ImVec4& rhs)    { return ImVec4(lhs * rhs.x, lhs * rhs.y, lhs * rhs.z, lhs * rhs.w); }
 inline ImVec4  operator/(const ImVec4& lhs, const float rhs)    { return ImVec4(lhs.x / rhs, lhs.y / rhs, lhs.z / rhs, lhs.w / rhs); }
 inline ImVec4  operator+(const ImVec4& lhs, const ImVec4& rhs)  { return ImVec4(lhs.x + rhs.x, lhs.y + rhs.y, lhs.z + rhs.z, lhs.w + rhs.w); }
 inline ImVec4  operator-(const ImVec4& lhs, const ImVec4& rhs)  { return ImVec4(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z, lhs.w - rhs.w); }
 inline ImVec4  operator*(const ImVec4& lhs, const ImVec4& rhs)  { return ImVec4(lhs.x * rhs.x, lhs.y * rhs.y, lhs.z * rhs.z, lhs.w * rhs.w); }
 inline ImVec4  operator/(const ImVec4& lhs, const ImVec4& rhs)  { return ImVec4(lhs.x / rhs.x, lhs.y / rhs.y, lhs.z / rhs.z, lhs.w / rhs.w); }
+inline ImVec4  operator+(const ImVec4& lhs)                     { return lhs; }
 inline ImVec4  operator-(const ImVec4& lhs)                     { return ImVec4(-lhs.x, -lhs.y, -lhs.z, -lhs.w); }
+inline ImVec4& operator*=(ImVec4& lhs, const float rhs)         { lhs.x *= rhs; lhs.y *= rhs; lhs.z *= rhs; lhs.w *= rhs; return lhs; }
+inline ImVec4& operator/=(ImVec4& lhs, const float rhs)         { lhs.x /= rhs; lhs.y /= rhs; lhs.z /= rhs; lhs.w /= rhs; return lhs; }
+inline ImVec4& operator+=(ImVec4& lhs, const ImVec4& rhs)       { lhs.x += rhs.x; lhs.y += rhs.y; lhs.z += rhs.z; lhs.w += rhs.w; return lhs; }
+inline ImVec4& operator-=(ImVec4& lhs, const ImVec4& rhs)       { lhs.x -= rhs.x; lhs.y -= rhs.y; lhs.z -= rhs.z; lhs.w -= rhs.w; return lhs; }
+inline ImVec4& operator*=(ImVec4& lhs, const ImVec4& rhs)       { lhs.x *= rhs.x; lhs.y *= rhs.y; lhs.z *= rhs.z; lhs.w *= rhs.w; return lhs; }
+inline ImVec4& operator/=(ImVec4& lhs, const ImVec4& rhs)       { lhs.x /= rhs.x; lhs.y /= rhs.y; lhs.z /= rhs.z; lhs.w /= rhs.w; return lhs; }
 inline bool    operator==(const ImVec4& lhs, const ImVec4& rhs) { return lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z && lhs.w == rhs.w; }
 inline bool    operator!=(const ImVec4& lhs, const ImVec4& rhs) { return lhs.x != rhs.x || lhs.y != rhs.y || lhs.z != rhs.z || lhs.w != rhs.w; }
 IM_MSVC_RUNTIME_CHECKS_RESTORE
@@ -3002,16 +3034,23 @@ enum ImGuiMultiSelectFlags_
    ImGuiMultiSelectFlags_NoAutoClearOnReselect = 1 << 5,   // Disable clearing selection when clicking/selecting an already selected item.
    ImGuiMultiSelectFlags_BoxSelect1d           = 1 << 6,   // Enable box-selection with same width and same x pos items (e.g. full row Selectable()). Box-selection works better with little bit of spacing between items hit-box in order to be able to aim at empty space.
    ImGuiMultiSelectFlags_BoxSelect2d           = 1 << 7,   // Enable box-selection with varying width or varying x pos items support (e.g. different width labels, or 2D layout/grid). This is slower: alters clipping logic so that e.g. horizontal movements will update selection of normally clipped items.
-    ImGuiMultiSelectFlags_BoxSelectNoScroll     = 1 << 8,   // Disable scrolling when box-selecting near edges of scope.
+    ImGuiMultiSelectFlags_BoxSelectNoScroll     = 1 << 8,   // Disable scrolling when box-selecting and moving mouse near edges of scope.
    ImGuiMultiSelectFlags_ClearOnEscape         = 1 << 9,   // Clear selection when pressing Escape while scope is focused.
    ImGuiMultiSelectFlags_ClearOnClickVoid      = 1 << 10,  // Clear selection when clicking on empty location within scope.
    ImGuiMultiSelectFlags_ScopeWindow           = 1 << 11,  // Scope for _BoxSelect and _ClearOnClickVoid is whole window (Default). Use if BeginMultiSelect() covers a whole window or used a single time in same window.
    ImGuiMultiSelectFlags_ScopeRect             = 1 << 12,  // Scope for _BoxSelect and _ClearOnClickVoid is rectangle encompassing BeginMultiSelect()/EndMultiSelect(). Use if BeginMultiSelect() is called multiple times in same window.
-    ImGuiMultiSelectFlags_SelectOnClick         = 1 << 13,  // Apply selection on mouse down when clicking on unselected item. (Default)
-    ImGuiMultiSelectFlags_SelectOnClickRelease  = 1 << 14,  // Apply selection on mouse release when clicking an unselected item. Allow dragging an unselected item without altering selection.
+    ImGuiMultiSelectFlags_SelectOnAuto          = 1 << 13,  // Apply selection on mouse down when clicking on unselected item, on mouse up when clicking on selected item. (Default)
+    ImGuiMultiSelectFlags_SelectOnClickAlways   = 1 << 14,  // Apply selection on mouse down when clicking on any items. Prevents Drag and Drop from being used on multiple-selection, but allows e.g. BoxSelect to always reselect even when clicking inside an existing selection. (Excel style behavior)
+    ImGuiMultiSelectFlags_SelectOnClickRelease  = 1 << 15,  // Apply selection on mouse release when clicking an unselected item. Allow dragging an unselected item without altering selection.
    //ImGuiMultiSelectFlags_RangeSelect2d       = 1 << 15,  // Shift+Selection uses 2d geometry instead of linear sequence, so possible to use Shift+up/down to select vertically in grid. Analogous to what BoxSelect does.
    ImGuiMultiSelectFlags_NavWrapX              = 1 << 16,  // [Temporary] Enable navigation wrapping on X axis. Provided as a convenience because we don't have a design for the general Nav API for this yet. When the more general feature be public we may obsolete this flag in favor of new one.
    ImGuiMultiSelectFlags_NoSelectOnRightClick  = 1 << 17,  // Disable default right-click processing, which selects item on mouse down, and is designed for context-menus.
+    ImGuiMultiSelectFlags_SelectOnMask_         = ImGuiMultiSelectFlags_SelectOnAuto | ImGuiMultiSelectFlags_SelectOnClickAlways | ImGuiMultiSelectFlags_SelectOnClickRelease,
+
+    // Obsolete names
+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+    ImGuiMultiSelectFlags_SelectOnClick         = ImGuiMultiSelectFlags_SelectOnAuto,         // RENAMED in 1.92.6
+#endif
 };

 // Main IO structure returned by BeginMultiSelect()/EndMultiSelect().
@@ -3150,7 +3189,7 @@ struct ImDrawCmd
    int             UserCallbackDataSize;  // 4 // Size of callback user data when using storage, otherwise 0.
    int             UserCallbackDataOffset;// 4 // [Internal] Offset of callback user data when using storage, otherwise -1.

-    ImDrawCmd()     { memset(this, 0, sizeof(*this)); } // Also ensure our padding fields are zeroed
+    ImDrawCmd()     { memset((void*)this, 0, sizeof(*this)); } // Also ensure our padding fields are zeroed

    // Since 1.83: returns ImTextureID associated with this draw call. Warning: DO NOT assume this is always same as 'TextureId' (we will change this function for an upcoming feature)
    // Since 1.92: removed ImDrawCmd::TextureId field, the getter function must be used!
@@ -3196,7 +3235,7 @@ struct ImDrawListSplitter
    int                         _Count;      // Number of active channels (1+)
    ImVector<ImDrawChannel>     _Channels;   // Draw channels (not resized down so _Count might be < Channels.Size)

-    inline ImDrawListSplitter()  { memset(this, 0, sizeof(*this)); }
+    inline ImDrawListSplitter()  { memset((void*)this, 0, sizeof(*this)); }
    inline ~ImDrawListSplitter() { ClearFreeMemory(); }
    inline void                 Clear() { _Current = 0; _Count = 1; } // Do not clear Channels[] so our allocations are reused next frame
    IMGUI_API void              ClearFreeMemory();
@@ -3489,7 +3528,7 @@ struct ImTextureData
    bool                WantDestroyNextFrame;   // rw   -   // [Internal] Queued to set ImTextureStatus_WantDestroy next frame. May still be used in the current frame.

    // Functions
-    ImTextureData()     { memset(this, 0, sizeof(*this)); Status = ImTextureStatus_Destroyed; TexID = ImTextureID_Invalid; }
+    ImTextureData()     { memset((void*)this, 0, sizeof(*this)); Status = ImTextureStatus_Destroyed; TexID = ImTextureID_Invalid; }
    ~ImTextureData()    { DestroyPixels(); }
    IMGUI_API void      Create(ImTextureFormat format, int w, int h);
    IMGUI_API void      DestroyPixels();
@@ -3504,7 +3543,7 @@ struct ImTextureData
    // - Call SetTexID() and SetStatus() after honoring texture requests. Never modify TexID and Status directly!
    // - A backend may decide to destroy a texture that we did not request to destroy, which is fine (e.g. freeing resources), but we immediately set the texture back in _WantCreate mode.
    void    SetTexID(ImTextureID tex_id)            { TexID = tex_id; }
-    void    SetStatus(ImTextureStatus status)       { Status = status; if (status == ImTextureStatus_Destroyed && !WantDestroyNextFrame) Status = ImTextureStatus_WantCreate; }
+    void    SetStatus(ImTextureStatus status)       { Status = status; if (status == ImTextureStatus_Destroyed && !WantDestroyNextFrame && Pixels != nullptr) Status = ImTextureStatus_WantCreate; }
 };

 //-----------------------------------------------------------------------------
@@ -3518,16 +3557,15 @@ struct ImFontConfig
    char            Name[40];               // <auto>   // Name (strictly to ease debugging, hence limited size buffer)
    void*           FontData;               //          // TTF/OTF data
    int             FontDataSize;           //          // TTF/OTF data size
-    bool            FontDataOwnedByAtlas;   // true     // TTF/OTF data ownership taken by the owner ImFontAtlas (will delete memory itself).
+    bool            FontDataOwnedByAtlas;   // true     // TTF/OTF data ownership taken by the owner ImFontAtlas (will delete memory itself). SINCE 1.92, THE DATA NEEDS TO PERSIST FOR WHOLE DURATION OF ATLAS.

    // Options
    bool            MergeMode;              // false    // Merge into previous ImFont, so you can combine multiple inputs font into one ImFont (e.g. ASCII font + icons + Japanese glyphs). You may want to use GlyphOffset.y when merge font of different heights.
-    bool            PixelSnapH;             // false    // Align every glyph AdvanceX to pixel boundaries. Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, you can set OversampleH/V to 1.
-    bool            PixelSnapV;             // true     // Align Scaled GlyphOffset.y to pixel boundaries.
+    bool            PixelSnapH;             // false    // Align every glyph AdvanceX to pixel boundaries. Prevents fractional font size from working correctly! Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, OversampleH/V will default to 1.
    ImS8            OversampleH;            // 0 (2)    // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1 or 2 depending on size. Note the difference between 2 and 3 is minimal. You can reduce this to 1 for large glyphs save memory. Read https://github.com/nothings/stb/blob/master/tests/oversample/README.md for details.
    ImS8            OversampleV;            // 0 (1)    // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1. This is not really useful as we don't use sub-pixel positions on the Y axis.
    ImWchar         EllipsisChar;           // 0        // Explicitly specify Unicode codepoint of ellipsis character. When fonts are being merged first specified ellipsis will be used.
-    float           SizePixels;             //          // Size in pixels for rasterizer (more or less maps to the resulting font height).
+    float           SizePixels;             //          // Output size in pixels for rasterizer (more or less maps to the resulting font height).
    const ImWchar*  GlyphRanges;            // NULL     // *LEGACY* THE ARRAY DATA NEEDS TO PERSIST AS LONG AS THE FONT IS ALIVE. Pointer to a user-provided list of Unicode range (2 value per range, values are inclusive, zero-terminated list).
    const ImWchar*  GlyphExcludeRanges;     // NULL     // Pointer to a small user-provided list of Unicode ranges (2 value per range, values are inclusive, zero-terminated list). This is very close to GlyphRanges[] but designed to exclude ranges from a font source, when merging fonts with overlapping glyphs. Use "Input Glyphs Overlap Detection Tool" to find about your overlapping ranges.
    //ImVec2        GlyphExtraSpacing;      // 0, 0     // (REMOVED AT IT SEEMS LARGELY OBSOLETE. PLEASE REPORT IF YOU WERE USING THIS). Extra spacing (in pixels) between glyphs when rendered: essentially add to glyph->AdvanceX. Only X axis is supported for now.
@@ -3537,9 +3575,11 @@ struct ImFontConfig
    float           GlyphExtraAdvanceX;     // 0        // Extra spacing (in pixels) between glyphs. Please contact us if you are using this. // FIXME-NEWATLAS: Intentionally unscaled
    ImU32           FontNo;                 // 0        // Index of font within TTF/OTF file
    unsigned int    FontLoaderFlags;        // 0        // Settings for custom font builder. THIS IS BUILDER IMPLEMENTATION DEPENDENT. Leave as zero if unsure.
-    //unsigned int  FontBuilderFlags;       // --       // [Renamed in 1.92] Ue FontLoaderFlags.
+    //unsigned int  FontBuilderFlags;       // --       // [Renamed in 1.92] Use FontLoaderFlags.
    float           RasterizerMultiply;     // 1.0f     // Linearly brighten (>1.0f) or darken (<1.0f) font output. Brightening small fonts may be a good workaround to make them more readable. This is a silly thing we may remove in the future.
    float           RasterizerDensity;      // 1.0f     // [LEGACY: this only makes sense when ImGuiBackendFlags_RendererHasTextures is not supported] DPI scale multiplier for rasterization. Not altering other font metrics: makes it easy to swap between e.g. a 100% and a 400% fonts for a zooming display, or handle Retina screen. IMPORTANT: If you change this it is expected that you increase/decrease font scale roughly to the inverse of this, otherwise quality may look lowered.
+    float           ExtraSizeScale;         // 1.0f     // Extra rasterizer scale over SizePixels.
+    float           LineHeight;             // 1.0f     // [PCSX2 Custom] The spacing between lines of the font, in ems.

    // [Internal]
    ImFontFlags     Flags;                  // Font flags (don't use just yet, will be exposed in upcoming 1.92.X updates)
@@ -3547,6 +3587,9 @@ struct ImFontConfig
    const ImFontLoader* FontLoader;         // Custom font backend for this source (default source is the one stored in ImFontAtlas)
    void*           FontLoaderData;         // Font loader opaque storage (per font config)

+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+    bool            PixelSnapV;             // true    // [Obsoleted in 1.91.6] Align Scaled GlyphOffset.y to pixel boundaries.
+#endif
    IMGUI_API ImFontConfig();
 };

@@ -3563,7 +3606,7 @@ struct ImFontGlyph
    float           U0, V0, U1, V1;     // Texture coordinates for the current value of ImFontAtlas->TexRef. Cached equivalent of calling GetCustomRect() with PackId.
    int             PackId;             // [Internal] ImFontAtlasRectId value (FIXME: Cold data, could be moved elsewhere?)

-    ImFontGlyph()   { memset(this, 0, sizeof(*this)); PackId = -1; }
+    ImFontGlyph()   { memset((void*)this, 0, sizeof(*this)); PackId = -1; }
 };

 // Helper to build glyph ranges from text/string data. Feed your application strings/characters to it then call BuildRanges().
@@ -3596,7 +3639,7 @@ struct ImFontAtlasRect
    unsigned short  w, h;               // Size
    ImVec2          uv0, uv1;           // UV coordinates (in current texture)

-    ImFontAtlasRect() { memset(this, 0, sizeof(*this)); }
+    ImFontAtlasRect() { memset((void*)this, 0, sizeof(*this)); }
 };

 // Flags for ImFontAtlas build
@@ -3621,7 +3664,7 @@ enum ImFontAtlasFlags_
 //  - Call Build() + GetTexDataAsAlpha8() or GetTexDataAsRGBA32() to build and retrieve pixels data.
 //  - Call SetTexID(my_tex_id); and pass the pointer/identifier to your texture in a format natural to your graphics API.
 // Common pitfalls:
-// - If you pass a 'glyph_ranges' array to AddFont*** functions, you need to make sure that your array persist up until the
+// - If you pass a 'glyph_ranges' array to AddFont*** functions, you need to make sure that your array persists up until the
 //   atlas is build (when calling GetTexData*** or Build()). We only copy the pointer, not the data.
 // - Important: By default, AddFontFromMemoryTTF() takes ownership of the data. Even though we are not writing to it, we will free the pointer on destruction.
 //   You can set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed,
@@ -3632,7 +3675,9 @@ struct ImFontAtlas
    IMGUI_API ImFontAtlas();
    IMGUI_API ~ImFontAtlas();
    IMGUI_API ImFont*           AddFont(const ImFontConfig* font_cfg);
-    IMGUI_API ImFont*           AddFontDefault(const ImFontConfig* font_cfg = NULL);
+    IMGUI_API ImFont*           AddFontDefault(const ImFontConfig* font_cfg = NULL);        // Selects between AddFontDefaultVector() and AddFontDefaultBitmap().
+    IMGUI_API ImFont*           AddFontDefaultVector(const ImFontConfig* font_cfg = NULL);  // Embedded scalable font. Recommended at any higher size.
+    IMGUI_API ImFont*           AddFontDefaultBitmap(const ImFontConfig* font_cfg = NULL);  // Embedded classic pixel-clean font. Recommended at Size 13px with no scaling.
    IMGUI_API ImFont*           AddFontFromFileTTF(const char* filename, float size_pixels = 0.0f, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL);
    IMGUI_API ImFont*           AddFontFromMemoryTTF(void* font_data, int font_data_size, float size_pixels = 0.0f, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // Note: Transfer ownership of 'ttf_data' to ImFontAtlas! Will be deleted after destruction of the atlas. Set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed.
    IMGUI_API ImFont*           AddFontFromMemoryCompressedTTF(const void* compressed_font_data, int compressed_font_data_size, float size_pixels = 0.0f, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // 'compressed_font_data' still owned by caller. Compress with binary_to_compressed_c.cpp.
@@ -3794,7 +3839,7 @@ struct ImFontBaked
    unsigned int                MetricsTotalSurface:26;// 3  // out // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs)
    unsigned int                WantDestroy:1;         // 0  //     // Queued for destroy
    unsigned int                LoadNoFallback:1;      // 0  //     // Disable loading fallback in lower-level calls.
-    unsigned int                LoadNoRenderOnLayout:1;// 0  //     // Enable a two-steps mode where CalcTextSize() calls will load AdvanceX *without* rendering/packing glyphs. Only advantagous if you know that the glyph is unlikely to actually be rendered, otherwise it is slower because we'd do one query on the first CalcTextSize and one query on the first Draw.
+    unsigned int                LoadNoRenderOnLayout:1;// 0  //     // Enable a two-steps mode where CalcTextSize() calls will load AdvanceX *without* rendering/packing glyphs. Only advantageous if you know that the glyph is unlikely to actually be rendered, otherwise it is slower because we'd do one query on the first CalcTextSize and one query on the first Draw.
    int                         LastUsedFrame;         // 4  //     // Record of that time this was bounds
    ImGuiID                     BakedId;            // 4     //     // Unique ID for this baked storage
    ImFont*                     OwnerFont;          // 4-8   // in  // Parent font
@@ -3831,16 +3876,17 @@ struct ImFont
    ImFontAtlas*                OwnerAtlas;         // 4-8   // What we have been loaded into.
    ImFontFlags                 Flags;              // 4     // Font flags.
    float                       CurrentRasterizerDensity;    // Current rasterizer density. This is a varying state of the font.
+	float                       LineHeight;         // 4     // Line Height

    // [Internal] Members: Cold ~24-52 bytes
    // Conceptually Sources[] is the list of font sources merged to create this font.
    ImGuiID                     FontId;             // Unique identifier for the font
    float                       LegacySize;         // 4     // in  // Font size passed to AddFont(). Use for old code calling PushFont() expecting to use that size. (use ImGui::GetFontBaked() to get font baked at current bound size).
    ImVector<ImFontConfig*>     Sources;            // 16    // in  // List of sources. Pointers within OwnerAtlas->Sources[]
-    ImWchar                     EllipsisChar;       // 2-4   // out // Character used for ellipsis rendering ('...').
+    ImWchar                     EllipsisChar;       // 2-4   // out // Character used for ellipsis rendering ('...'). If you ever want to temporarily swap this for an alternative/dummy char, make sure to clear EllipsisAutoBake.
    ImWchar                     FallbackChar;       // 2-4   // out // Character used if a glyph isn't found (U+FFFD, '?')
-    ImU8                        Used8kPagesMap[(IM_UNICODE_CODEPOINT_MAX+1)/8192/8]; // 1 bytes if ImWchar=ImWchar16, 16 bytes if ImWchar==ImWchar32. Store 1-bit for each block of 4K codepoints that has one active glyph. This is mainly used to facilitate iterations across all used codepoints.
-    bool                        EllipsisAutoBake;   // 1     //     // Mark when the "..." glyph needs to be generated.
+    ImU8                        Used8kPagesMap[(IM_UNICODE_CODEPOINT_MAX+1)/8192/8]; // 1 bytes if ImWchar=ImWchar16, 17 bytes if ImWchar==ImWchar32. Store 1-bit for each block of 8K codepoints that has one active glyph. This is mainly used to facilitate iterations across all used codepoints.
+    bool                        EllipsisAutoBake;   // 1     //     // Mark when the "..." glyph (== EllipsisChar) needs to be generated by combining multiple '.'.
    ImGuiStorage                RemapPairs;         // 16    //     // Remapping pairs when using AddRemapChar(), otherwise empty.
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
    float                       Scale;              // 4     // in  // Legacy base font scale (~1.0f), multiplied by the per-window font scale which you can adjust with SetWindowFontScale()
@@ -3881,8 +3927,10 @@ inline ImTextureID ImTextureRef::GetTexID() const
 // Using an indirection to avoid patching ImDrawCmd after a SetTexID() call (but this could be an alternative solution too)
 inline ImTextureID ImDrawCmd::GetTexID() const
 {
-    // If you are getting this assert: A renderer backend with support for ImGuiBackendFlags_RendererHasTextures (1.92)
-    // must iterate and handle ImTextureData requests stored in ImDrawData::Textures[].
+    // If you are getting this assert with ImTextureID_Invalid == 0 and your ImTextureID is used to store an index or an offset:
+    // - You can add '#define ImTextureID_Invalid ((ImTextureID)-1)' in your imconfig.h file.
+    // If you are getting this assert with a renderer backend with support for ImGuiBackendFlags_RendererHasTextures (1.92+):
+    // - You must correctly iterate and handle ImTextureData requests stored in ImDrawData::Textures[]. See docs/BACKENDS.md.
    ImTextureID tex_id = TexRef._TexData ? TexRef._TexData->TexID : TexRef._TexID; // == TexRef.GetTexID() above.
    if (TexRef._TexData != NULL)
        IM_ASSERT(tex_id != ImTextureID_Invalid && "ImDrawCmd is referring to ImTextureData that wasn't uploaded to graphics system. Backend must call ImTextureData::SetTexID() after handling ImTextureStatus_WantCreate request!");
@@ -3923,7 +3971,7 @@ struct ImGuiViewport
    void*               PlatformHandle;         // void* to hold higher-level, platform window handle (e.g. HWND, GLFWWindow*, SDL_Window*)
    void*               PlatformHandleRaw;      // void* to hold lower-level, platform-native window handle (under Win32 this is expected to be a HWND, unused for other platforms)

-    ImGuiViewport()     { memset(this, 0, sizeof(*this)); }
+    ImGuiViewport()     { memset((void*)this, 0, sizeof(*this)); }

    // Helpers
    ImVec2              GetCenter() const       { return ImVec2(Pos.x + Size.x * 0.5f, Pos.y + Size.y * 0.5f); }
@@ -3945,7 +3993,7 @@ struct ImGuiPlatformIO

    // Optional: Access OS clipboard
    // (default to use native Win32 clipboard on Windows, otherwise uses a private clipboard. Override to access OS clipboard on other architectures)
-    const char* (*Platform_GetClipboardTextFn)(ImGuiContext* ctx);
+    const char* (*Platform_GetClipboardTextFn)(ImGuiContext* ctx);                      // Should return NULL on failure (e.g. clipboard data is not text).
    void        (*Platform_SetClipboardTextFn)(ImGuiContext* ctx, const char* text);
    void*       Platform_ClipboardUserData;

@@ -4000,7 +4048,7 @@ struct ImGuiPlatformImeData
    float   InputLineHeight;        // Line height (for IME).
    ImGuiID ViewportId;             // ID of platform window/viewport.

-    ImGuiPlatformImeData()          { memset(this, 0, sizeof(*this)); }
+    ImGuiPlatformImeData()          { memset((void*)this, 0, sizeof(*this)); }
 };

 //-----------------------------------------------------------------------------
@@ -4022,19 +4070,20 @@ namespace ImGui
    inline void         PopButtonRepeat()                                       { PopItemFlag(); }
    inline void         PushTabStop(bool tab_stop)                              { PushItemFlag(ImGuiItemFlags_NoTabStop, !tab_stop); }
    inline void         PopTabStop()                                            { PopItemFlag(); }
+    // You do not need those functions! See #7838 on GitHub for more info.
    IMGUI_API ImVec2    GetContentRegionMax();                                  // Content boundaries max (e.g. window boundaries including scrolling, or current column boundaries). You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()!
    IMGUI_API ImVec2    GetWindowContentRegionMin();                            // Content boundaries min for the window (roughly (0,0)-Scroll), in window-local coordinates. You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()!
    IMGUI_API ImVec2    GetWindowContentRegionMax();                            // Content boundaries max for the window (roughly (0,0)+Size-Scroll), in window-local coordinates. You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()!
-    // OBSOLETED in 1.90.0 (from September 2023)
-    inline bool         BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags window_flags = 0)  { return BeginChild(id, size, ImGuiChildFlags_FrameStyle, window_flags); }
-    inline void         EndChildFrame()                                                                     { EndChild(); }
-    //inline bool       BeginChild(const char* str_id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags){ return BeginChild(str_id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags); } // Unnecessary as true == ImGuiChildFlags_Borders
-    //inline bool       BeginChild(ImGuiID id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags)        { return BeginChild(id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags);     } // Unnecessary as true == ImGuiChildFlags_Borders
-    inline void         ShowStackToolWindow(bool* p_open = NULL)                { ShowIDStackToolWindow(p_open); }
-    IMGUI_API bool      Combo(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int popup_max_height_in_items = -1);
-    IMGUI_API bool      ListBox(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int height_in_items = -1);

    // Some of the older obsolete names along with their replacement (commented out so they are not reported in IDE)
+    // OBSOLETED in 1.90.0 (from September 2023)
+    //IMGUI_API bool      Combo(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int popup_max_height_in_items = -1); // Getter signature changed. See 2023/09/15 and 2026/02/27 commits.
+    //IMGUI_API bool      ListBox(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int height_in_items = -1);         // Getter signature changed. See 2023/09/15 and 2026/02/27 commits.
+    //inline bool         BeginChild(const char* str_id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags) { return BeginChild(str_id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags); } // Unnecessary as true == ImGuiChildFlags_Borders
+    //inline bool         BeginChild(ImGuiID id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags)         { return BeginChild(id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags);     } // Unnecessary as true == ImGuiChildFlags_Borders
+    //inline bool         BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags flags = 0) { return BeginChild(id, size, ImGuiChildFlags_FrameStyle, flags); }
+    //inline void         EndChildFrame()                                                             { EndChild(); }
+    //inline void         ShowStackToolWindow(bool* p_open = NULL)                                    { ShowIDStackToolWindow(p_open); }
    // OBSOLETED in 1.89.7 (from June 2023)
    //IMGUI_API void      SetItemAllowOverlap();                                                      // Use SetNextItemAllowOverlap() _before_ item.
    //-- OBSOLETED in 1.89.4 (from March 2023)
@@ -4144,10 +4193,12 @@ typedef ImFontAtlasRect ImFontAtlasCustomRect;
 //typedef ImGuiKeyChord ImGuiKeyModFlags; // == int
 //enum ImGuiKeyModFlags_ { ImGuiKeyModFlags_None = 0, ImGuiKeyModFlags_Ctrl = ImGuiMod_Ctrl, ImGuiKeyModFlags_Shift = ImGuiMod_Shift, ImGuiKeyModFlags_Alt = ImGuiMod_Alt, ImGuiKeyModFlags_Super = ImGuiMod_Super };

-#define IM_OFFSETOF(_TYPE,_MEMBER)  offsetof(_TYPE, _MEMBER)    // OBSOLETED IN 1.90 (now using C++11 standard version)
+//#define IM_OFFSETOF(_TYPE,_MEMBER)  offsetof(_TYPE, _MEMBER)  // OBSOLETED IN 1.90 (now using C++11 standard version)

 #endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS

+#define IM_ARRAYSIZE                IM_COUNTOF                  // RENAMED IN 1.92.6: IM_ARRAYSIZE -> IM_COUNTOF
+
 // RENAMED IMGUI_DISABLE_METRICS_WINDOW > IMGUI_DISABLE_DEBUG_TOOLS in 1.88 (from June 2022)
 #ifdef IMGUI_DISABLE_METRICS_WINDOW
 #error IMGUI_DISABLE_METRICS_WINDOW was renamed to IMGUI_DISABLE_DEBUG_TOOLS, please use new name.
@@ -1,4 +1,4 @@
-// dear imgui, v1.92.5
+// dear imgui, v1.92.7
 // (internal structures/api)

 // You may use this file to debug, understand or extend Dear ImGui features but we don't provide any guarantee of forward compatibility.
@@ -60,7 +60,7 @@ Index of this file:
 #include <limits.h>     // INT_MIN, INT_MAX

 // Enable SSE intrinsics if available
-#if (defined __SSE__ || defined __x86_64__ || defined _M_X64 || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1))) && !defined(IMGUI_DISABLE_SSE)
+#if (defined __SSE__ || defined __x86_64__ || defined _M_X64 || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1))) && !defined(IMGUI_DISABLE_SSE) && !defined(_M_ARM64) && !defined(_M_ARM64EC)
 #define IMGUI_ENABLE_SSE
 #include <immintrin.h>
 #if (defined __AVX__ || defined __SSE4_2__)
@@ -106,6 +106,7 @@ Index of this file:
 #pragma GCC diagnostic ignored "-Wfloat-equal"                      // warning: comparing floating-point with '==' or '!=' is unsafe
 #pragma GCC diagnostic ignored "-Wclass-memaccess"                  // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
 #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion"  // warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated
+#pragma GCC diagnostic ignored "-Wsign-conversion"                  // warning: conversion to 'xxxx' from 'xxxx' may change the sign of the result
 #endif

 // In 1.89.4, we moved the implementation of "courtesy maths operators" from imgui_internal.h in imgui.h
@@ -276,11 +277,9 @@ extern IMGUI_API ImGuiContext* GImGui;  // Current implicit context pointer
 #define IM_MEMALIGN(_OFF,_ALIGN)        (((_OFF) + ((_ALIGN) - 1)) & ~((_ALIGN) - 1))           // Memory align e.g. IM_ALIGN(0,4)=0, IM_ALIGN(1,4)=4, IM_ALIGN(4,4)=4, IM_ALIGN(5,4)=8
 #define IM_F32_TO_INT8_UNBOUND(_VAL)    ((int)((_VAL) * 255.0f + ((_VAL)>=0 ? 0.5f : -0.5f)))   // Unsaturated, for display purpose
 #define IM_F32_TO_INT8_SAT(_VAL)        ((int)(ImSaturate(_VAL) * 255.0f + 0.5f))               // Saturated, always output 0..255
-#define IM_TRUNC(_VAL)                  ((float)(int)(_VAL))                                    // ImTrunc() is not inlined in MSVC debug builds
-#define IM_ROUND(_VAL)                  ((float)(int)((_VAL) + 0.5f))                           //
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-#define IM_FLOOR IM_TRUNC               // [OBSOLETE] Renamed in 1.90.0 (Sept 2023)
-#endif
+#define IM_TRUNC(_VAL)                  ((float)(int)(_VAL))                                    // Positive values only! ImTrunc() is not inlined in MSVC debug builds
+#define IM_ROUND(_VAL)                  ((float)(int)((_VAL) + 0.5f))                           // Positive values only! 
+//#define IM_FLOOR IM_TRUNC             // [OBSOLETE] Renamed in 1.90.0 (Sept 2023)

 // Hint for branch prediction
 #if (defined(__cplusplus) && (__cplusplus >= 202002L)) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 202002L))
@@ -335,7 +334,6 @@ extern IMGUI_API ImGuiContext* GImGui;  // Current implicit context pointer
 #define IM_PRIu64   "llu"
 #define IM_PRIX64   "llX"
 #endif
-#define IM_TEXTUREID_TO_U64(_TEXID) ((ImU64)(intptr_t)(_TEXID))

 //-----------------------------------------------------------------------------
 // [SECTION] Generic helpers
@@ -442,6 +440,16 @@ IMGUI_API ImVec2        ImFontCalcTextSizeEx(ImFont* font, float size, float max
 IMGUI_API const char*   ImFontCalcWordWrapPositionEx(ImFont* font, float size, const char* text, const char* text_end, float wrap_width, ImDrawTextFlags flags = 0);
 IMGUI_API const char*   ImTextCalcWordWrapNextLineStart(const char* text, const char* text_end, ImDrawTextFlags flags = 0); // trim trailing space and find beginning of next line

+// Character classification for word-wrapping logic
+enum ImWcharClass
+{
+    ImWcharClass_Blank, ImWcharClass_Punct, ImWcharClass_Other
+};
+IMGUI_API void          ImTextInitClassifiers();
+IMGUI_API void          ImTextClassifierClear(ImU32* bits, unsigned int codepoint_min, unsigned int codepoint_end, ImWcharClass char_class);
+IMGUI_API void          ImTextClassifierSetCharClass(ImU32* bits, unsigned int codepoint_min, unsigned int codepoint_end, ImWcharClass char_class, unsigned int c);
+IMGUI_API void          ImTextClassifierSetCharClassFromStr(ImU32* bits, unsigned int codepoint_min, unsigned int codepoint_end, ImWcharClass char_class, const char* s);
+
 // Helpers: File System
 #ifdef IMGUI_DISABLE_FILE_FUNCTIONS
 #define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
@@ -518,7 +526,7 @@ inline ImVec2 ImTrunc(const ImVec2& v)                                  { return
 inline float  ImFloor(float f)                                          { return (float)((f >= 0 || (float)(int)f == f) ? (int)f : (int)f - 1); } // Decent replacement for floorf()
 inline ImVec2 ImFloor(const ImVec2& v)                                  { return ImVec2(ImFloor(v.x), ImFloor(v.y)); }
 inline float  ImTrunc64(float f)                                        { return (float)(ImS64)(f); }
-inline float  ImRound64(float f)                                        { return (float)(ImS64)(f + 0.5f); }
+inline float  ImRound64(float f)                                        { return (float)(ImS64)(f + 0.5f); } // FIXME: Positive values only.
 inline int    ImModPositive(int a, int b)                               { return (a + b) % b; }
 inline float  ImDot(const ImVec2& a, const ImVec2& b)                   { return a.x * b.x + a.y * b.y; }
 inline ImVec2 ImRotate(const ImVec2& v, float cos_a, float sin_a)       { return ImVec2(v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a); }
@@ -526,7 +534,7 @@ inline float  ImLinearSweep(float current, float target, float speed)   { if (cu
 inline float  ImLinearRemapClamp(float s0, float s1, float d0, float d1, float x) { return ImSaturate((x - s0) / (s1 - s0)) * (d1 - d0) + d0; }
 inline ImVec2 ImMul(const ImVec2& lhs, const ImVec2& rhs)               { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); }
 inline bool   ImIsFloatAboveGuaranteedIntegerPrecision(float f)         { return f <= -16777216 || f >= 16777216; }
-inline float  ImExponentialMovingAverage(float avg, float sample, int n){ avg -= avg / n; avg += sample / n; return avg; }
+inline float  ImExponentialMovingAverage(float avg, float sample, int n){ avg -= avg / (float)n; avg += sample / (float)n; return avg; }
 IM_MSVC_RUNTIME_CHECKS_RESTORE

 // Helpers: Geometry
@@ -602,7 +610,6 @@ struct IMGUI_API ImRect
    void        TranslateY(float dy)                { Min.y += dy; Max.y += dy; }
    void        ClipWith(const ImRect& r)           { Min = ImMax(Min, r.Min); Max = ImMin(Max, r.Max); }                   // Simple version, may lead to an inverted rectangle, which is fine for Contains/Overlaps test but not for display.
    void        ClipWithFull(const ImRect& r)       { Min = ImClamp(Min, r.Min, r.Max); Max = ImClamp(Max, r.Min, r.Max); } // Full version, ensure both points are fully clipped.
-    void        Floor()                             { Min.x = IM_TRUNC(Min.x); Min.y = IM_TRUNC(Min.y); Max.x = IM_TRUNC(Max.x); Max.y = IM_TRUNC(Max.y); }
    bool        IsInverted() const                  { return Min.x > Max.x || Min.y > Max.y; }
    ImVec4      ToVec4() const                      { return ImVec4(Min.x, Min.y, Max.x, Max.y); }
    const ImVec4& AsVec4() const                    { return *(const ImVec4*)&Min.x; }
@@ -636,15 +643,15 @@ typedef ImU32* ImBitArrayPtr; // Name for use in structs
 template<int BITCOUNT, int OFFSET = 0>
 struct ImBitArray
 {
-    ImU32           Storage[(BITCOUNT + 31) >> 5];
+    ImU32           Data[(BITCOUNT + 31) >> 5];
    ImBitArray()                                { ClearAllBits(); }
-    void            ClearAllBits()              { memset(Storage, 0, sizeof(Storage)); }
-    void            SetAllBits()                { memset(Storage, 255, sizeof(Storage)); }
-    bool            TestBit(int n) const        { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Storage, n); }
-    void            SetBit(int n)               { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArraySetBit(Storage, n); }
-    void            ClearBit(int n)             { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArrayClearBit(Storage, n); }
-    void            SetBitRange(int n, int n2)  { n += OFFSET; n2 += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT && n2 > n && n2 <= BITCOUNT); ImBitArraySetBitRange(Storage, n, n2); } // Works on range [n..n2)
-    bool            operator[](int n) const     { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Storage, n); }
+    void            ClearAllBits()              { memset(Data, 0, sizeof(Data)); }
+    void            SetAllBits()                { memset(Data, 255, sizeof(Data)); }
+    bool            TestBit(int n) const        { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Data, n); }
+    void            SetBit(int n)               { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArraySetBit(Data, n); }
+    void            ClearBit(int n)             { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArrayClearBit(Data, n); }
+    void            SetBitRange(int n, int n2)  { n += OFFSET; n2 += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT && n2 > n && n2 <= BITCOUNT); ImBitArraySetBitRange(Data, n, n2); } // Works on range [n..n2)
+    bool            operator[](int n) const     { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Data, n); }
 };

 // Helper: ImBitVector
@@ -701,7 +708,7 @@ struct ImSpanAllocator
    int     Offsets[CHUNKS];
    int     Sizes[CHUNKS];

-    ImSpanAllocator()                               { memset(this, 0, sizeof(*this)); }
+    ImSpanAllocator()                               { memset((void*)this, 0, sizeof(*this)); }
    inline void  Reserve(int n, size_t sz, int a=4) { IM_ASSERT(n == CurrIdx && n < CHUNKS); CurrOff = IM_MEMALIGN(CurrOff, a); Offsets[n] = CurrOff; Sizes[n] = (int)sz; CurrIdx++; CurrOff += (int)sz; }
    inline int   GetArenaSizeInBytes()              { return CurrOff; }
    inline void  SetArenaBasePtr(void* base_ptr)    { BasePtr = (char*)base_ptr; }
@@ -712,10 +719,10 @@ struct ImSpanAllocator
 };

 // Helper: ImStableVector<>
-// Allocating chunks of BLOCK_SIZE items. Objects pointers are never invalidated when growing, only by clear().
+// Allocating chunks of BLOCKSIZE items. Objects pointers are never invalidated when growing, only by clear().
 // Important: does not destruct anything!
 // Implemented only the minimum set of functions we need for it.
-template<typename T, int BLOCK_SIZE>
+template<typename T, int BLOCKSIZE>
 struct ImStableVector
 {
    int                 Size = 0;
@@ -729,19 +736,19 @@ struct ImStableVector
    inline void         resize(int new_size)        { if (new_size > Capacity) reserve(new_size); Size = new_size; }
    inline void         reserve(int new_cap)
    {
-        new_cap = IM_MEMALIGN(new_cap, BLOCK_SIZE);
-        int old_count = Capacity / BLOCK_SIZE;
-        int new_count = new_cap / BLOCK_SIZE;
+        new_cap = IM_MEMALIGN(new_cap, BLOCKSIZE);
+        int old_count = Capacity / BLOCKSIZE;
+        int new_count = new_cap / BLOCKSIZE;
        if (new_count <= old_count)
            return;
        Blocks.resize(new_count);
        for (int n = old_count; n < new_count; n++)
-            Blocks[n] = (T*)IM_ALLOC(sizeof(T) * BLOCK_SIZE);
+            Blocks[n] = (T*)IM_ALLOC(sizeof(T) * BLOCKSIZE);
        Capacity = new_cap;
    }
-    inline T&           operator[](int i)           { IM_ASSERT(i >= 0 && i < Size); return Blocks[i / BLOCK_SIZE][i % BLOCK_SIZE]; }
-    inline const T&     operator[](int i) const     { IM_ASSERT(i >= 0 && i < Size); return Blocks[i / BLOCK_SIZE][i % BLOCK_SIZE]; }
-    inline T*           push_back(const T& v)       { int i = Size; IM_ASSERT(i >= 0); if (Size == Capacity) reserve(Capacity + BLOCK_SIZE); void* ptr = &Blocks[i / BLOCK_SIZE][i % BLOCK_SIZE]; memcpy(ptr, &v, sizeof(v)); Size++; return (T*)ptr; }
+    inline T&           operator[](int i)           { IM_ASSERT(i >= 0 && i < Size); return Blocks[i / BLOCKSIZE][i % BLOCKSIZE]; }
+    inline const T&     operator[](int i) const     { IM_ASSERT(i >= 0 && i < Size); return Blocks[i / BLOCKSIZE][i % BLOCKSIZE]; }
+    inline T*           push_back(const T& v)       { int i = Size; IM_ASSERT(i >= 0); if (Size == Capacity) reserve(Capacity + BLOCKSIZE); void* ptr = &Blocks[i / BLOCKSIZE][i % BLOCKSIZE]; memcpy(ptr, &v, sizeof(v)); Size++; return (T*)ptr; }
 };

 // Helper: ImPool<>
@@ -882,7 +889,7 @@ struct ImDrawDataBuilder
    ImVector<ImDrawList*>*  Layers[2];      // Pointers to global layers for: regular, tooltip. LayersP[0] is owned by DrawData.
    ImVector<ImDrawList*>   LayerData1;

-    ImDrawDataBuilder()                     { memset(this, 0, sizeof(*this)); }
+    ImDrawDataBuilder()                     { memset((void*)this, 0, sizeof(*this)); }
 };

 struct ImFontStackData
@@ -956,7 +963,6 @@ enum ImGuiDataTypePrivate_
 enum ImGuiItemFlagsPrivate_
 {
    // Controlled by user
-    ImGuiItemFlags_Disabled                 = 1 << 10, // false     // Disable interactions (DOES NOT affect visuals. DO NOT mix direct use of this with BeginDisabled(). See BeginDisabled()/EndDisabled() for full disable feature, and github #211).
    ImGuiItemFlags_ReadOnly                 = 1 << 11, // false     // [ALPHA] Allow hovering interactions but underlying value is not changed.
    ImGuiItemFlags_MixedValue               = 1 << 12, // false     // [BETA] Represent a mixed/indeterminate value, generally multi-selection where values differ. Currently only supported by Checkbox() (later should support all sorts of widgets)
    ImGuiItemFlags_NoWindowHoverableCheck   = 1 << 13, // false     // Disable hoverable check in ItemHoverable()
@@ -1017,7 +1023,7 @@ enum ImGuiInputTextFlagsPrivate_
 {
    // [Internal]
    ImGuiInputTextFlags_Multiline           = 1 << 26,  // For internal use by InputTextMultiline()
-    ImGuiInputTextFlags_MergedItem          = 1 << 27,  // For internal use by TempInputText(), will skip calling ItemAdd(). Require bounding-box to strictly match.
+    ImGuiInputTextFlags_TempInput           = 1 << 27,  // For internal use by TempInputText(), will skip calling ItemAdd(). Require bounding-box to strictly match.
    ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 28,  // For internal use by InputScalar() and TempInputScalar()
 };

@@ -1027,12 +1033,11 @@ enum ImGuiButtonFlagsPrivate_
    ImGuiButtonFlags_PressedOnClick         = 1 << 4,   // return true on click (mouse down event)
    ImGuiButtonFlags_PressedOnClickRelease  = 1 << 5,   // [Default] return true on click + release on same item <-- this is what the majority of Button are using
    ImGuiButtonFlags_PressedOnClickReleaseAnywhere = 1 << 6, // return true on click + release even if the release event is not done while hovering the item
-    ImGuiButtonFlags_PressedOnRelease       = 1 << 7,   // return true on release (default requires click+release)
+    ImGuiButtonFlags_PressedOnRelease       = 1 << 7,   // return true on release (default requires click+release). Prior to 2026/03/20 this implied ImGuiButtonFlags_NoHoldingActiveId but they are separate now.
    ImGuiButtonFlags_PressedOnDoubleClick   = 1 << 8,   // return true on double-click (default requires click+release)
    ImGuiButtonFlags_PressedOnDragDropHold  = 1 << 9,   // return true when held into while we are drag and dropping another item (used by e.g. tree nodes, collapsing headers)
    //ImGuiButtonFlags_Repeat               = 1 << 10,  // hold to repeat -> use ImGuiItemFlags_ButtonRepeat instead.
    ImGuiButtonFlags_FlattenChildren        = 1 << 11,  // allow interactions even if a child window is overlapping
-    ImGuiButtonFlags_AllowOverlap           = 1 << 12,  // require previous frame HoveredId to either match id or be null before being usable.
    //ImGuiButtonFlags_DontClosePopups      = 1 << 13,  // disable automatically closing parent popup on press
    //ImGuiButtonFlags_Disabled             = 1 << 14,  // disable interactions -> use BeginDisabled() or ImGuiItemFlags_Disabled
    ImGuiButtonFlags_AlignTextBaseLine      = 1 << 15,  // vertically align button to match text baseline - ButtonEx() only // FIXME: Should be removed and handled by SmallButton(), not possible currently because of DC.CursorPosPrevLine
@@ -1158,7 +1163,7 @@ struct IMGUI_API ImGuiComboPreviewData
    float           BackupPrevLineTextBaseOffset;
    ImGuiLayoutType BackupLayout;

-    ImGuiComboPreviewData() { memset(this, 0, sizeof(*this)); }
+    ImGuiComboPreviewData() { memset((void*)this, 0, sizeof(*this)); }
 };

 // Stacked storage data for BeginGroup()/EndGroup()
@@ -1192,7 +1197,7 @@ struct IMGUI_API ImGuiMenuColumns
    ImU16       OffsetMark;
    ImU16       Widths[4];          // Width of:   Icon, Label, Shortcut, Mark  (accumulators for current frame)

-    ImGuiMenuColumns() { memset(this, 0, sizeof(*this)); }
+    ImGuiMenuColumns() { memset((void*)this, 0, sizeof(*this)); }
    void        Update(float spacing, bool window_reappearing);
    float       DeclColumns(float w_icon, float w_label, float w_shortcut, float w_mark);
    void        CalcNextTotalWidth(bool update_offsets);
@@ -1204,7 +1209,7 @@ struct IMGUI_API ImGuiInputTextDeactivatedState
    ImGuiID            ID;              // widget id owning the text state (which just got deactivated)
    ImVector<char>     TextA;           // text buffer

-    ImGuiInputTextDeactivatedState()    { memset(this, 0, sizeof(*this)); }
+    ImGuiInputTextDeactivatedState()    { memset((void*)this, 0, sizeof(*this)); }
    void    ClearFreeMemory()           { ID = 0; TextA.clear(); }
 };

@@ -1228,7 +1233,7 @@ struct IMGUI_API ImGuiInputTextState
    ImGuiInputTextFlags     Flags;                  // copy of InputText() flags. may be used to check if e.g. ImGuiInputTextFlags_Password is set.
    ImGuiID                 ID;                     // widget id owning the text state
    int                     TextLen;                // UTF-8 length of the string in TextA (in bytes)
-    const char*             TextSrc;                // == TextA.Data unless read-only, in which case == buf passed to InputText(). Field only set and valid _inside_ the call InputText() call.
+    const char*             TextSrc;                // == TextA.Data unless read-only, in which case == buf passed to InputText(). For _ReadOnly fields, pointer will be null outside the InputText() call.
    ImVector<char>          TextA;                  // main UTF8 buffer. TextA.Size is a buffer size! Should always be >= buf_size passed by user (and of course >= CurLenA + 1).
    ImVector<char>          TextToRevertTo;         // value to revert to when pressing Escape = backup of end-user buffer at the time of focus (in UTF-8, unaltered)
    ImVector<char>          CallbackTextBackup;     // temporary storage for callback to support automatic reconcile of undo-stack
@@ -1240,7 +1245,8 @@ struct IMGUI_API ImGuiInputTextState
    bool                    CursorFollow;           // set when we want scrolling to follow the current cursor position (not always!)
    bool                    CursorCenterY;          // set when we want scrolling to be centered over the cursor position (while resizing a word-wrapping field)
    bool                    SelectedAllMouseLock;   // after a double-click to select all, we ignore further mouse drags to update selection
-    bool                    Edited;                 // edited this frame
+    bool                    EditedBefore;           // edited since activated
+    bool                    EditedThisFrame;        // edited this frame
    bool                    WantReloadUserBuf;      // force a reload of user buf so it may be modified externally. may be automatic in future version.
    ImS8                    LastMoveDirectionLR;    // ImGuiDir_Left or ImGuiDir_Right. track last movement direction so when cursor cross over a word-wrapping boundaries we can display it on either line depending on last move.s
    int                     ReloadSelectionStart;
@@ -1253,6 +1259,7 @@ struct IMGUI_API ImGuiInputTextState
    void        OnKeyPressed(int key);      // Cannot be inline because we call in code in stb_textedit.h implementation
    void        OnCharPressed(unsigned int c);
    float       GetPreferredOffsetX() const;
+    const char* GetText()                   { return TextA.Data ? TextA.Data : ""; }

    // Cursor & Selection
    void        CursorAnimReset();
@@ -1262,6 +1269,7 @@ struct IMGUI_API ImGuiInputTextState
    int         GetCursorPos() const;
    int         GetSelectionStart() const;
    int         GetSelectionEnd() const;
+    void        SetSelection(int start, int end);
    void        SelectAll();

    // Reload user buf (WIP #2890)
@@ -1329,18 +1337,19 @@ struct ImGuiNextWindowData
    ImVec2                      MenuBarOffsetMinVal;    // (Always on) This is not exposed publicly, so we don't clear it and it doesn't have a corresponding flag (could we? for consistency?)
    ImGuiWindowRefreshFlags     RefreshFlagsVal;

-    ImGuiNextWindowData()       { memset(this, 0, sizeof(*this)); }
+    ImGuiNextWindowData()       { memset((void*)this, 0, sizeof(*this)); }
    inline void ClearFlags()    { HasFlags = ImGuiNextWindowDataFlags_None; }
 };

 enum ImGuiNextItemDataFlags_
 {
-    ImGuiNextItemDataFlags_None         = 0,
-    ImGuiNextItemDataFlags_HasWidth     = 1 << 0,
-    ImGuiNextItemDataFlags_HasOpen      = 1 << 1,
-    ImGuiNextItemDataFlags_HasShortcut  = 1 << 2,
-    ImGuiNextItemDataFlags_HasRefVal    = 1 << 3,
-    ImGuiNextItemDataFlags_HasStorageID = 1 << 4,
+    ImGuiNextItemDataFlags_None             = 0,
+    ImGuiNextItemDataFlags_HasWidth         = 1 << 0,
+    ImGuiNextItemDataFlags_HasOpen          = 1 << 1,
+    ImGuiNextItemDataFlags_HasShortcut      = 1 << 2,
+    ImGuiNextItemDataFlags_HasRefVal        = 1 << 3,
+    ImGuiNextItemDataFlags_HasStorageID     = 1 << 4,
+    ImGuiNextItemDataFlags_HasColorMarker   = 1 << 5,
 };

 struct ImGuiNextItemData
@@ -1358,8 +1367,9 @@ struct ImGuiNextItemData
    ImU8                        OpenCond;           // Set by SetNextItemOpen()
    ImGuiDataTypeStorage        RefVal;             // Not exposed yet, for ImGuiInputTextFlags_ParseEmptyAsRefVal
    ImGuiID                     StorageId;          // Set by SetNextItemStorageID()
+    ImU32                       ColorMarker;        // Set by SetNextItemColorMarker(). Not exposed yet, supported by DragScalar,SliderScalar and for ImGuiSliderFlags_ColorMarkers.

-    ImGuiNextItemData()         { memset(this, 0, sizeof(*this)); SelectionUserData = -1; }
+    ImGuiNextItemData()         { memset((void*)this, 0, sizeof(*this)); SelectionUserData = -1; }
    inline void ClearFlags()    { HasFlags = ImGuiNextItemDataFlags_None; ItemFlags = ImGuiItemFlags_None; } // Also cleared manually by ItemAdd()!
 };

@@ -1376,7 +1386,7 @@ struct ImGuiLastItemData
    ImRect                  ClipRect;           // Clip rectangle at the time of submitting item. ONLY VALID IF (StatusFlags & ImGuiItemStatusFlags_HasClipRect) is set..
    ImGuiKeyChord           Shortcut;           // Shortcut at the time of submitting item. ONLY VALID IF (StatusFlags & ImGuiItemStatusFlags_HasShortcut) is set..

-    ImGuiLastItemData()     { memset(this, 0, sizeof(*this)); }
+    ImGuiLastItemData()     { memset((void*)this, 0, sizeof(*this)); }
 };

 // Store data emitted by TreeNode() for usage by TreePop()
@@ -1409,7 +1419,7 @@ struct IMGUI_API ImGuiErrorRecoveryState
    short   SizeOfBeginPopupStack;
    short   SizeOfDisabledStack;

-    ImGuiErrorRecoveryState() { memset(this, 0, sizeof(*this)); }
+    ImGuiErrorRecoveryState() { memset((void*)this, 0, sizeof(*this)); }
 };

 // Data saved for each window pushed into the stack
@@ -1470,7 +1480,7 @@ struct ImGuiPopupData
    ImVec2              OpenPopupPos;   // Set on OpenPopup(), preferred popup position (typically == OpenMousePos when using mouse)
    ImVec2              OpenMousePos;   // Set on OpenPopup(), copy of mouse position at the time of opening popup

-    ImGuiPopupData()    { memset(this, 0, sizeof(*this)); ParentNavLayer = OpenFrameCount = -1; }
+    ImGuiPopupData()    { memset((void*)this, 0, sizeof(*this)); ParentNavLayer = OpenFrameCount = -1; }
 };

 //-----------------------------------------------------------------------------
@@ -1499,8 +1509,8 @@ typedef ImBitArray<ImGuiKey_NamedKey_COUNT, -ImGuiKey_NamedKey_BEGIN>    ImBitAr
 #define ImGuiKey_NavGamepadTweakFast    ImGuiKey_GamepadR1
 #define ImGuiKey_NavGamepadActivate     (g.IO.ConfigNavSwapGamepadButtons ? ImGuiKey_GamepadFaceRight : ImGuiKey_GamepadFaceDown)
 #define ImGuiKey_NavGamepadCancel       (g.IO.ConfigNavSwapGamepadButtons ? ImGuiKey_GamepadFaceDown : ImGuiKey_GamepadFaceRight)
-#define ImGuiKey_NavGamepadMenu         ImGuiKey_GamepadFaceLeft
-#define ImGuiKey_NavGamepadInput        ImGuiKey_GamepadFaceUp
+#define ImGuiKey_NavGamepadMenu         ImGuiKey_GamepadFaceLeft    // Toggle menu layer. Hold to enable Windowing.
+#define ImGuiKey_NavGamepadContextMenu  ImGuiKey_GamepadFaceUp      // Open context menu (same as Shift+F10)

 enum ImGuiInputEventType
 {
@@ -1548,7 +1558,7 @@ struct ImGuiInputEvent
    };
    bool                            AddedByTestEngine;

-    ImGuiInputEvent() { memset(this, 0, sizeof(*this)); }
+    ImGuiInputEvent() { memset((void*)this, 0, sizeof(*this)); }
 };

 // Input function taking an 'ImGuiID owner_id' argument defaults to (ImGuiKeyOwner_Any == 0) aka don't test ownership, which matches legacy behavior.
@@ -1580,7 +1590,7 @@ struct ImGuiKeyRoutingTable
    ImVector<ImGuiKeyRoutingData>   EntriesNext;                    // Double-buffer to avoid reallocation (could use a shared buffer)

    ImGuiKeyRoutingTable()          { Clear(); }
-    void Clear()                    { for (int n = 0; n < IM_ARRAYSIZE(Index); n++) Index[n] = -1; Entries.clear(); EntriesNext.clear(); }
+    void Clear()                    { for (int n = 0; n < IM_COUNTOF(Index); n++) Index[n] = -1; Entries.clear(); EntriesNext.clear(); }
 };

 // This extends ImGuiKeyData but only for named keys (legacy keys don't support the new features)
@@ -1663,7 +1673,7 @@ struct ImGuiListClipperData
    int                             ItemsFrozen;
    ImVector<ImGuiListClipperRange> Ranges;

-    ImGuiListClipperData()          { memset(this, 0, sizeof(*this)); }
+    ImGuiListClipperData()          { memset((void*)this, 0, sizeof(*this)); }
    void                            Reset(ImGuiListClipper* clipper) { ListClipper = clipper; StepNo = ItemsFrozen = 0; Ranges.resize(0); }
 };

@@ -1798,7 +1808,7 @@ struct IMGUI_API ImGuiTypingSelectState
    float           LastRequestTime = 0.0f;
    bool            SingleCharModeLock = false; // After a certain single char repeat count we lock into SingleCharMode. Two benefits: 1) buffer never fill, 2) we can provide an immediate SingleChar mode without timer elapsing.

-    ImGuiTypingSelectState() { memset(this, 0, sizeof(*this)); }
+    ImGuiTypingSelectState() { memset((void*)this, 0, sizeof(*this)); }
    void            Clear()  { SearchBuffer[0] = 0; SingleCharModeLock = false; } // We preserve remaining data for easier debugging
 };

@@ -1834,7 +1844,7 @@ struct ImGuiOldColumnData
    ImGuiOldColumnFlags Flags;                  // Not exposed
    ImRect              ClipRect;

-    ImGuiOldColumnData() { memset(this, 0, sizeof(*this)); }
+    ImGuiOldColumnData() { memset((void*)this, 0, sizeof(*this)); }
 };

 struct ImGuiOldColumns
@@ -1855,7 +1865,7 @@ struct ImGuiOldColumns
    ImVector<ImGuiOldColumnData> Columns;
    ImDrawListSplitter  Splitter;

-    ImGuiOldColumns()   { memset(this, 0, sizeof(*this)); }
+    ImGuiOldColumns()   { memset((void*)this, 0, sizeof(*this)); }
 };

 //-----------------------------------------------------------------------------
@@ -1883,7 +1893,7 @@ struct ImGuiBoxSelectState
    ImRect                  BoxSelectRectPrev;  // Selection rectangle in absolute coordinates (derived every frame from BoxSelectStartPosRel and MousePos)
    ImRect                  BoxSelectRectCurr;

-    ImGuiBoxSelectState()   { memset(this, 0, sizeof(*this)); }
+    ImGuiBoxSelectState()   { memset((void*)this, 0, sizeof(*this)); }
 };

 //-----------------------------------------------------------------------------
@@ -1949,7 +1959,7 @@ struct IMGUI_API ImGuiMultiSelectState
 // Every instance of ImGuiViewport is in fact a ImGuiViewportP.
 struct ImGuiViewportP : public ImGuiViewport
 {
-    int                 BgFgDrawListsLastFrame[2]; // Last frame number the background (0) and foreground (1) draw lists were used
+    float               BgFgDrawListsLastTimeActive[2]; // Last frame number the background (0) and foreground (1) draw lists were used
    ImDrawList*         BgFgDrawLists[2];       // Convenience background (0) and foreground (1) draw lists. We use them to draw software mouser cursor when io.MouseDrawCursor is set and to draw most debug overlays.
    ImDrawData          DrawDataP;
    ImDrawDataBuilder   DrawDataBuilder;        // Temporary data while building final ImDrawData
@@ -1963,7 +1973,7 @@ struct ImGuiViewportP : public ImGuiViewport
    ImVec2              BuildWorkInsetMin;      // Work Area inset accumulator for current frame, to become next frame's WorkInset
    ImVec2              BuildWorkInsetMax;      // "

-    ImGuiViewportP()    { BgFgDrawListsLastFrame[0] = BgFgDrawListsLastFrame[1] = -1; BgFgDrawLists[0] = BgFgDrawLists[1] = NULL; }
+    ImGuiViewportP()    { BgFgDrawListsLastTimeActive[0] = BgFgDrawListsLastTimeActive[1] = -1.0f; BgFgDrawLists[0] = BgFgDrawLists[1] = NULL; }
    ~ImGuiViewportP()   { if (BgFgDrawLists[0]) IM_DELETE(BgFgDrawLists[0]); if (BgFgDrawLists[1]) IM_DELETE(BgFgDrawLists[1]); }

    // Calculate work rect pos/size given a set of offset (we have 1 pair of offset for rect locked from last frame data, and 1 pair for currently building rect)
@@ -1994,7 +2004,7 @@ struct ImGuiWindowSettings
    bool        WantApply;      // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context)
    bool        WantDelete;     // Set to invalidate/delete the settings entry

-    ImGuiWindowSettings()       { memset(this, 0, sizeof(*this)); }
+    ImGuiWindowSettings()       { memset((void*)this, 0, sizeof(*this)); }
    char* GetName()             { return (char*)(this + 1); }
 };

@@ -2010,7 +2020,7 @@ struct ImGuiSettingsHandler
    void        (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);      // Write: Output every entries into 'out_buf'
    void*       UserData;

-    ImGuiSettingsHandler() { memset(this, 0, sizeof(*this)); }
+    ImGuiSettingsHandler() { memset((void*)this, 0, sizeof(*this)); }
 };

 //-----------------------------------------------------------------------------
@@ -2049,7 +2059,9 @@ struct ImGuiLocEntry
 // - See 'Demo->Configuration->Error Handling' and ImGuiIO definitions for details on error handling.
 // - Read https://github.com/ocornut/imgui/wiki/Error-Handling for details on error handling.
 #ifndef IM_ASSERT_USER_ERROR
-#define IM_ASSERT_USER_ERROR(_EXPR,_MSG)    do { if (!(_EXPR) && ImGui::ErrorLog(_MSG)) { IM_ASSERT((_EXPR) && _MSG); } } while (0)    // Recoverable User Error
+#define IM_ASSERT_USER_ERROR(_EXPR,_MSG)            do { if (!(_EXPR)) { if (ImGui::ErrorLog(_MSG)) { IM_ASSERT((_EXPR) && _MSG); } } } while (0)               // Recoverable User Error
+#define IM_ASSERT_USER_ERROR_RET(_EXPR,_MSG)        do { if (!(_EXPR)) { if (ImGui::ErrorLog(_MSG)) { IM_ASSERT((_EXPR) && _MSG); } return; } } while (0)       // Recoverable User Error
+#define IM_ASSERT_USER_ERROR_RETV(_EXPR,_RETV,_MSG) do { if (!(_EXPR)) { if (ImGui::ErrorLog(_MSG)) { IM_ASSERT((_EXPR) && _MSG); } return _RETV; } } while (0) // Recoverable User Error
 #endif

 // The error callback is currently not public, as it is expected that only advanced users will rely on it.
@@ -2079,7 +2091,8 @@ enum ImGuiDebugLogFlags_

    ImGuiDebugLogFlags_EventMask_           = ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventFont | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
    ImGuiDebugLogFlags_OutputToTTY          = 1 << 20,  // Also send output to TTY
-    ImGuiDebugLogFlags_OutputToTestEngine   = 1 << 21,  // Also send output to Test Engine
+    ImGuiDebugLogFlags_OutputToDebugger     = 1 << 21,  // Also send output to Debugger Console [Windows only]
+    ImGuiDebugLogFlags_OutputToTestEngine   = 1 << 22,  // Also send output to Dear ImGui Test Engine
 };

 struct ImGuiDebugAllocEntry
@@ -2096,7 +2109,7 @@ struct ImGuiDebugAllocInfo
    ImS16       LastEntriesIdx;             // Current index in buffer
    ImGuiDebugAllocEntry LastEntriesBuf[6]; // Track last 6 frames that had allocations

-    ImGuiDebugAllocInfo() { memset(this, 0, sizeof(*this)); }
+    ImGuiDebugAllocInfo() { memset((void*)this, 0, sizeof(*this)); }
 };

 struct ImGuiMetricsConfig
@@ -2125,7 +2138,7 @@ struct ImGuiStackLevelInfo
    ImS8                    DataType;                   // ImGuiDataType
    int                     DescOffset;                 // -1 or offset into parent's ResultsPathsBuf

-    ImGuiStackLevelInfo()   { memset(this, 0, sizeof(*this)); DataType = -1; DescOffset = -1; }
+    ImGuiStackLevelInfo()   { memset((void*)this, 0, sizeof(*this)); DataType = -1; DescOffset = -1; }
 };

 struct ImGuiDebugItemPathQuery
@@ -2138,7 +2151,7 @@ struct ImGuiDebugItemPathQuery
    ImGuiTextBuffer         ResultsDescBuf;
    ImGuiTextBuffer         ResultPathBuf;

-    ImGuiDebugItemPathQuery() { memset(this, 0, sizeof(*this)); }
+    ImGuiDebugItemPathQuery() { memset((void*)this, 0, sizeof(*this)); }
 };

 // State for ID Stack tool queries
@@ -2149,7 +2162,7 @@ struct ImGuiIDStackTool
    int                     LastActiveFrame;
    float                   CopyToClipboardLastTime;

-    ImGuiIDStackTool()      { memset(this, 0, sizeof(*this)); LastActiveFrame = -1; OptHexEncodeNonAsciiChars = true; CopyToClipboardLastTime = -FLT_MAX; }
+    ImGuiIDStackTool()      { memset((void*)this, 0, sizeof(*this)); LastActiveFrame = -1; OptHexEncodeNonAsciiChars = true; CopyToClipboardLastTime = -FLT_MAX; }
 };

 //-----------------------------------------------------------------------------
@@ -2167,9 +2180,11 @@ struct ImGuiContextHook
    ImGuiContextHookCallback    Callback;
    void*                       UserData;

-    ImGuiContextHook()          { memset(this, 0, sizeof(*this)); }
+    ImGuiContextHook()          { memset((void*)this, 0, sizeof(*this)); }
 };

+typedef void (*ImGuiDemoMarkerCallback)(const char* file, int line, const char* section);
+
 //-----------------------------------------------------------------------------
 // [SECTION] ImGuiContext (main Dear ImGui context)
 //-----------------------------------------------------------------------------
@@ -2311,6 +2326,7 @@ struct ImGuiContext
    ImGuiWindow*            NavWindow;                          // Focused window for navigation. Could be called 'FocusedWindow'
    ImGuiID                 NavFocusScopeId;                    // Focused focus scope (e.g. selection code often wants to "clear other items" when landing on an item of the same scope)
    ImGuiNavLayer           NavLayer;                           // Focused layer (main scrolling layer, or menu/title bar layer)
+    ImGuiItemFlags          NavIdItemFlags;
    ImGuiID                 NavActivateId;                      // ~~ (g.ActiveId == 0) && (IsKeyPressed(ImGuiKey_Space) || IsKeyDown(ImGuiKey_Enter) || IsKeyPressed(ImGuiKey_NavGamepadActivate)) ? NavId : 0, also set when calling ActivateItemByID()
    ImGuiID                 NavActivateDownId;                  // ~~ IsKeyDown(ImGuiKey_Space) || IsKeyDown(ImGuiKey_Enter) || IsKeyDown(ImGuiKey_NavGamepadActivate) ? NavId : 0
    ImGuiID                 NavActivatePressedId;               // ~~ IsKeyPressed(ImGuiKey_Space) || IsKeyPressed(ImGuiKey_Enter) || IsKeyPressed(ImGuiKey_NavGamepadActivate) ? NavId : 0 (no repeat)
@@ -2318,6 +2334,8 @@ struct ImGuiContext
    ImVector<ImGuiFocusScopeData> NavFocusRoute;                // Reversed copy focus scope stack for NavId (should contains NavFocusScopeId). This essentially follow the window->ParentWindowForFocusRoute chain.
    ImGuiID                 NavHighlightActivatedId;
    float                   NavHighlightActivatedTimer;
+    ImGuiID                 NavOpenContextMenuItemId;
+    ImGuiID                 NavOpenContextMenuWindowId;
    ImGuiID                 NavNextActivateId;                  // Set by ActivateItemByID(), queued until next frame.
    ImGuiActivateFlags      NavNextActivateFlags;
    ImGuiInputSource        NavInputSource;                     // Keyboard or Gamepad mode? THIS CAN ONLY BE ImGuiInputSource_Keyboard or ImGuiInputSource_Gamepad
@@ -2340,7 +2358,7 @@ struct ImGuiContext
    ImGuiDir                NavMoveDirForDebug;
    ImGuiDir                NavMoveClipDir;                     // FIXME-NAV: Describe the purpose of this better. Might want to rename?
    ImRect                  NavScoringRect;                     // Rectangle used for scoring, in screen space. Based of window->NavRectRel[], modified for directional navigation scoring.
-    ImRect                  NavScoringNoClipRect;               // Some nav operations (such as PageUp/PageDown) enforce a region which clipper will attempt to always keep submitted
+    ImRect                  NavScoringNoClipRect;               // Some nav operations (such as PageUp/PageDown) enforce a region which clipper will attempt to always keep submitted. Unset/invalid if inverted.
    int                     NavScoringDebugCount;               // Metrics for debugging
    int                     NavTabbingDir;                      // Generally -1 or +1, 0 when tabbing without a nav id
    int                     NavTabbingCounter;                  // >0 when counting items for tabbing
@@ -2357,10 +2375,15 @@ struct ImGuiContext
    bool                    NavJustMovedToIsTabbing;            // Copy of ImGuiNavMoveFlags_IsTabbing. Maybe we should store whole flags.
    bool                    NavJustMovedToHasSelectionData;     // Copy of move result's ItemFlags & ImGuiItemFlags_HasSelectionUserData). Maybe we should just store ImGuiNavItemData.

-    // Navigation: Windowing (Ctrl+Tab for list, or Menu button + keys or directional pads to move/resize)
+    // Navigation: extra config options (will be made public eventually)
+    // - Tabbing (Tab, Shift+Tab) and Windowing (Ctrl+Tab, Ctrl+Shift+Tab) are enabled REGARDLESS of ImGuiConfigFlags_NavEnableKeyboard being set.
+    // - Ctrl+Tab is reconfigurable because it is the only shortcut that may be polled when no window are focused. It also doesn't work e.g. Web platforms.
+    bool                    ConfigNavEnableTabbing;             // = true. Enable tabbing (Tab, Shift+Tab). PLEASE LET ME KNOW IF YOU USE THIS.
    bool                    ConfigNavWindowingWithGamepad;      // = true. Enable Ctrl+Tab by holding ImGuiKey_GamepadFaceLeft (== ImGuiKey_NavGamepadMenu). When false, the button may still be used to toggle Menu layer.
-    ImGuiKeyChord           ConfigNavWindowingKeyNext;          // = ImGuiMod_Ctrl | ImGuiKey_Tab (or ImGuiMod_Super | ImGuiKey_Tab on OS X). For reconfiguration (see #4828)
+    ImGuiKeyChord           ConfigNavWindowingKeyNext;          // = ImGuiMod_Ctrl | ImGuiKey_Tab (or ImGuiMod_Super | ImGuiKey_Tab on OS X). Set to 0 to disable. For reconfiguration (see #4828)
    ImGuiKeyChord           ConfigNavWindowingKeyPrev;          // = ImGuiMod_Ctrl | ImGuiMod_Shift | ImGuiKey_Tab (or ImGuiMod_Super | ImGuiMod_Shift | ImGuiKey_Tab on OS X)
+
+    // Navigation: Windowing (Ctrl+Tab for list, or Menu button + keys or directional pads to move/resize)
    ImGuiWindow*            NavWindowingTarget;                 // Target window when doing Ctrl+Tab (or Pad Menu + FocusPrev/Next), this window is temporarily displayed top-most!
    ImGuiWindow*            NavWindowingTargetAnim;             // Record of last valid NavWindowingTarget until DimBgRatio and NavWindowingHighlightAlpha becomes 0.0f, so the fade-out can stay on it.
    ImGuiWindow*            NavWindowingListWindow;             // Internal window actually listing the Ctrl+Tab contents
@@ -2442,6 +2465,7 @@ struct ImGuiContext
    ImGuiInputTextDeactivatedState InputTextDeactivatedState;
    ImFontBaked             InputTextPasswordFontBackupBaked;
    ImFontFlags             InputTextPasswordFontBackupFlags;
+    ImGuiID                 InputTextReactivateId;              // ID of InputText to reactivate on next frame (for io.ConfigInputTextEnterKeepActive behavior)
    ImGuiID                 TempInputId;                        // Temporary text input when using Ctrl+Click on a slider, etc.
    ImGuiDataTypeStorage    DataTypeZeroValue;                  // 0 for all data types
    int                     BeginMenuDepth;
@@ -2487,8 +2511,11 @@ struct ImGuiContext
    ImVector<ImGuiSettingsHandler>      SettingsHandlers;       // List of .ini settings handlers
    ImChunkStream<ImGuiWindowSettings>  SettingsWindows;        // ImGuiWindow .ini settings entries
    ImChunkStream<ImGuiTableSettings>   SettingsTables;         // ImGuiTable .ini settings entries
+
+    // Hooks
    ImVector<ImGuiContextHook>          Hooks;                  // Hooks for extensions (e.g. test engine)
    ImGuiID                             HookIdNext;             // Next available HookId
+    ImGuiDemoMarkerCallback             DemoMarkerCallback;

    // Localization
    const char*             LocalizationTable[ImGuiLocKey_COUNT];
@@ -2562,6 +2589,8 @@ struct ImGuiContext
 // [SECTION] ImGuiWindowTempData, ImGuiWindow
 //-----------------------------------------------------------------------------

+#define IMGUI_WINDOW_HARD_MIN_SIZE 4.0f
+
 // Transient per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the DC variable name in ImGuiWindow.
 // (That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered..)
 // (This doesn't need a constructor because we zero-clear it as part of ImGuiWindow and all frame-temporary data are setup on Begin)
@@ -2612,6 +2641,7 @@ struct IMGUI_API ImGuiWindowTempData
    // Local parameters stacks
    // We store the current settings outside of the vectors to increase memory locality (reduce cache misses). The vectors are rarely modified. Also it allows us to not heap allocate for short-lived windows which are not using those settings.
    float                   ItemWidth;              // Current item width (>0.0: width in pixels, <0.0: align xx pixels to the right of window).
+    float                   ItemWidthDefault;
    float                   TextWrapPos;            // Current text wrap pos.
    ImVector<float>         ItemWidthStack;         // Store item widths to restore (attention: .back() is not == ItemWidth)
    ImVector<float>         TextWrapPosStack;       // Store text wrap pos to restore (attention: .back() is not == TextWrapPos)
@@ -2702,7 +2732,6 @@ struct IMGUI_API ImGuiWindow

    int                     LastFrameActive;                    // Last frame number the window was Active.
    float                   LastTimeActive;                     // Last timestamp the window was Active (using float as we don't need high precision there)
-    float                   ItemWidthDefault;
    ImGuiStorage            StateStorage;
    ImVector<ImGuiOldColumns> ColumnsStorage;
    float                   FontWindowScale;                    // User scale multiplier per-window, via SetWindowFontScale()
@@ -2778,7 +2807,7 @@ struct ImGuiTabItem
    ImGuiTabItemFlags   Flags;
    int                 LastFrameVisible;
    int                 LastFrameSelected;      // This allows us to infer an ordered list of the last activated tabs with little maintenance
-    float               Offset;                 // Position relative to beginning of tab
+    float               Offset;                 // Position relative to beginning of tab bar
    float               Width;                  // Width currently displayed
    float               ContentWidth;           // Width of label + padding, stored during BeginTabItem() call (misnamed as "Content" would normally imply width of label only)
    float               RequestedWidth;         // Width optionally requested by caller, -1.0f is unused
@@ -2787,7 +2816,7 @@ struct ImGuiTabItem
    ImS16               IndexDuringLayout;      // Index only used during TabBarLayout(). Tabs gets reordered so 'Tabs[n].IndexDuringLayout == n' but may mismatch during additions.
    bool                WantClose;              // Marked as closed by SetTabItemClosed()

-    ImGuiTabItem()      { memset(this, 0, sizeof(*this)); LastFrameVisible = LastFrameSelected = -1; RequestedWidth = -1.0f; NameOffset = -1; BeginOrder = IndexDuringLayout = -1; }
+    ImGuiTabItem()      { memset((void*)this, 0, sizeof(*this)); LastFrameVisible = LastFrameSelected = -1; RequestedWidth = -1.0f; NameOffset = -1; BeginOrder = IndexDuringLayout = -1; }
 };

 // Storage for a tab bar (sizeof() 160 bytes)
@@ -2799,6 +2828,7 @@ struct IMGUI_API ImGuiTabBar
    ImGuiID             ID;                     // Zero for tab-bars used by docking
    ImGuiID             SelectedTabId;          // Selected tab/window
    ImGuiID             NextSelectedTabId;      // Next selected tab/window. Will also trigger a scrolling animation
+    ImGuiID             NextScrollToTabId;
    ImGuiID             VisibleTabId;           // Can occasionally be != SelectedTabId (e.g. when previewing contents for Ctrl+Tab preview)
    int                 CurrFrameVisible;
    int                 PrevFrameVisible;
@@ -2891,7 +2921,7 @@ struct ImGuiTableColumn

    ImGuiTableColumn()
    {
-        memset(this, 0, sizeof(*this));
+        memset((void*)this, 0, sizeof(*this));
        StretchWeight = WidthRequest = -1.0f;
        NameOffset = -1;
        DisplayOrder = IndexWithinEnabledSet = -1;
@@ -3015,8 +3045,9 @@ struct IMGUI_API ImGuiTable
    ImGuiTableColumnIdx         ResizedColumn;              // Index of column being resized. Reset when InstanceCurrent==0.
    ImGuiTableColumnIdx         LastResizedColumn;          // Index of column being resized from previous frame.
    ImGuiTableColumnIdx         HeldHeaderColumn;           // Index of column header being held.
+    ImGuiTableColumnIdx         LastHeldHeaderColumn;       // Index of column header being held from previous frame.
    ImGuiTableColumnIdx         ReorderColumn;              // Index of column being reordered. (not cleared)
-    ImGuiTableColumnIdx         ReorderColumnDir;           // -1 or +1
+    ImGuiTableColumnIdx         ReorderColumnDstOrder;      // Requested display order of column being reordered.
    ImGuiTableColumnIdx         LeftMostEnabledColumn;      // Index of left-most non-hidden column.
    ImGuiTableColumnIdx         RightMostEnabledColumn;     // Index of right-most non-hidden column.
    ImGuiTableColumnIdx         LeftMostStretchedColumn;    // Index of left-most stretched column.
@@ -3052,7 +3083,7 @@ struct IMGUI_API ImGuiTable
    bool                        MemoryCompacted;
    bool                        HostSkipItems;              // Backup of InnerWindow->SkipItem at the end of BeginTable(), because we will overwrite InnerWindow->SkipItem on a per-column basis

-    ImGuiTable()                { memset(this, 0, sizeof(*this)); LastFrameActive = -1; }
+    ImGuiTable()                { memset((void*)this, 0, sizeof(*this)); LastFrameActive = -1; }
    ~ImGuiTable()               { IM_FREE(RawData); }
 };

@@ -3081,7 +3112,7 @@ struct IMGUI_API ImGuiTableTempData
    float                       HostBackupItemWidth;        // Backup of OuterWindow->DC.ItemWidth at the end of BeginTable()
    int                         HostBackupItemWidthStackSize;//Backup of OuterWindow->DC.ItemWidthStack.Size at the end of BeginTable()

-    ImGuiTableTempData()        { memset(this, 0, sizeof(*this)); LastTimeActive = -1.0f; }
+    ImGuiTableTempData()        { memset((void*)this, 0, sizeof(*this)); LastTimeActive = -1.0f; }
 };

 // sizeof() ~ 16
@@ -3118,7 +3149,7 @@ struct ImGuiTableSettings
    ImGuiTableColumnIdx         ColumnsCountMax;        // Maximum number of columns this settings instance can store, we can recycle a settings instance with lower number of columns but not higher
    bool                        WantApply;              // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context)

-    ImGuiTableSettings()        { memset(this, 0, sizeof(*this)); }
+    ImGuiTableSettings()        { memset((void*)this, 0, sizeof(*this)); }
    ImGuiTableColumnSettings*   GetColumnSettings()     { return (ImGuiTableColumnSettings*)(this + 1); }
 };

@@ -3136,6 +3167,7 @@ namespace ImGui
    // - You are calling ImGui functions after ImGui::EndFrame()/ImGui::Render() and before the next ImGui::NewFrame(), which is also illegal.
    IMGUI_API ImGuiIO&         GetIO(ImGuiContext* ctx);
    IMGUI_API ImGuiPlatformIO& GetPlatformIO(ImGuiContext* ctx);
+    inline    float         GetScale()                  { ImGuiContext& g = *GImGui; return g.Style._MainScale; } // FIXME-DPI: I don't want to formalize this just yet. Because reasons. Please don't use.
    inline    ImGuiWindow*  GetCurrentWindowRead()      { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
    inline    ImGuiWindow*  GetCurrentWindow()          { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
    IMGUI_API ImGuiWindow*  FindWindowByID(ImGuiID id);
@@ -3194,6 +3226,12 @@ namespace ImGui
    IMGUI_API void          Initialize();
    IMGUI_API void          Shutdown();    // Since 1.60 this is a _private_ function. You can call DestroyContext() to destroy the context created by CreateContext().

+    // Context name & generic context hooks
+    IMGUI_API void          SetContextName(ImGuiContext* ctx, const char* name);
+    IMGUI_API ImGuiID       AddContextHook(ImGuiContext* ctx, const ImGuiContextHook* hook);
+    IMGUI_API void          RemoveContextHook(ImGuiContext* ctx, ImGuiID hook_to_remove);
+    IMGUI_API void          CallContextHooks(ImGuiContext* ctx, ImGuiContextHookType type);
+
    // NewFrame
    IMGUI_API void          UpdateInputEvents(bool trickle_fast_inputs);
    IMGUI_API void          UpdateHoveredWindowAndCaptureFlags(const ImVec2& mouse_pos);
@@ -3203,12 +3241,8 @@ namespace ImGui
    IMGUI_API void          UpdateMouseMovingWindowNewFrame();
    IMGUI_API void          UpdateMouseMovingWindowEndFrame();

-    // Generic context hooks
-    IMGUI_API ImGuiID       AddContextHook(ImGuiContext* context, const ImGuiContextHook* hook);
-    IMGUI_API void          RemoveContextHook(ImGuiContext* context, ImGuiID hook_to_remove);
-    IMGUI_API void          CallContextHooks(ImGuiContext* context, ImGuiContextHookType type);
-
    // Viewports
+    inline ImGuiViewport*   GetWindowViewport() { return GetMainViewport(); } // For code consistency. This is public API in docking branch.
    IMGUI_API void          ScaleWindowsInViewport(ImGuiViewportP* viewport, float scale);
    IMGUI_API void          SetWindowViewport(ImGuiWindow* window, ImGuiViewportP* viewport);

@@ -3246,7 +3280,6 @@ namespace ImGui

    // Basic Accessors
    inline ImGuiItemStatusFlags GetItemStatusFlags() { ImGuiContext& g = *GImGui; return g.LastItemData.StatusFlags; }
-    inline ImGuiItemFlags   GetItemFlags()  { ImGuiContext& g = *GImGui; return g.LastItemData.ItemFlags; }
    inline ImGuiID          GetActiveID()   { ImGuiContext& g = *GImGui; return g.ActiveId; }
    inline ImGuiID          GetFocusID()    { ImGuiContext& g = *GImGui; return g.NavId; }
    IMGUI_API void          SetActiveID(ImGuiID id, ImGuiWindow* window);
@@ -3302,6 +3335,9 @@ namespace ImGui
    IMGUI_API ImGuiWindow*  FindBlockingModal(ImGuiWindow* window);
    IMGUI_API ImVec2        FindBestWindowPosForPopup(ImGuiWindow* window);
    IMGUI_API ImVec2        FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy);
+    IMGUI_API ImGuiMouseButton GetMouseButtonFromPopupFlags(ImGuiPopupFlags flags);
+    IMGUI_API bool          IsPopupOpenRequestForItem(ImGuiPopupFlags flags, ImGuiID id);
+    IMGUI_API bool          IsPopupOpenRequestForWindow(ImGuiPopupFlags flags);

    // Tooltips
    IMGUI_API bool          BeginTooltipEx(ImGuiTooltipFlags tooltip_flags, ImGuiWindowFlags extra_window_flags);
@@ -3509,6 +3545,7 @@ namespace ImGui
    IMGUI_API void          TableMergeDrawChannels(ImGuiTable* table);
    inline ImGuiTableInstanceData*  TableGetInstanceData(ImGuiTable* table, int instance_no) { if (instance_no == 0) return &table->InstanceDataFirst; return &table->InstanceDataExtra[instance_no - 1]; }
    inline ImGuiID                  TableGetInstanceID(ImGuiTable* table, int instance_no)   { return TableGetInstanceData(table, instance_no)->TableInstanceID; }
+    IMGUI_API void          TableFixDisplayOrder(ImGuiTable* table);
    IMGUI_API void          TableSortSpecsSanitize(ImGuiTable* table);
    IMGUI_API void          TableSortSpecsBuild(ImGuiTable* table);
    IMGUI_API ImGuiSortDirection TableGetColumnNextSortDirection(ImGuiTableColumn* column);
@@ -3524,6 +3561,8 @@ namespace ImGui
    IMGUI_API float         TableCalcMaxColumnWidth(const ImGuiTable* table, int column_n);
    IMGUI_API void          TableSetColumnWidthAutoSingle(ImGuiTable* table, int column_n);
    IMGUI_API void          TableSetColumnWidthAutoAll(ImGuiTable* table);
+    IMGUI_API void          TableSetColumnDisplayOrder(ImGuiTable* table, int column_n, int dst_order);
+    IMGUI_API void          TableQueueSetColumnDisplayOrder(ImGuiTable* table, int column_n, int dst_order);
    IMGUI_API void          TableRemove(ImGuiTable* table);
    IMGUI_API void          TableGcCompactTransientBuffers(ImGuiTable* table);
    IMGUI_API void          TableGcCompactTransientBuffers(ImGuiTableTempData* table);
@@ -3572,6 +3611,7 @@ namespace ImGui
    IMGUI_API void          RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float ellipsis_max_x, const char* text, const char* text_end, const ImVec2* text_size_if_known);
    IMGUI_API void          RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool borders = true, float rounding = 0.0f);
    IMGUI_API void          RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding = 0.0f);
+    IMGUI_API void          RenderColorComponentMarker(const ImRect& bb, ImU32 col, float rounding);
    IMGUI_API void          RenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list, ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, float grid_step, ImVec2 grid_off, float rounding = 0.0f, ImDrawFlags flags = 0);
    IMGUI_API void          RenderNavCursor(const ImRect& bb, ImGuiID id, ImGuiNavRenderCursorFlags flags = ImGuiNavRenderCursorFlags_None); // Navigation highlight
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -3585,8 +3625,9 @@ namespace ImGui
    IMGUI_API void          RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col);
    IMGUI_API void          RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz);
    IMGUI_API void          RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, ImGuiDir direction, ImU32 col);
-    IMGUI_API void          RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float x_start_norm, float x_end_norm, float rounding);
+    IMGUI_API void          RenderRectFilledInRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float fill_x0, float fill_x1, float rounding);
    IMGUI_API void          RenderRectFilledWithHole(ImDrawList* draw_list, const ImRect& outer, const ImRect& inner, ImU32 col, float rounding);
+    IMGUI_API ImDrawFlags   CalcRoundingFlagsForRectInRect(const ImRect& r_in, const ImRect& r_outer, float threshold);

    // Widgets: Text
    IMGUI_API void          TextEx(const char* text, const char* text_end = NULL, ImGuiTextFlags flags = 0);
@@ -3611,6 +3652,7 @@ namespace ImGui
    IMGUI_API ImGuiID       GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis);
    IMGUI_API ImGuiID       GetWindowResizeCornerID(ImGuiWindow* window, int n); // 0..3: corners
    IMGUI_API ImGuiID       GetWindowResizeBorderID(ImGuiWindow* window, ImGuiDir dir);
+    IMGUI_API void          ExtendHitBoxWhenNearViewportEdge(ImGuiWindow* window, ImRect* bb, float threshold, ImGuiAxis axis);

    // Widgets low-level behaviors
    IMGUI_API bool          ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags = 0);
@@ -3623,15 +3665,14 @@ namespace ImGui
    IMGUI_API void          TreeNodeDrawLineToChildNode(const ImVec2& target_pos);
    IMGUI_API void          TreeNodeDrawLineToTreePop(const ImGuiTreeNodeStackData* data);
    IMGUI_API void          TreePushOverrideID(ImGuiID id);
-    IMGUI_API bool          TreeNodeGetOpen(ImGuiID storage_id);
    IMGUI_API void          TreeNodeSetOpen(ImGuiID storage_id, bool open);
    IMGUI_API bool          TreeNodeUpdateNextOpen(ImGuiID storage_id, ImGuiTreeNodeFlags flags);   // Return open state. Consume previous SetNextItemOpen() data, if any. May return true when logging.

    // Template functions are instantiated in imgui_widgets.cpp for a finite number of types.
    // To use them externally (for custom widget) you may need an "extern template" statement in your code in order to link to existing instances and silence Clang warnings (see #2036).
    // e.g. " extern template IMGUI_API float RoundScalarWithFormatT<float, float>(const char* format, ImGuiDataType data_type, float v); "
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API float ScaleRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size);
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API T     ScaleValueFromRatioT(ImGuiDataType data_type, float t, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size);
+    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API float ScaleRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, float logarithmic_zero_epsilon, float zero_deadzone_size);
+    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API T     ScaleValueFromRatioT(ImGuiDataType data_type, float t, T v_min, T v_max, float logarithmic_zero_epsilon, float zero_deadzone_size);
    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, ImGuiSliderFlags flags);
    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb);
    template<typename T>                                        IMGUI_API T     RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v);
@@ -3649,9 +3690,9 @@ namespace ImGui
    // InputText
    IMGUI_API bool          InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
    IMGUI_API void          InputTextDeactivateHook(ImGuiID id);
-    IMGUI_API bool          TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags);
+    IMGUI_API bool          TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
    IMGUI_API bool          TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min = NULL, const void* p_clamp_max = NULL);
-    inline bool             TempInputIsActive(ImGuiID id)       { ImGuiContext& g = *GImGui; return (g.ActiveId == id && g.TempInputId == id); }
+    inline bool             TempInputIsActive(ImGuiID id)       { ImGuiContext& g = *GImGui; return g.ActiveId == id && g.TempInputId == id; }
    inline ImGuiInputTextState* GetInputTextState(ImGuiID id)   { ImGuiContext& g = *GImGui; return (id != 0 && g.InputTextState.ID == id) ? &g.InputTextState : NULL; } // Get input text state if active
    IMGUI_API void          SetNextItemRefVal(ImGuiDataType data_type, void* p_data);
    inline bool             IsItemActiveAsInputText() { ImGuiContext& g = *GImGui; return g.ActiveId != 0 && g.ActiveId == g.LastItemData.ID && g.InputTextState.ID == g.LastItemData.ID; } // This may be useful to apply workaround that a based on distinguish whenever an item is active as a text input field.
@@ -3660,6 +3701,7 @@ namespace ImGui
    IMGUI_API void          ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags);
    IMGUI_API void          ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags);
    IMGUI_API void          ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags);
+    inline void             SetNextItemColorMarker(ImU32 col) { ImGuiContext& g = *GImGui; g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasColorMarker; g.NextItemData.ColorMarker = col; }

    // Plot
    IMGUI_API int           PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, const ImVec2& size_arg);
@@ -3684,6 +3726,9 @@ namespace ImGui
    IMGUI_API bool          BeginErrorTooltip();
    IMGUI_API void          EndErrorTooltip();

+    // Demo Doc Marker for e.g. imgui_explorer
+    IMGUI_API void          DemoMarker(const char* file, int line, const char* section);
+
    // Debug Tools
    IMGUI_API void          DebugAllocHook(ImGuiDebugAllocInfo* info, int frame_count, void* ptr, size_t size); // size >= 0 : alloc, size = -1 : free
    IMGUI_API void          DebugDrawCursorPos(ImU32 col = IM_COL32(255, 0, 0, 255));
@@ -3697,12 +3742,13 @@ namespace ImGui
    IMGUI_API bool          DebugBreakButton(const char* label, const char* description_of_location);
    IMGUI_API void          DebugBreakButtonTooltip(bool keyboard_only, const char* description_of_location);
    IMGUI_API void          ShowFontAtlas(ImFontAtlas* atlas);
+    IMGUI_API ImU64         DebugTextureIDToU64(ImTextureID tex_id);
    IMGUI_API void          DebugHookIdInfo(ImGuiID id, ImGuiDataType data_type, const void* data_id, const void* data_id_end);
    IMGUI_API void          DebugNodeColumns(ImGuiOldColumns* columns);
    IMGUI_API void          DebugNodeDrawList(ImGuiWindow* window, ImGuiViewportP* viewport, const ImDrawList* draw_list, const char* label);
    IMGUI_API void          DebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb);
    IMGUI_API void          DebugNodeFont(ImFont* font);
-    IMGUI_API void          DebugNodeFontGlyphesForSrcMask(ImFont* font, ImFontBaked* baked, int src_mask);
+    IMGUI_API void          DebugNodeFontGlyphsForSrcMask(ImFont* font, ImFontBaked* baked, int src_mask);
    IMGUI_API void          DebugNodeFontGlyph(ImFont* font, const ImFontGlyph* glyph);
    IMGUI_API void          DebugNodeTexture(ImTextureData* tex, int int_id, const ImFontAtlasRect* highlight_rect = NULL); // ID used to facilitate persisting the "current" texture.
    IMGUI_API void          DebugNodeStorage(ImGuiStorage* storage, const char* label);
@@ -3760,14 +3806,14 @@ struct ImFontLoader
    // FIXME: At this point the two other types of buffers may be managed by core to be consistent?
    size_t          FontBakedSrcLoaderDataSize;

-    ImFontLoader()  { memset(this, 0, sizeof(*this)); }
+    ImFontLoader()  { memset((void*)this, 0, sizeof(*this)); }
 };

 #ifdef IMGUI_ENABLE_STB_TRUETYPE
 IMGUI_API const ImFontLoader* ImFontAtlasGetFontLoaderForStbTruetype();
 #endif
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-typedef ImFontLoader ImFontBuilderIO; // [renamed/changed in 1.92] The types are not actually compatible but we provide this as a compile-time error report helper.
+typedef ImFontLoader ImFontBuilderIO; // [renamed/changed in 1.92.0] The types are not actually compatible but we provide this as a compile-time error report helper.
 #endif

 //-----------------------------------------------------------------------------
@@ -3857,7 +3903,7 @@ struct ImFontAtlasBuilder
    ImFontAtlasRectId           PackIdMouseCursors;     // White pixel + mouse cursors. Also happen to be fallback in case of packing failure.
    ImFontAtlasRectId           PackIdLinesTexData;

-    ImFontAtlasBuilder()        { memset(this, 0, sizeof(*this)); FrameCount = -1; RectsIndexFreeListStart = -1; PackIdMouseCursors = PackIdLinesTexData = -1; }
+    ImFontAtlasBuilder()        { memset((void*)this, 0, sizeof(*this)); FrameCount = -1; RectsIndexFreeListStart = -1; PackIdMouseCursors = PackIdLinesTexData = -1; }
 };

 IMGUI_API void              ImFontAtlasBuildInit(ImFontAtlas* atlas);
@@ -3886,6 +3932,7 @@ IMGUI_API void              ImFontAtlasFontSourceAddToFont(ImFontAtlas* atlas, I
 IMGUI_API void              ImFontAtlasFontDestroySourceData(ImFontAtlas* atlas, ImFontConfig* src);
 IMGUI_API bool              ImFontAtlasFontInitOutput(ImFontAtlas* atlas, ImFont* font); // Using FontDestroyOutput/FontInitOutput sequence useful notably if font loader params have changed
 IMGUI_API void              ImFontAtlasFontDestroyOutput(ImFontAtlas* atlas, ImFont* font);
+IMGUI_API void              ImFontAtlasFontRebuildOutput(ImFontAtlas* atlas, ImFont* font);
 IMGUI_API void              ImFontAtlasFontDiscardBakes(ImFontAtlas* atlas, ImFont* font, int unused_frames);

 IMGUI_API ImGuiID           ImFontAtlasBakedGetId(ImGuiID font_id, float baked_size, float rasterizer_density);
@@ -153,7 +153,7 @@ struct ImGui_ImplFreeType_Data
 struct ImGui_ImplFreeType_FontSrcData
 {
    // Initialize from an external data buffer. Doesn't copy data, and you must ensure it stays valid up to this object lifetime.
-    bool                            InitFont(FT_Library ft_library, ImFontConfig* src, ImGuiFreeTypeLoaderFlags extra_user_flags);
+    bool                            InitFont(FT_Library ft_library, const ImFontConfig* src, ImGuiFreeTypeLoaderFlags extra_user_flags);
    void                            CloseFont();
    ImGui_ImplFreeType_FontSrcData()   { memset((void*)this, 0, sizeof(*this)); }
    ~ImGui_ImplFreeType_FontSrcData()  { CloseFont(); }
@@ -172,9 +172,9 @@ struct ImGui_ImplFreeType_FontSrcBakedData
    ImGui_ImplFreeType_FontSrcBakedData() { memset((void*)this, 0, sizeof(*this)); }
 };

-bool ImGui_ImplFreeType_FontSrcData::InitFont(FT_Library ft_library, ImFontConfig* src, ImGuiFreeTypeLoaderFlags extra_font_loader_flags)
+bool ImGui_ImplFreeType_FontSrcData::InitFont(FT_Library ft_library, const ImFontConfig* src, ImGuiFreeTypeLoaderFlags extra_font_loader_flags)
 {
-    FT_Error error = FT_New_Memory_Face(ft_library, (uint8_t*)src->FontData, (FT_Long)src->FontDataSize, (FT_Long)src->FontNo, &FtFace);
+    FT_Error error = FT_New_Memory_Face(ft_library, (const FT_Byte*)src->FontData, (FT_Long)src->FontDataSize, (FT_Long)src->FontNo, &FtFace);
    if (error != 0)
        return false;
    error = FT_Select_Charmap(FtFace, FT_ENCODING_UNICODE);
@@ -187,12 +187,8 @@ bool ImGui_ImplFreeType_FontSrcData::InitFont(FT_Library ft_library, ImFontConfi
    LoadFlags = 0;
    if ((UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) == 0)
        LoadFlags |= FT_LOAD_NO_BITMAP;
-
    if (UserFlags & ImGuiFreeTypeLoaderFlags_NoHinting)
        LoadFlags |= FT_LOAD_NO_HINTING;
-    else
-        src->PixelSnapH = true; // FIXME: A bit weird to do this this way.
-
    if (UserFlags & ImGuiFreeTypeLoaderFlags_NoAutoHint)
        LoadFlags |= FT_LOAD_NO_AUTOHINT;
    if (UserFlags & ImGuiFreeTypeLoaderFlags_ForceAutoHint)
@@ -424,6 +420,7 @@ static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* s
    float size = baked->Size;
    if (src->MergeMode && src->SizePixels != 0.0f)
        size *= (src->SizePixels / baked->OwnerFont->Sources[0]->SizePixels);
+    size *= src->ExtraSizeScale;

    ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData;
    bd_font_data->BakedLastActivated = baked;
@@ -442,7 +439,7 @@ static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* s
    // (FT_Set_Pixel_Sizes() essentially calls FT_Request_Size() with FT_SIZE_REQUEST_TYPE_NOMINAL)
    const float rasterizer_density = src->RasterizerDensity * baked->RasterizerDensity;
    FT_Size_RequestRec req;
-    req.type = (bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) ? FT_SIZE_REQUEST_TYPE_NOMINAL : FT_SIZE_REQUEST_TYPE_REAL_DIM;
+    req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
    req.width = 0;
    req.height = (uint32_t)(size * 64 * rasterizer_density);
    req.horiResolution = 0;
@@ -454,7 +451,7 @@ static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* s
    {
        // Read metrics
        FT_Size_Metrics metrics = bd_baked_data->FtSize->metrics;
-        const float scale = 1.0f / rasterizer_density;
+        const float scale = 1.0f / (rasterizer_density * src->ExtraSizeScale);
        baked->Ascent     = (float)FT_CEIL(metrics.ascender) * scale;       // The pixel extents above the baseline in pixels (typically positive).
        baked->Descent    = (float)FT_CEIL(metrics.descender) * scale;      // The extents below the baseline in pixels (typically negative).
        //LineSpacing     = (float)FT_CEIL(metrics.height) * scale;         // The baseline-to-baseline distance. Note that it usually is larger than the sum of the ascender and descender taken as absolute values. There is also no guarantee that no glyphs extend above or below subsequent baselines when using this distance. Think of it as a value the designer of the font finds appropriate.
@@ -541,12 +538,8 @@ static bool ImGui_ImplFreeType_FontBakedLoadGlyph(ImFontAtlas* atlas, ImFontConf

        const float ref_size = baked->OwnerFont->Sources[0]->SizePixels;
        const float offsets_scale = (ref_size != 0.0f) ? (baked->Size / ref_size) : 1.0f;
-        float font_off_x = (src->GlyphOffset.x * offsets_scale);
-        float font_off_y = (src->GlyphOffset.y * offsets_scale) + baked->Ascent;
-        if (src->PixelSnapH) // Snap scaled offset. This is to mitigate backward compatibility issues for GlyphOffset, but a better design would be welcome.
-            font_off_x = IM_ROUND(font_off_x);
-        if (src->PixelSnapV)
-            font_off_y = IM_ROUND(font_off_y);
+        float font_off_x = ImFloor(src->GlyphOffset.x * offsets_scale + 0.5f); // Snap scaled offset.
+        float font_off_y = ImFloor(src->GlyphOffset.y * offsets_scale + 0.5f) + baked->Ascent;
        float recip_h = 1.0f / rasterizer_density;
        float recip_v = 1.0f / rasterizer_density;

@@ -1,4 +1,4 @@
-// dear imgui, v1.92.5
+// dear imgui, v1.92.7
 // (tables and columns code)

 /*
@@ -240,6 +240,7 @@ Index of this file:
 #pragma GCC diagnostic ignored "-Wformat"                           // warning: format '%p' expects argument of type 'int'/'void*', but argument X has type 'unsigned int'/'ImGuiWindow*'
 #pragma GCC diagnostic ignored "-Wstrict-overflow"
 #pragma GCC diagnostic ignored "-Wclass-memaccess"                  // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
+#pragma GCC diagnostic ignored "-Wsign-conversion"                  // warning: conversion to 'xxxx' from 'xxxx' may change the sign of the result
 #endif

 //-----------------------------------------------------------------------------
@@ -335,7 +336,7 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
    // - always performing the GetOrAddByKey() O(log N) query in g.Tables.Map[].
    const bool use_child_window = (flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) != 0;
    const ImVec2 avail_size = GetContentRegionAvail();
-    const ImVec2 actual_outer_size = ImTrunc(CalcItemSize(outer_size, ImMax(avail_size.x, 1.0f), use_child_window ? ImMax(avail_size.y, 1.0f) : 0.0f));
+    const ImVec2 actual_outer_size = ImTrunc(CalcItemSize(outer_size, ImMax(avail_size.x, IMGUI_WINDOW_HARD_MIN_SIZE), use_child_window ? ImMax(avail_size.y, IMGUI_WINDOW_HARD_MIN_SIZE) : 0.0f));
    const ImRect outer_rect(outer_window->DC.CursorPos, outer_window->DC.CursorPos + actual_outer_size);
    const bool outer_window_is_measuring_size = (outer_window->AutoFitFramesX > 0) || (outer_window->AutoFitFramesY > 0); // Doesn't apply to AlwaysAutoResize windows!
    if (use_child_window && IsClippedEx(outer_rect, 0) && !outer_window_is_measuring_size)
@@ -564,9 +565,9 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
    const int old_columns_count = table->Columns.size();
    if (old_columns_count != 0 && old_columns_count != columns_count)
    {
-        // Attempt to preserve width on column count change (#4046)
+        // Attempt to preserve width and other settings on column count/specs change (#4046)
        old_columns_to_preserve = table->Columns.Data;
-        old_columns_raw_data = table->RawData;
+        old_columns_raw_data = table->RawData; // Free at end of function
        table->RawData = NULL;
    }
    if (table->RawData == NULL)
@@ -584,7 +585,7 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
        table->IsSettingsDirty = true; // Records itself into .ini file even when in default state (#7934)
        table->InstanceInteracted = -1;
        table->ContextPopupColumn = -1;
-        table->ReorderColumn = table->ResizedColumn = table->LastResizedColumn = -1;
+        table->ReorderColumn = table->ReorderColumnDstOrder = table->ResizedColumn = table->LastResizedColumn = -1;
        table->AutoFitSingleColumn = -1;
        table->HoveredColumnBody = table->HoveredColumnBorder = -1;
        for (int n = 0; n < columns_count; n++)
@@ -592,7 +593,6 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
            ImGuiTableColumn* column = &table->Columns[n];
            if (old_columns_to_preserve && n < old_columns_count)
            {
-                // FIXME: We don't attempt to preserve column order in this path.
                *column = old_columns_to_preserve[n];
            }
            else
@@ -602,8 +602,9 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
                column->WidthAuto = width_auto;
                column->IsPreserveWidthAuto = true; // Preserve WidthAuto when reinitializing a live table: not technically necessary but remove a visible flicker
                column->IsEnabled = column->IsUserEnabled = column->IsUserEnabledNextFrame = true;
+                column->DisplayOrder = (ImGuiTableColumnIdx)n;
            }
-            column->DisplayOrder = table->DisplayOrderToIndex[n] = (ImGuiTableColumnIdx)n;
+            table->DisplayOrderToIndex[n] = column->DisplayOrder;
        }
    }
    if (old_columns_raw_data)
@@ -698,37 +699,23 @@ void ImGui::TableBeginApplyRequests(ImGuiTable* table)
    }

    // Handle reordering request
-    // Note: we don't clear ReorderColumn after handling the request.
+    //// Note: we don't clear ReorderColumn after handling the request (FIXME: clarify why or add a test).
    if (table->InstanceCurrent == 0)
    {
-        if (table->HeldHeaderColumn == -1 && table->ReorderColumn != -1)
-            table->ReorderColumn = -1;
+        table->LastHeldHeaderColumn = table->HeldHeaderColumn;
        table->HeldHeaderColumn = -1;
-        if (table->ReorderColumn != -1 && table->ReorderColumnDir != 0)
+        if (table->ReorderColumn != -1 && table->ReorderColumnDstOrder != -1)
        {
-            // We need to handle reordering across hidden columns.
-            // In the configuration below, moving C to the right of E will lead to:
-            //    ... C [D] E  --->  ... [D] E  C   (Column name/index)
-            //    ... 2  3  4        ...  2  3  4   (Display order)
-            const int reorder_dir = table->ReorderColumnDir;
-            IM_ASSERT(reorder_dir == -1 || reorder_dir == +1);
-            IM_ASSERT(table->Flags & ImGuiTableFlags_Reorderable);
-            ImGuiTableColumn* src_column = &table->Columns[table->ReorderColumn];
-            ImGuiTableColumn* dst_column = &table->Columns[(reorder_dir == -1) ? src_column->PrevEnabledColumn : src_column->NextEnabledColumn];
-            IM_UNUSED(dst_column);
-            const int src_order = src_column->DisplayOrder;
-            const int dst_order = dst_column->DisplayOrder;
-            src_column->DisplayOrder = (ImGuiTableColumnIdx)dst_order;
-            for (int order_n = src_order + reorder_dir; order_n != dst_order + reorder_dir; order_n += reorder_dir)
-                table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder -= (ImGuiTableColumnIdx)reorder_dir;
-            IM_ASSERT(dst_column->DisplayOrder == dst_order - reorder_dir);
-
-            // Display order is stored in both columns->IndexDisplayOrder and table->DisplayOrder[]. Rebuild later from the former.
-            for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n;
-            table->ReorderColumnDir = 0;
-            table->IsSettingsDirty = true;
+            TableSetColumnDisplayOrder(table, table->ReorderColumn, table->ReorderColumnDstOrder);
+            table->ReorderColumnDstOrder = -1;
        }
+
+        // Release
+        ImGuiContext& g = *GImGui;
+        if (g.ActiveId == 0) // FIXME: Need to revisit. See 38f5e5a.
+            table->ReorderColumn = -1;
+        //if (table->HeldHeaderColumn == -1 && table->ReorderColumn != -1)
+        //    table->ReorderColumn = -1;
    }

    // Handle display order reset request
@@ -741,6 +728,63 @@ void ImGui::TableBeginApplyRequests(ImGuiTable* table)
    }
 }

+// Apply immediately. See TableQueueSetColumnDisplayOrder() for additional checks/constraints.
+void ImGui::TableSetColumnDisplayOrder(ImGuiTable* table, int column_n, int dst_order)
+{
+    IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount);
+    IM_ASSERT(dst_order >= 0 && dst_order < table->ColumnsCount);
+
+    ImGuiTableColumn* src_column = &table->Columns[column_n];
+    const int src_order = src_column->DisplayOrder;
+    if (src_order == dst_order)
+        return;
+    const int reorder_dir = (dst_order < src_order) ? -1 : +1;
+
+    src_column->DisplayOrder = (ImGuiTableColumnIdx)dst_order;
+    for (int order_n = src_order + reorder_dir; order_n != dst_order + reorder_dir; order_n += reorder_dir)
+        table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder -= (ImGuiTableColumnIdx)reorder_dir;
+    //IM_ASSERT(dst_column->DisplayOrder == dst_order - reorder_dir);
+
+    // Display order is stored in both columns->IndexDisplayOrder and table->DisplayOrder[]. Rebuild later from the former.
+    // FIXME-OPT: If this is called multiple times we'd effectively have a O(N^2) thing going on.
+    for (int n = 0; n < table->ColumnsCount; n++)
+        table->DisplayOrderToIndex[table->Columns[n].DisplayOrder] = (ImGuiTableColumnIdx)n;
+    table->IsSettingsDirty = true;
+}
+
+static int TableGetMaxDisplayOrderAllowed(ImGuiTable* table, int src_order, int dst_order)
+{
+    dst_order = ImClamp(dst_order, 0, table->ColumnsCount - 1);
+    if (src_order == dst_order)
+        return dst_order;
+
+    // Cannot cross over the frozen column limit when interactively reordering.
+    // TableSetupScrollFreeze() enforce a display order range for frozen columns. Reordering across the frozen column barrier is illegal and will be undone.
+    if (table->FreezeColumnsRequest > 0)
+        dst_order = (src_order < table->FreezeColumnsRequest) ? ImMin(dst_order, (int)table->FreezeColumnsRequest - 1) : ImMax(dst_order, (int)table->FreezeColumnsRequest);
+
+    // Cannot cross over a column with the ImGuiTableColumnFlags_NoReorder flag.
+    int reorder_dir = (src_order < dst_order) ? +1 : -1;
+    for (int order_n = src_order; (src_order < dst_order && order_n <= dst_order) || (dst_order < src_order && order_n >= dst_order); order_n += reorder_dir)
+        if (table->Columns[table->DisplayOrderToIndex[order_n]].Flags & ImGuiTableColumnFlags_NoReorder)
+        {
+            dst_order = (order_n == src_order) ? src_order : order_n - reorder_dir;
+            break;
+        }
+    return dst_order;
+}
+
+// Reorder requested by user interaction.
+void ImGui::TableQueueSetColumnDisplayOrder(ImGuiTable* table, int column_n, int dst_order)
+{
+    const int src_order = table->Columns[column_n].DisplayOrder;
+    table->ReorderColumn = (ImGuiTableColumnIdx)column_n;
+    table->ReorderColumnDstOrder = (ImGuiTableColumnIdx)-1;
+    dst_order = TableGetMaxDisplayOrderAllowed(table, src_order, dst_order);
+    if (dst_order != src_order)
+        table->ReorderColumnDstOrder = (ImGuiTableColumnIdx)dst_order;
+}
+
 // Adjust flags: default width mode + stretch columns are not allowed when auto extending
 static void TableSetupColumnFlags(ImGuiTable* table, ImGuiTableColumn* column, ImGuiTableColumnFlags flags_in)
 {
@@ -1048,7 +1092,6 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)

    // [Part 6] Setup final position, offset, skip/clip states and clipping rectangles, detect hovered column
    // Process columns in their visible orders as we are comparing the visible order and adjusting host_clip_rect while looping.
-    int visible_n = 0;
    bool has_at_least_one_column_requesting_output = false;
    bool offset_x_frozen = (table->FreezeColumnsCount > 0);
    float offset_x = ((table->FreezeColumnsCount > 0) ? table->OuterRect.Min.x : work_rect.Min.x) + table->OuterPaddingX - table->CellSpacingX1;
@@ -1063,7 +1106,7 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
        // Initial nav layer: using FreezeRowsCount, NOT FreezeRowsRequest, so Header line changes layer when frozen
        column->NavLayerCurrent = (ImS8)(table->FreezeRowsCount > 0 ? ImGuiNavLayer_Menu : (ImGuiNavLayer)table->NavLayer);

-        if (offset_x_frozen && table->FreezeColumnsCount == visible_n)
+        if (offset_x_frozen && table->FreezeColumnsCount == order_n)
        {
            offset_x += work_rect.Min.x - table->OuterRect.Min.x;
            offset_x_frozen = false;
@@ -1183,11 +1226,10 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
            column->CannotSkipItemsQueue >>= 1;
        }

-        if (visible_n < table->FreezeColumnsCount)
+        if (order_n < table->FreezeColumnsCount)
            host_clip_rect.Min.x = ImClamp(column->MaxX + TABLE_BORDER_SIZE, host_clip_rect.Min.x, host_clip_rect.Max.x);

        offset_x += column->WidthGiven + table->CellSpacingX1 + table->CellSpacingX2 + table->CellPaddingX * 2.0f;
-        visible_n++;
    }

    // In case the table is visible (e.g. decorations) but all columns clipped, we keep a column visible.
@@ -1268,7 +1310,7 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)

    // [Part 13] Setup inner window decoration size (for scrolling / nav tracking to properly take account of frozen rows/columns)
    if (table->FreezeColumnsRequest > 0)
-        table->InnerWindow->DecoInnerSizeX1 = table->Columns[table->DisplayOrderToIndex[table->FreezeColumnsRequest - 1]].MaxX - table->OuterRect.Min.x;
+        table->InnerWindow->DecoInnerSizeX1 = table->Columns[table->DisplayOrderToIndex[table->FreezeColumnsRequest - 1]].MaxX - table->OuterRect.Min.x; // FIXME-FROZEN
    if (table->FreezeRowsRequest > 0)
        table->InnerWindow->DecoInnerSizeY1 = table_instance->LastFrozenHeight;
    table_instance->LastFrozenHeight = 0.0f;
@@ -1348,11 +1390,7 @@ void    ImGui::EndTable()
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "EndTable() call should only be done while in BeginTable() scope!");
-        return;
-    }
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "EndTable() call should only be done while in BeginTable() scope!");

    // This assert would be very useful to catch a common error... unfortunately it would probably trigger in some
    // cases, and for consistency user may sometimes output empty tables (and still benefit from e.g. outer border)
@@ -1383,7 +1421,7 @@ void    ImGui::EndTable()
    inner_window->DC.PrevLineSize = temp_data->HostBackupPrevLineSize;
    inner_window->DC.CurrLineSize = temp_data->HostBackupCurrLineSize;
    inner_window->DC.CursorMaxPos = temp_data->HostBackupCursorMaxPos;
-    const float inner_content_max_y = table->RowPosY2;
+    const float inner_content_max_y = ImCeil(table->RowPosY2); // Rounding final position is important as we currently don't round row height ('Demo->Tables->Outer Size' demo uses non-integer heights)
    IM_ASSERT(table->RowPosY2 == inner_window->DC.CursorPos.y);
    if (inner_window != outer_window)
        inner_window->DC.CursorMaxPos.y = inner_content_max_y;
@@ -1601,18 +1639,10 @@ void ImGui::TableSetupColumn(const char* label, ImGuiTableColumnFlags flags, flo
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
-    IM_ASSERT(table->IsLayoutLocked == false && "Need to call TableSetupColumn() before first row!");
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
+    IM_ASSERT_USER_ERROR_RET(table->DeclColumnsCount < table->ColumnsCount, "TableSetupColumn(): called too many times!");
+    IM_ASSERT_USER_ERROR_RET(table->IsLayoutLocked == false, "TableSetupColumn(): need to call before first row!");
    IM_ASSERT((flags & ImGuiTableColumnFlags_StatusMask_) == 0 && "Illegal to pass StatusMask values to TableSetupColumn()");
-    if (table->DeclColumnsCount >= table->ColumnsCount)
-    {
-        IM_ASSERT_USER_ERROR(table->DeclColumnsCount < table->ColumnsCount, "Called TableSetupColumn() too many times!");
-        return;
-    }

    ImGuiTableColumn* column = &table->Columns[table->DeclColumnsCount];
    table->DeclColumnsCount++;
@@ -1620,7 +1650,7 @@ void ImGui::TableSetupColumn(const char* label, ImGuiTableColumnFlags flags, flo
    // Assert when passing a width or weight if policy is entirely left to default, to avoid storing width into weight and vice-versa.
    // Give a grace to users of ImGuiTableFlags_ScrollX.
    if (table->IsDefaultSizingPolicy && (flags & ImGuiTableColumnFlags_WidthMask_) == 0 && (flags & ImGuiTableFlags_ScrollX) == 0)
-        IM_ASSERT(init_width_or_weight <= 0.0f && "Can only specify width/weight if sizing policy is set explicitly in either Table or Column.");
+        IM_ASSERT_USER_ERROR_RET(init_width_or_weight <= 0.0f, "TableSetupColumn(): can only specify width/weight if sizing policy is set explicitly in either Table or Column.");

    // When passing a width automatically enforce WidthFixed policy
    // (whereas TableSetupColumnFlags would default to WidthAuto if table is not resizable)
@@ -1662,12 +1692,8 @@ void ImGui::TableSetupScrollFreeze(int columns, int rows)
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
-    IM_ASSERT(table->IsLayoutLocked == false && "Need to call TableSetupColumn() before first row!");
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
+    IM_ASSERT(table->IsLayoutLocked == false && "TableSetupColumn(): need to call before first row!");
    IM_ASSERT(columns >= 0 && columns < IMGUI_TABLE_MAX_COLUMNS);
    IM_ASSERT(rows >= 0 && rows < 128); // Arbitrary limit

@@ -1676,18 +1702,6 @@ void ImGui::TableSetupScrollFreeze(int columns, int rows)
    table->FreezeRowsRequest = (table->Flags & ImGuiTableFlags_ScrollY) ? (ImGuiTableColumnIdx)rows : 0;
    table->FreezeRowsCount = (table->InnerWindow->Scroll.y != 0.0f) ? table->FreezeRowsRequest : 0;
    table->IsUnfrozenRows = (table->FreezeRowsCount == 0); // Make sure this is set before TableUpdateLayout() so ImGuiListClipper can benefit from it.b
-
-    // Ensure frozen columns are ordered in their section. We still allow multiple frozen columns to be reordered.
-    // FIXME-TABLE: This work for preserving 2143 into 21|43. How about 4321 turning into 21|43? (preserve relative order in each section)
-    for (int column_n = 0; column_n < table->FreezeColumnsRequest; column_n++)
-    {
-        int order_n = table->DisplayOrderToIndex[column_n];
-        if (order_n != column_n && order_n >= table->FreezeColumnsRequest)
-        {
-            ImSwap(table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder, table->Columns[table->DisplayOrderToIndex[column_n]].DisplayOrder);
-            ImSwap(table->DisplayOrderToIndex[order_n], table->DisplayOrderToIndex[column_n]);
-        }
-    }
 }

 //-----------------------------------------------------------------------------
@@ -1743,11 +1757,7 @@ void ImGui::TableSetColumnEnabled(int column_n, bool enabled)
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
    IM_ASSERT(table->Flags & ImGuiTableFlags_Hideable); // See comments above
    if (column_n < 0)
        column_n = table->CurrentColumn;
@@ -1825,12 +1835,8 @@ void ImGui::TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
    IM_ASSERT(target != ImGuiTableBgTarget_None);
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }

    if (color == IM_COL32_DISABLE)
        color = 0;
@@ -2128,11 +2134,7 @@ bool ImGui::TableSetColumnIndex(int column_n)
    {
        if (table->CurrentColumn != -1)
            TableEndCell(table);
-        if ((column_n >= 0 && column_n < table->ColumnsCount) == false)
-        {
-            IM_ASSERT_USER_ERROR(column_n >= 0 && column_n < table->ColumnsCount, "TableSetColumnIndex() invalid column index!");
-            return false;
-        }
+        IM_ASSERT_USER_ERROR_RETV(column_n >= 0 && column_n < table->ColumnsCount, false, "TableSetColumnIndex() invalid column index!");
        TableBeginCell(table, column_n);
    }

@@ -2458,6 +2460,11 @@ void ImGui::TableUpdateColumnsWeightFromWidth(ImGuiTable* table)
 // - TableDrawBorders() [Internal]
 //-------------------------------------------------------------------------

+
+// FIXME: This could be abstracted and merged with PushColumnsBackground(), by creating a generic struct
+// with storage for backup cliprect + backup channel + storage for splitter pointer, new clip rect.
+// This would slightly simplify caller code.
+
 // Bg2 is used by Selectable (and possibly other widgets) to render to the background.
 // Unlike our Bg0/1 channel which we uses for RowBg/CellBg/Borders and where we guarantee all shapes to be CPU-clipped, the Bg2 channel being widgets-facing will rely on regular ClipRect.
 void ImGui::TablePushBackgroundChannel()
@@ -2619,7 +2626,7 @@ void ImGui::TableMergeDrawChannels(ImGuiTable* table)
    const int size_for_masks_bitarrays_one = (int)ImBitArrayGetStorageSizeInBytes(max_draw_channels);
    g.TempBuffer.reserve(size_for_masks_bitarrays_one * 5);
    memset(g.TempBuffer.Data, 0, size_for_masks_bitarrays_one * 5);
-    for (int n = 0; n < IM_ARRAYSIZE(merge_groups); n++)
+    for (int n = 0; n < IM_COUNTOF(merge_groups); n++)
        merge_groups[n].ChannelsMask = (ImBitArrayPtr)(void*)(g.TempBuffer.Data + (size_for_masks_bitarrays_one * n));
    ImBitArrayPtr remaining_mask = (ImBitArrayPtr)(void*)(g.TempBuffer.Data + (size_for_masks_bitarrays_one * 4));

@@ -2676,7 +2683,7 @@ void ImGui::TableMergeDrawChannels(ImGuiTable* table)
    // [DEBUG] Display merge groups
 #if 0
    if (g.IO.KeyShift)
-        for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++)
+        for (int merge_group_n = 0; merge_group_n < IM_COUNTOF(merge_groups); merge_group_n++)
        {
            MergeGroup* merge_group = &merge_groups[merge_group_n];
            if (merge_group->ChannelsCount == 0)
@@ -2704,7 +2711,7 @@ void ImGui::TableMergeDrawChannels(ImGuiTable* table)
        int remaining_count = splitter->_Count - (has_freeze_v ? LEADING_DRAW_CHANNELS + 1 : LEADING_DRAW_CHANNELS);
        //ImRect host_rect = (table->InnerWindow == table->OuterWindow) ? table->InnerClipRect : table->HostClipRect;
        ImRect host_rect = table->HostClipRect;
-        for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++)
+        for (int merge_group_n = 0; merge_group_n < IM_COUNTOF(merge_groups); merge_group_n++)
        {
            if (int merge_channels_count = merge_groups[merge_group_n].ChannelsCount)
            {
@@ -3113,11 +3120,7 @@ void ImGui::TableHeadersRow()
 {
    ImGuiContext& g = *GImGui;
    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");

    // Call layout if not already done. This is automatically done by TableNextRow: we do it here _only_ to make
    // it easier to debug-step in TableUpdateLayout(). Your own version of this function doesn't need this.
@@ -3134,7 +3137,7 @@ void ImGui::TableHeadersRow()
    const int columns_count = TableGetColumnCount();
    for (int column_n = 0; column_n < columns_count; column_n++)
    {
-        if (!TableSetColumnIndex(column_n))
+        if (!TableSetColumnIndex(column_n) && table->LastHeldHeaderColumn != column_n)
            continue;

        // Push an id to allow empty/unnamed headers. This is also idiomatic as it ensure there is a consistent ID path to access columns (for e.g. automation)
@@ -3162,12 +3165,7 @@ void ImGui::TableHeader(const char* label)
        return;

    ImGuiTable* table = g.CurrentTable;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
-
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
    IM_ASSERT(table->CurrentColumn != -1);
    const int column_n = table->CurrentColumn;
    ImGuiTableColumn* column = &table->Columns[column_n];
@@ -3197,7 +3195,7 @@ void ImGui::TableHeader(const char* label)
            sort_arrow = true;
        if (column->SortOrder > 0)
        {
-            ImFormatString(sort_order_suf, IM_ARRAYSIZE(sort_order_suf), "%d", column->SortOrder + 1);
+            ImFormatString(sort_order_suf, IM_COUNTOF(sort_order_suf), "%d", column->SortOrder + 1);
            w_sort_text = g.Style.ItemInnerSpacing.x + CalcTextSize(sort_order_suf).x;
        }
    }
@@ -3242,21 +3240,19 @@ void ImGui::TableHeader(const char* label)
    // FIXME-TABLE: Scroll request while reordering a column and it lands out of the scrolling zone.
    if (held && (table->Flags & ImGuiTableFlags_Reorderable) && IsMouseDragging(0) && !g.DragDropActive)
    {
-        // While moving a column it will jump on the other side of the mouse, so we also test for MouseDelta.x
-        table->ReorderColumn = (ImGuiTableColumnIdx)column_n;
+        // - While moving a column it will jump on the other side of the mouse, so we also test for MouseDelta.x
+        // - We need to handle reordering across hidden columns.
+        //   In the configuration below, moving C to the right of E will lead to:
+        //      ... C [D] E  --->  ... [D] E  C   (Column name/index)
+        //      ... 2  3  4        ...  2  3  4   (Display order)
+        // - The other constraints are enforced by TableQueueSetColumnDisplayOrder() which might early out.
        table->InstanceInteracted = table->InstanceCurrent;
-
-        // We don't reorder: through the frozen<>unfrozen line, or through a column that is marked with ImGuiTableColumnFlags_NoReorder.
        if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < cell_r.Min.x)
            if (ImGuiTableColumn* prev_column = (column->PrevEnabledColumn != -1) ? &table->Columns[column->PrevEnabledColumn] : NULL)
-                if (!((column->Flags | prev_column->Flags) & ImGuiTableColumnFlags_NoReorder))
-                    if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (prev_column->IndexWithinEnabledSet < table->FreezeColumnsRequest))
-                        table->ReorderColumnDir = -1;
+                TableQueueSetColumnDisplayOrder(table, column_n, prev_column->DisplayOrder);
        if (g.IO.MouseDelta.x > 0.0f && g.IO.MousePos.x > cell_r.Max.x)
            if (ImGuiTableColumn* next_column = (column->NextEnabledColumn != -1) ? &table->Columns[column->NextEnabledColumn] : NULL)
-                if (!((column->Flags | next_column->Flags) & ImGuiTableColumnFlags_NoReorder))
-                    if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (next_column->IndexWithinEnabledSet < table->FreezeColumnsRequest))
-                        table->ReorderColumnDir = +1;
+                TableQueueSetColumnDisplayOrder(table, column_n, next_column->DisplayOrder);
    }

    // Sort order arrow
@@ -3295,7 +3291,7 @@ void ImGui::TableHeader(const char* label)
        SetItemTooltip("%.*s", (int)(label_end - label), label);

    // We don't use BeginPopupContextItem() because we want the popup to stay up even after the column is hidden
-    if (IsMouseReleased(1) && IsItemHovered())
+    if (IsPopupOpenRequestForItem(ImGuiPopupFlags_None, id))
        TableOpenContextMenu(column_n);
 }

@@ -3312,7 +3308,7 @@ void ImGui::TableAngledHeadersRow()
    // Which column needs highlight?
    const ImGuiID row_id = GetID("##AngledHeaders");
    ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent);
-    int highlight_column_n = table->HighlightColumnHeader;
+    int highlight_column_n = (table->LastHeldHeaderColumn != -1) ? table->LastHeldHeaderColumn : table->HighlightColumnHeader;
    if (highlight_column_n == -1 && table->HoveredColumnBody != -1)
        if (table_instance->HoveredRowLast == 0 && table->HoveredColumnBorder == -1 && (g.ActiveId == 0 || g.ActiveId == row_id || (table->IsActiveIdInTable || g.DragDropActive)))
            highlight_column_n = table->HoveredColumnBody;
@@ -3342,11 +3338,7 @@ void ImGui::TableAngledHeadersRowEx(ImGuiID row_id, float angle, float max_label
    ImGuiTable* table = g.CurrentTable;
    ImGuiWindow* window = g.CurrentWindow;
    ImDrawList* draw_list = window->DrawList;
-    if (table == NULL)
-    {
-        IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
-        return;
-    }
+    IM_ASSERT_USER_ERROR_RET(table != NULL, "Call should only be done while in BeginTable() scope!");
    IM_ASSERT(table->CurrentRow == -1 && "Must be first row");

    if (max_label_width == 0.0f)
@@ -3370,13 +3362,14 @@ void ImGui::TableAngledHeadersRowEx(ImGuiID row_id, float angle, float max_label
    const ImVec2 header_angled_vector = unit_right * (row_height / -sin_a); // vector from bottom-left to top-left, and from bottom-right to top-right

    // Declare row, override and draw our own background
+    // FIXME-TABLE: Generally broken when overlapping frozen columns limit.
    TableNextRow(ImGuiTableRowFlags_Headers, row_height);
    TableNextColumn();
    const ImRect row_r(table->WorkRect.Min.x, table->BgClipRect.Min.y, table->WorkRect.Max.x, table->RowPosY2);
    table->DrawSplitter->SetCurrentChannel(draw_list, TABLE_DRAW_CHANNEL_BG0);
    float clip_rect_min_x = table->BgClipRect.Min.x;
    if (table->FreezeColumnsCount > 0)
-        clip_rect_min_x = ImMax(clip_rect_min_x, table->Columns[table->FreezeColumnsCount - 1].MaxX);
+        clip_rect_min_x = ImMax(clip_rect_min_x, table->Columns[table->DisplayOrderToIndex[table->FreezeColumnsCount - 1]].MaxX);
    TableSetBgColor(ImGuiTableBgTarget_RowBg0, 0); // Cancel
    PushClipRect(table->BgClipRect.Min, table->BgClipRect.Max, false); // Span all columns
    draw_list->AddRectFilled(ImVec2(table->BgClipRect.Min.x, row_r.Min.y), ImVec2(table->BgClipRect.Max.x, row_r.Max.y), GetColorU32(ImGuiCol_TableHeaderBg, 0.25f)); // FIXME-STYLE: Change row background with an arbitrary color.
@@ -3512,6 +3505,36 @@ bool ImGui::TableBeginContextMenuPopup(ImGuiTable* table)
    return false;
 }

+// FIXME: Copied from MenuItem() for the purpose of being able to pass _SelectOnRelease (#9312)
+static bool MenuItemForColumnReorder(const char* label, bool selected, bool enabled)
+{
+    using namespace ImGui;
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+
+    ImVec2 label_size = CalcTextSize(label, NULL, true);
+    ImGuiMenuColumns* offsets = &window->DC.MenuColumns;
+    float checkmark_w = IM_TRUNC(g.FontSize * 1.20f);
+    float min_w = offsets->DeclColumns(0.0f, label_size.x, 0.0f, checkmark_w); // Feedback for next frame
+    float stretch_w = ImMax(0.0f, GetContentRegionAvail().x - min_w);
+    ImVec2 text_pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset);
+
+    ImGuiID id = GetID(label);
+    ImGuiSelectableFlags selectable_flags = ImGuiSelectableFlags_SelectOnRelease | ImGuiSelectableFlags_SpanAvailWidth;
+    if (g.ActiveId == id)
+        selectable_flags |= ImGuiSelectableFlags_Highlight; // Stays highlighted while dragging.
+    const bool has_been_moved = (g.ActiveId == id) && g.ActiveIdHasBeenEditedBefore; // But disable toggling once moved.
+
+    BeginDisabled(!enabled); // Don't use ImGuiSelectableFlags_Disabled so that Check mark is also affected.
+    bool ret = Selectable(label, false, selectable_flags, ImVec2(min_w, label_size.y)) && !has_been_moved; // Can't use IsMouseDragging(0) as button is released already.
+    if ((g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible) && selected)
+        RenderCheckMark(window->DrawList, text_pos + ImVec2(offsets->OffsetMark + stretch_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(ImGuiCol_Text), g.FontSize * 0.866f);
+    EndDisabled();
+
+    IMGUI_TEST_ENGINE_ITEM_INFO(g.LastItemData.ID, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0));
+    return ret;
+}
+
 // Output context menu into current window (generally a popup)
 // FIXME-TABLE: Ideally this should be writable by the user. Full programmatic access to that data?
 // Sections to display are pulled from 'flags_for_section_to_display', which is typically == table->Flags.
@@ -3528,17 +3551,17 @@ void ImGui::TableDrawDefaultContextMenu(ImGuiTable* table, ImGuiTableFlags flags
        return;

    bool want_separator = false;
-    const int column_n = (table->ContextPopupColumn >= 0 && table->ContextPopupColumn < table->ColumnsCount) ? table->ContextPopupColumn : -1;
-    ImGuiTableColumn* column = (column_n != -1) ? &table->Columns[column_n] : NULL;
+    const int context_column_n = (table->ContextPopupColumn >= 0 && table->ContextPopupColumn < table->ColumnsCount) ? table->ContextPopupColumn : -1;
+    ImGuiTableColumn* context_column = (context_column_n != -1) ? &table->Columns[context_column_n] : NULL;

    // Sizing
    if (flags_for_section_to_display & ImGuiTableFlags_Resizable)
    {
-        if (column != NULL)
+        if (context_column != NULL)
        {
-            const bool can_resize = !(column->Flags & ImGuiTableColumnFlags_NoResize) && column->IsEnabled;
+            const bool can_resize = !(context_column->Flags & ImGuiTableColumnFlags_NoResize) && context_column->IsEnabled;
            if (MenuItem(LocalizeGetMsg(ImGuiLocKey_TableSizeOne), NULL, false, can_resize)) // "###SizeOne"
-                TableSetColumnWidthAutoSingle(table, column_n);
+                TableSetColumnWidthAutoSingle(table, context_column_n);
        }

        const char* size_all_desc;
@@ -3587,23 +3610,47 @@ void ImGui::TableDrawDefaultContextMenu(ImGuiTable* table, ImGuiTableFlags flags
            Separator();
        want_separator = true;

+        // While reordering: we calculate min/max allowed range once here so we can avoid a O(N log N) in the loop (because the query itself does a sweep scan).
+        // This assume that reordering constraints output a single range, otherwise would need to either call TableGetMaxDisplayOrderAllowed() for each item below, or cache this once per frame into columns.
+        const bool is_reordering = (g.ActiveId != 0 && g.ActiveIdWindow == g.CurrentWindow && table->ReorderColumn != -1 && g.ActiveIdHasBeenEditedBefore); // FIXME: This is a bit of a hack.
+        const int reorder_src_order = is_reordering ? table->Columns[table->ReorderColumn].DisplayOrder : -1;
+        const int reorder_min_order = is_reordering ? TableGetMaxDisplayOrderAllowed(table, reorder_src_order, 0) : 0;
+        const int reorder_max_order = is_reordering ? TableGetMaxDisplayOrderAllowed(table, reorder_src_order, table->ColumnsCount - 1) : table->ColumnsCount - 1;
        PushItemFlag(ImGuiItemFlags_AutoClosePopups, false);
-        for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++)
+        for (int order_n = 0; order_n < table->ColumnsCount; order_n++)
        {
-            ImGuiTableColumn* other_column = &table->Columns[other_column_n];
-            if (other_column->Flags & ImGuiTableColumnFlags_Disabled)
+            const int column_n = table->DisplayOrderToIndex[order_n];
+            ImGuiTableColumn* column = &table->Columns[column_n];
+            if (column->Flags & ImGuiTableColumnFlags_Disabled)
                continue;

-            const char* name = TableGetColumnName(table, other_column_n);
+            const char* name = TableGetColumnName(table, column_n);
            if (name == NULL || name[0] == 0)
                name = "<Unknown>";

            // Make sure we can't hide the last active column
-            bool menu_item_active = (other_column->Flags & ImGuiTableColumnFlags_NoHide) ? false : true;
-            if (other_column->IsUserEnabled && table->ColumnsEnabledCount <= 1)
-                menu_item_active = false;
-            if (MenuItem(name, NULL, other_column->IsUserEnabled, menu_item_active))
-                other_column->IsUserEnabledNextFrame = !other_column->IsUserEnabled;
+            bool menu_item_enabled = (column->Flags & ImGuiTableColumnFlags_NoHide) ? false : true;
+            if (column->IsUserEnabled && table->ColumnsEnabledCount <= 1)
+                menu_item_enabled = false;
+            if (is_reordering && (column->DisplayOrder < reorder_min_order || column->DisplayOrder > reorder_max_order))
+                menu_item_enabled = false;
+            if (MenuItemForColumnReorder(name, column->IsUserEnabled, menu_item_enabled))
+                column->IsUserEnabledNextFrame = !column->IsUserEnabled;
+
+            // Drag to reorder
+            // FIXME: It is currently not possible to reorder columns marked with ImGuiTableColumnFlags_NoHide.
+            if (IsItemActive() && IsMouseDragging(0) && g.ActiveIdSource == ImGuiInputSource_Mouse && (table->Flags & ImGuiTableFlags_Reorderable))
+            {
+                g.ActiveIdHasBeenEditedBefore = true; // Disable toggle in MenuItemForColumnReorder() + start dimming to display allowed reorder targets.
+                table->ReorderColumn = (ImGuiTableColumnIdx)column_n;
+                if (!IsItemHovered())
+                {
+                    int reorder_dir = (g.IO.MousePos.y < (g.LastItemData.Rect.Min.y + g.LastItemData.Rect.Max.y) * 0.5f) ? -1 : +1;
+                    float reorder_amount = (reorder_dir < 0 ? g.LastItemData.Rect.Min.y - g.IO.MousePos.y : g.IO.MousePos.y - g.LastItemData.Rect.Max.y) / g.LastItemData.Rect.GetHeight();
+                    int dst_order = column->DisplayOrder + (int)ImCeil(reorder_amount) * reorder_dir; // Estimated target order, will be validated and clamped.
+                    TableQueueSetColumnDisplayOrder(table, column_n, dst_order);
+                }
+            }
        }
        PopItemFlag();
    }
@@ -3787,7 +3834,6 @@ void ImGui::TableLoadSettings(ImGuiTable* table)

    // Serialize ImGuiTableSettings/ImGuiTableColumnSettings into ImGuiTable/ImGuiTableColumn
    ImGuiTableColumnSettings* column_settings = settings->GetColumnSettings();
-    ImU64 display_order_mask = 0;
    for (int data_n = 0; data_n < settings->ColumnsCount; data_n++, column_settings++)
    {
        int column_n = column_settings->Index;
@@ -3804,24 +3850,51 @@ void ImGui::TableLoadSettings(ImGuiTable* table)
        }
        if (settings->SaveFlags & ImGuiTableFlags_Reorderable)
            column->DisplayOrder = column_settings->DisplayOrder;
-        display_order_mask |= (ImU64)1 << column->DisplayOrder;
        if ((settings->SaveFlags & ImGuiTableFlags_Hideable) && column_settings->IsEnabled != -1)
            column->IsUserEnabled = column->IsUserEnabledNextFrame = column_settings->IsEnabled == 1;
        column->SortOrder = column_settings->SortOrder;
        column->SortDirection = column_settings->SortDirection;
    }

-    // Validate and fix invalid display order data
-    const ImU64 expected_display_order_mask = (settings->ColumnsCount == 64) ? ~0 : ((ImU64)1 << settings->ColumnsCount) - 1;
-    if (display_order_mask != expected_display_order_mask)
-        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-            table->Columns[column_n].DisplayOrder = (ImGuiTableColumnIdx)column_n;
-
-    // Rebuild index
+    // Fix display order and build index
+    if (settings->SaveFlags & ImGuiTableFlags_Reorderable)
+        TableFixDisplayOrder(table);
    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
        table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n;
 }

+struct ImGuiTableFixDisplayOrderColumnData
+{
+    ImGuiTableColumnIdx     Idx;
+    ImGuiTable*             Table;  // This is unfortunate but we don't have userdata in qsort api.
+};
+
+// Sort by DisplayOrder and then Index
+static int IMGUI_CDECL TableFixDisplayOrderComparer(const void* lhs, const void* rhs)
+{
+    const ImGuiTable* table = ((const ImGuiTableFixDisplayOrderColumnData*)lhs)->Table;
+    const ImGuiTableColumnIdx lhs_idx = ((const ImGuiTableFixDisplayOrderColumnData*)lhs)->Idx;
+    const ImGuiTableColumnIdx rhs_idx = ((const ImGuiTableFixDisplayOrderColumnData*)rhs)->Idx;
+    const int order_delta = (table->Columns[lhs_idx].DisplayOrder - table->Columns[rhs_idx].DisplayOrder);
+    return (order_delta > 0) ? +1 : (order_delta < 0) ? -1 : (lhs_idx > rhs_idx) ? +1 : -1;
+}
+
+// Fix invalid display order data: compact values (0,1,3 -> 0,1,2); preserve relative order (0,3,1 -> 0,2,1); deduplicate (0,4,1,1 -> 0,3,1,2)
+void ImGui::TableFixDisplayOrder(ImGuiTable* table)
+{
+    ImGuiContext& g = *GImGui;
+    g.TempBuffer.reserve((int)(sizeof(ImGuiTableFixDisplayOrderColumnData) * table->ColumnsCount)); // FIXME: Maybe wrap those two lines as a helper.
+    ImGuiTableFixDisplayOrderColumnData* fdo_columns = (ImGuiTableFixDisplayOrderColumnData*)(void*)g.TempBuffer.Data;
+    for (int n = 0; n < table->ColumnsCount; n++)
+    {
+        fdo_columns[n].Idx = (ImGuiTableColumnIdx)n;
+        fdo_columns[n].Table = table;
+    }
+    ImQsort(fdo_columns, (size_t)table->ColumnsCount, sizeof(ImGuiTableFixDisplayOrderColumnData), TableFixDisplayOrderComparer);
+    for (int n = 0; n < table->ColumnsCount; n++)
+        table->Columns[fdo_columns[n].Idx].DisplayOrder = (ImGuiTableColumnIdx)n;
+}
+
 static void TableSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*)
 {
    ImGuiContext& g = *ctx;
@@ -4047,7 +4120,7 @@ void ImGui::DebugNodeTable(ImGuiTable* table)
    BulletText("ColumnsGivenWidth: %.1f, ColumnsAutoFitWidth: %.1f, InnerWidth: %.1f%s", table->ColumnsGivenWidth, table->ColumnsAutoFitWidth, table->InnerWidth, table->InnerWidth == 0.0f ? " (auto)" : "");
    BulletText("CellPaddingX: %.1f, CellSpacingX: %.1f/%.1f, OuterPaddingX: %.1f", table->CellPaddingX, table->CellSpacingX1, table->CellSpacingX2, table->OuterPaddingX);
    BulletText("HoveredColumnBody: %d, HoveredColumnBorder: %d", table->HoveredColumnBody, table->HoveredColumnBorder);
-    BulletText("ResizedColumn: %d, ReorderColumn: %d, HeldHeaderColumn: %d", table->ResizedColumn, table->ReorderColumn, table->HeldHeaderColumn);
+    BulletText("ResizedColumn: %d, HeldHeaderColumn: %d, ReorderColumn: %d", table->LastResizedColumn, table->LastHeldHeaderColumn, table->ReorderColumn);
    for (int n = 0; n < table->InstanceCurrent + 1; n++)
    {
        ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, n);
@@ -4063,7 +4136,7 @@ void ImGui::DebugNodeTable(ImGuiTable* table)
        ImGuiTableColumn* column = &table->Columns[n];
        const char* name = TableGetColumnName(table, n);
        char buf[512];
-        ImFormatString(buf, IM_ARRAYSIZE(buf),
+        ImFormatString(buf, IM_COUNTOF(buf),
            "Column %d order %d '%s': offset %+.2f to %+.2f%s\n"
            "Enabled: %d, VisibleX/Y: %d/%d, RequestOutput: %d, SkipItems: %d, DrawChannels: %d,%d\n"
            "WidthGiven: %.1f, Request/Auto: %.1f/%.1f, StretchWeight: %.3f (%.1f%%)\n"
@@ -315,7 +315,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0
      if (node->y > min_y) {
         // raise min_y higher.
         // we've accounted for all waste up to min_y,
-         // but we'll now add more waste for everything we've visted
+         // but we'll now add more waste for everything we've visited
         waste_area += visited_width * (node->y - min_y);
         min_y = node->y;
         // the first time through, visited_width might be reduced
@@ -470,7 +470,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i

   // insert the new node into the right starting point, and
   // let 'cur' point to the remaining nodes needing to be
-   // stiched back in
+   // stitched back in

   cur = *res.prev_link;
   if (cur->x < res.x) {
@@ -886,7 +886,7 @@ STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, fl
 // xoff/yoff are the offset it pixel space from the glyph origin to the top-left of the bitmap

 STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-// the same as stbtt_GetCodepoitnBitmap, but you can specify a subpixel
+// the same as stbtt_GetCodepointBitmap, but you can specify a subpixel
 // shift for the character

 STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint);
@@ -1,7 +1,8 @@
 // Generated by https://github.com/juliettef/IconFontCppHeaders script GenerateIconFontCppHeaders.py
 // for C and C++
 // from codepoints https://github.com/FortAwesome/Font-Awesome/raw/7.x/metadata/icons.yml
-// for use with font https://github.com/FortAwesome/Font-Awesome/blob/7.x/webfonts/fa-regular-400.woff2 (You may need to convert the .woff2 files to .ttf depending upon your loader.), https://github.com/FortAwesome/Font-Awesome/blob/7.x/webfonts/fa-solid-900.woff2 (You may need to convert the .woff2 files to .ttf depending upon your loader.)
+// for use with font https://github.com/FortAwesome/Font-Awesome/blob/7.x/otfs/Font Awesome 7 Free-Regular-400.otf, https://github.com/FortAwesome/Font-Awesome/blob/7.x/otfs/Font Awesome 7 Free-Solid-900.otf
+// converted to ttf

 #pragma once

@@ -45,7 +46,9 @@
 #define ICON_FA_ANGLES_UP "\xef\x84\x82"	// U+f102
 #define ICON_FA_ANKH "\xef\x99\x84"	// U+f644
 #define ICON_FA_APPLE_WHOLE "\xef\x97\x91"	// U+f5d1
+#define ICON_FA_AQUARIUS "\xee\xa1\x85"	// U+e845
 #define ICON_FA_ARCHWAY "\xef\x95\x97"	// U+f557
+#define ICON_FA_ARIES "\xee\xa1\x86"	// U+e846
 #define ICON_FA_ARROW_DOWN "\xef\x81\xa3"	// U+f063
 #define ICON_FA_ARROW_DOWN_1_9 "\xef\x85\xa2"	// U+f162
 #define ICON_FA_ARROW_DOWN_9_1 "\xef\xa2\x86"	// U+f886
@@ -238,8 +241,10 @@
 #define ICON_FA_CAMERA_RETRO "\xef\x82\x83"	// U+f083
 #define ICON_FA_CAMERA_ROTATE "\xee\x83\x98"	// U+e0d8
 #define ICON_FA_CAMPGROUND "\xef\x9a\xbb"	// U+f6bb
+#define ICON_FA_CANCER "\xee\xa1\x87"	// U+e847
 #define ICON_FA_CANDY_CANE "\xef\x9e\x86"	// U+f786
 #define ICON_FA_CANNABIS "\xef\x95\x9f"	// U+f55f
+#define ICON_FA_CAPRICORN "\xee\xa1\x88"	// U+e848
 #define ICON_FA_CAPSULES "\xef\x91\xab"	// U+f46b
 #define ICON_FA_CAR "\xef\x86\xb9"	// U+f1b9
 #define ICON_FA_CAR_BATTERY "\xef\x97\x9f"	// U+f5df
@@ -341,6 +346,7 @@
 #define ICON_FA_CLOCK_ROTATE_LEFT "\xef\x87\x9a"	// U+f1da
 #define ICON_FA_CLONE "\xef\x89\x8d"	// U+f24d
 #define ICON_FA_CLOSED_CAPTIONING "\xef\x88\x8a"	// U+f20a
+#define ICON_FA_CLOSED_CAPTIONING_SLASH "\xee\x84\xb5"	// U+e135
 #define ICON_FA_CLOUD "\xef\x83\x82"	// U+f0c2
 #define ICON_FA_CLOUD_ARROW_DOWN "\xef\x83\xad"	// U+f0ed
 #define ICON_FA_CLOUD_ARROW_UP "\xef\x83\xae"	// U+f0ee
@@ -595,6 +601,7 @@
 #define ICON_FA_GEAR "\xef\x80\x93"	// U+f013
 #define ICON_FA_GEARS "\xef\x82\x85"	// U+f085
 #define ICON_FA_GEM "\xef\x8e\xa5"	// U+f3a5
+#define ICON_FA_GEMINI "\xee\xa1\x89"	// U+e849
 #define ICON_FA_GENDERLESS "\xef\x88\xad"	// U+f22d
 #define ICON_FA_GHOST "\xef\x9b\xa2"	// U+f6e2
 #define ICON_FA_GIFT "\xef\x81\xab"	// U+f06b
@@ -777,8 +784,10 @@
 #define ICON_FA_LEFT_LONG "\xef\x8c\x8a"	// U+f30a
 #define ICON_FA_LEFT_RIGHT "\xef\x8c\xb7"	// U+f337
 #define ICON_FA_LEMON "\xef\x82\x94"	// U+f094
+#define ICON_FA_LEO "\xee\xa1\x8a"	// U+e84a
 #define ICON_FA_LESS_THAN "<"	// U+003c
 #define ICON_FA_LESS_THAN_EQUAL "\xef\x94\xb7"	// U+f537
+#define ICON_FA_LIBRA "\xee\xa1\x8b"	// U+e84b
 #define ICON_FA_LIFE_RING "\xef\x87\x8d"	// U+f1cd
 #define ICON_FA_LIGHTBULB "\xef\x83\xab"	// U+f0eb
 #define ICON_FA_LINES_LEANING "\xee\x94\x9e"	// U+e51e
@@ -982,8 +991,10 @@
 #define ICON_FA_PHONE_SLASH "\xef\x8f\x9d"	// U+f3dd
 #define ICON_FA_PHONE_VOLUME "\xef\x8a\xa0"	// U+f2a0
 #define ICON_FA_PHOTO_FILM "\xef\xa1\xbc"	// U+f87c
+#define ICON_FA_PICTURE_IN_PICTURE "\xee\xa0\x8b"	// U+e80b
 #define ICON_FA_PIGGY_BANK "\xef\x93\x93"	// U+f4d3
 #define ICON_FA_PILLS "\xef\x92\x84"	// U+f484
+#define ICON_FA_PISCES "\xee\xa1\x8c"	// U+e84c
 #define ICON_FA_PIZZA_SLICE "\xef\xa0\x98"	// U+f818
 #define ICON_FA_PLACE_OF_WORSHIP "\xef\x99\xbf"	// U+f67f
 #define ICON_FA_PLANE "\xef\x81\xb2"	// U+f072
@@ -1074,6 +1085,7 @@
 #define ICON_FA_S "S"	// U+0053
 #define ICON_FA_SACK_DOLLAR "\xef\xa0\x9d"	// U+f81d
 #define ICON_FA_SACK_XMARK "\xee\x95\xaa"	// U+e56a
+#define ICON_FA_SAGITTARIUS "\xee\xa1\x8d"	// U+e84d
 #define ICON_FA_SAILBOAT "\xee\x91\x85"	// U+e445
 #define ICON_FA_SATELLITE "\xef\x9e\xbf"	// U+f7bf
 #define ICON_FA_SATELLITE_DISH "\xef\x9f\x80"	// U+f7c0
@@ -1087,6 +1099,7 @@
 #define ICON_FA_SCHOOL_FLAG "\xee\x95\xae"	// U+e56e
 #define ICON_FA_SCHOOL_LOCK "\xee\x95\xaf"	// U+e56f
 #define ICON_FA_SCISSORS "\xef\x83\x84"	// U+f0c4
+#define ICON_FA_SCORPIO "\xee\xa1\x8e"	// U+e84e
 #define ICON_FA_SCREWDRIVER "\xef\x95\x8a"	// U+f54a
 #define ICON_FA_SCREWDRIVER_WRENCH "\xef\x9f\x99"	// U+f7d9
 #define ICON_FA_SCROLL "\xef\x9c\x8e"	// U+f70e
@@ -1230,6 +1243,7 @@
 #define ICON_FA_TAPE "\xef\x93\x9b"	// U+f4db
 #define ICON_FA_TARP "\xee\x95\xbb"	// U+e57b
 #define ICON_FA_TARP_DROPLET "\xee\x95\xbc"	// U+e57c
+#define ICON_FA_TAURUS "\xee\xa1\x8f"	// U+e84f
 #define ICON_FA_TAXI "\xef\x86\xba"	// U+f1ba
 #define ICON_FA_TEETH "\xef\x98\xae"	// U+f62e
 #define ICON_FA_TEETH_OPEN "\xef\x98\xaf"	// U+f62f
@@ -1369,6 +1383,7 @@
 #define ICON_FA_VIDEO "\xef\x80\xbd"	// U+f03d
 #define ICON_FA_VIDEO_SLASH "\xef\x93\xa2"	// U+f4e2
 #define ICON_FA_VIHARA "\xef\x9a\xa7"	// U+f6a7
+#define ICON_FA_VIRGO "\xee\xa1\x90"	// U+e850
 #define ICON_FA_VIRUS "\xee\x81\xb4"	// U+e074
 #define ICON_FA_VIRUS_COVID "\xee\x92\xa8"	// U+e4a8
 #define ICON_FA_VIRUS_COVID_SLASH "\xee\x92\xa9"	// U+e4a9
@@ -1377,6 +1392,7 @@
 #define ICON_FA_VOICEMAIL "\xef\xa2\x97"	// U+f897
 #define ICON_FA_VOLCANO "\xef\x9d\xb0"	// U+f770
 #define ICON_FA_VOLLEYBALL "\xef\x91\x9f"	// U+f45f
+#define ICON_FA_VOLUME "\xef\x9a\xa8"	// U+f6a8
 #define ICON_FA_VOLUME_HIGH "\xef\x80\xa8"	// U+f028
 #define ICON_FA_VOLUME_LOW "\xef\x80\xa7"	// U+f027
 #define ICON_FA_VOLUME_OFF "\xef\x80\xa6"	// U+f026
@@ -50,7 +50,6 @@
 #include <libchdr/huffman.h>
 #include <zstd.h>

-#include "LzmaEnc.h"
 #include "LzmaDec.h"
 #if defined(__PS3__) || defined(__PSL1GHT__)
 #define __MACTYPES__
@@ -466,28 +465,6 @@ static void lzma_allocator_free(void* p )
 	}
 }

-/*-------------------------------------------------
- *  lzma_allocator_free_unused
- *  free unused buffers only
- *-------------------------------------------------
- */
-
-static void lzma_allocator_free_unused(lzma_allocator *codec)
-{
-	int i;
-
-	for (i = 0; i < MAX_LZMA_ALLOCS; i++)
-	{
-		uint32_t *ptr = codec->allocptr[i];
-		if (ptr && (*ptr & 1) == 0)
-		{
-			free(codec->allocptr[i]);
-			codec->allocptr[i] = NULL;
-			codec->allocptr2[i] = NULL;
-		}
-	}
-}
-
 /*-------------------------------------------------
 *  lzma_fast_alloc - fast malloc for lzma, which
 *  allocates and frees memory frequently
@@ -583,6 +560,61 @@ static void lzma_fast_free(void *p, void *address)
 ***************************************************************************
 */

+/*-------------------------------------------------
+ *  lzma_compute_aligned_dictionary_size
+ *  Based on LzmaEncProps_Normalize, LzmaEnc_SetProps, LzmaEnc_WriteProperties.
+ *-------------------------------------------------
+ */
+
+static uint32_t lzma_compute_aligned_dictionary_size(uint32_t hunkbytes)
+{
+	const unsigned int level = 9;
+	const uint32_t reduceSize = hunkbytes;
+
+	uint32_t dictSize, alignedDictSize;
+
+	/* LzmaEncProps_Normalize */
+	dictSize = level <= 4 ?
+		(uint32_t)1 << (level * 2 + 16) :
+		level <= sizeof(size_t) / 2 + 4 ?
+			(uint32_t)1 << (level + 20) :
+			(uint32_t)1 << (sizeof(size_t) / 2 + 24);
+
+	if (dictSize > reduceSize)
+	{
+		const uint32_t kReduceMin = (uint32_t)1 << 12;
+		const uint32_t max = MIN(kReduceMin, reduceSize);
+
+		dictSize = MAX(max, dictSize);
+	}
+
+	/* LzmaEnc_SetProps */
+	dictSize = MIN((uint32_t)15 << 28, dictSize); /* kLzmaMaxHistorySize */
+
+	/* LzmaEnc_WriteProperties */
+	/* we write aligned dictionary value to properties for lzma decoder */
+	if (dictSize >= ((uint32_t)1 << 21))
+	{
+		const uint32_t kDictMask = ((uint32_t)1 << 20) - 1;
+
+		alignedDictSize = (dictSize + kDictMask) & ~kDictMask;
+		alignedDictSize = MIN(dictSize, alignedDictSize);
+	}
+	else
+	{
+		unsigned int i = 11 * 2;
+
+		do
+		{
+			alignedDictSize = (uint32_t)(2 + (i & 1)) << (i >> 1);
+			i++;
+		}
+		while (alignedDictSize < dictSize);
+	}
+
+	return alignedDictSize;
+}
+
 /*-------------------------------------------------
 *  lzma_codec_init - constructor
 *-------------------------------------------------
@@ -590,47 +622,22 @@ static void lzma_fast_free(void *p, void *address)

 static chd_error lzma_codec_init(void* codec, uint32_t hunkbytes)
 {
-	CLzmaEncHandle enc;
-	CLzmaEncProps encoder_props;
-	Byte decoder_props[LZMA_PROPS_SIZE];
-	SizeT props_size;
-	lzma_allocator* alloc;
 	lzma_codec_data* lzma_codec = (lzma_codec_data*) codec;
+	lzma_allocator* alloc = &lzma_codec->allocator;
+	const uint32_t alignedDictSize = lzma_compute_aligned_dictionary_size(hunkbytes);
+
+	unsigned int i;
+	Byte decoder_props[LZMA_PROPS_SIZE];
+
+	decoder_props[0] = 93;
+	for (i = 0; i < LZMA_PROPS_SIZE - 1; ++i)
+		decoder_props[1 + i] = (alignedDictSize >> (8 * i)) & 0xFF;
+
+	lzma_allocator_init(alloc);

 	/* construct the decoder */
 	LzmaDec_Construct(&lzma_codec->decoder);

-	/* FIXME: this code is written in a way that makes it impossible to safely upgrade the LZMA SDK
-	 * This code assumes that the current version of the encoder imposes the same requirements on the
-	 * decoder as the encoder used to produce the file.  This is not necessarily true.  The format
-	 * needs to be changed so the encoder properties are written to the file.
-
-	 * configure the properties like the compressor did */
-	LzmaEncProps_Init(&encoder_props);
-	encoder_props.level = 9;
-	encoder_props.reduceSize = hunkbytes;
-	LzmaEncProps_Normalize(&encoder_props);
-
-	/* convert to decoder properties */
-	alloc = &lzma_codec->allocator;
-	lzma_allocator_init(alloc);
-	enc = LzmaEnc_Create((ISzAlloc*)alloc);
-	if (!enc)
-		return CHDERR_DECOMPRESSION_ERROR;
-	if (LzmaEnc_SetProps(enc, &encoder_props) != SZ_OK)
-	{
-		LzmaEnc_Destroy(enc, (ISzAlloc*)&alloc, (ISzAlloc*)&alloc);
-		return CHDERR_DECOMPRESSION_ERROR;
-	}
-	props_size = sizeof(decoder_props);
-	if (LzmaEnc_WriteProperties(enc, decoder_props, &props_size) != SZ_OK)
-	{
-		LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc);
-		return CHDERR_DECOMPRESSION_ERROR;
-	}
-	LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc);
-	lzma_allocator_free_unused(alloc);
-
 	/* do memory allocations */
 	if (LzmaDec_Allocate(&lzma_codec->decoder, decoder_props, LZMA_PROPS_SIZE, (ISzAlloc*)alloc) != SZ_OK)
 		return CHDERR_DECOMPRESSION_ERROR;
@@ -1,7 +1,7 @@
 #ifndef RA_CONSOLES_H
 #define RA_CONSOLES_H

-/* this list should match the list in rcheevos/include/rconsoles.h */
+/* this list should match the list in rcheevos/include/rc_consoles.h */
 enum ConsoleID
 {
    UnknownConsoleID = 0,
@@ -77,6 +77,19 @@ enum ConsoleID
    Zeebo = 70,
    Arduboy = 71,
    WASM4 = 72,
+    Arcadia2001 = 73,
+    IntertonVC4000 = 74,
+    ElektorTVGamesComputer = 75,
+    PCEngineCD = 76,
+    JaguarCD = 77,
+    DSi = 78,
+    TI83 = 79,
+    Uzebox = 80,
+    FamicomDiskSystem = 81,
+
+    Hubs = 100,
+    Events = 101,
+    Standalone = 102,

    NumConsoleIDs
 };
@@ -5,10 +5,23 @@
 #include <stdexcept>
 #include <string>

+#ifndef RA_NOPROGRESS
+ #include <ShlObj.h>
+#else
+ #define IProgressDialog void
+#endif
+
 #ifndef CCONV
 #define CCONV __cdecl
 #endif

+#if defined(_M_X64) || defined(__amd64__)
+ #define RA_X64
+ #define RA_INT_DLL L"RA_Integration-x64.dll"
+#else
+ #define RA_INT_DLL L"RA_Integration.dll"
+#endif
+
 // Initialization
 static const char*  (CCONV* _RA_IntegrationVersion)() = nullptr;
 static const char*  (CCONV* _RA_HostName)() = nullptr;
@@ -270,10 +283,58 @@ void RA_DisableHardcore()
        _RA_WarnDisableHardcore(nullptr);
 }

-static size_t DownloadToFile(char* pData, size_t nDataSize, void* pUserData)
+#ifndef RA_NOPROGRESS
+
+static void FormatByteSize(DWORD nSize, wchar_t* sBuffer, size_t nBufferSize)
+{
+    if (nSize < 1024)
+    {
+        swprintf_s(sBuffer, nBufferSize, L"%u bytes", nSize);
+        return;
+    }
+
+    float fSize = nSize;
+    fSize /= 1024.0;
+    if (fSize < 1024.0)
+    {
+        swprintf_s(sBuffer, nBufferSize, L"%.2f KB", fSize);
+        return;
+    }
+
+    fSize /= 1024.0;
+    swprintf_s(sBuffer, nBufferSize, L"%.2f MB", fSize);
+}
+
+static void SetProgressMessage(IProgressDialog* pProgressDialog, DWORD nProgress, DWORD nMax)
+{
+    wchar_t sNum[32];
+    std::wstring sMessage;
+
+    FormatByteSize(nProgress, sNum, sizeof(sNum) / sizeof(sNum[0]));
+    sMessage.append(sNum);
+    sMessage.append(L" of ");
+
+    FormatByteSize(nMax, sNum, sizeof(sNum) / sizeof(sNum[0]));
+    sMessage.append(sNum);
+
+    pProgressDialog->SetLine(2, sMessage.c_str(), FALSE, NULL);
+}
+
+#endif
+
+static size_t DownloadToFile(char* pData, size_t nDataSize, void* pUserData, DWORD* pStatusCode)
 {
    FILE* file = (FILE*)pUserData;
-    return fwrite(pData, 1, nDataSize, file);
+    size_t nBytesWritten = fwrite(pData, 1, nDataSize, file);
+    if (nBytesWritten != nDataSize)
+    {
+        std::string sMessage;
+        sMessage = "Error " + std::to_string(errno) + " writing file: " + strerror(errno);
+        MessageBoxA(nullptr, sMessage.c_str(), "Error", MB_OK | MB_ICONERROR);
+        *pStatusCode = 0;
+    }
+
+    return nBytesWritten;
 }

 typedef struct DownloadBuffer
@@ -283,7 +344,7 @@ typedef struct DownloadBuffer
    size_t nOffset;
 } DownloadBuffer;

-static size_t DownloadToBuffer(char* pData, size_t nDataSize, void* pUserData)
+static size_t DownloadToBuffer(char* pData, size_t nDataSize, void* pUserData, DWORD* pStatusCode)
 {
    DownloadBuffer* pBuffer = (DownloadBuffer*)pUserData;
    const size_t nRemaining = pBuffer->nBufferSize - pBuffer->nOffset;
@@ -299,10 +360,10 @@ static size_t DownloadToBuffer(char* pData, size_t nDataSize, void* pUserData)
    return nDataSize;
 }

-typedef size_t (DownloadFunc)(char* pData, size_t nDataSize, void* pUserData);
+typedef size_t (DownloadFunc)(char* pData, size_t nDataSize, void* pUserData, DWORD* pStatusCode);

 static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage, const char* sPostData,
-  DownloadFunc fnDownload, void* pDownloadUserData, DWORD* pBytesRead, DWORD* pStatusCode)
+  DownloadFunc fnDownload, void* pDownloadUserData, DWORD* pBytesRead, DWORD* pStatusCode, IProgressDialog* pProgressDialog)
 {
    BOOL bResults = FALSE, bSuccess = FALSE;
    HINTERNET hSession = nullptr, hConnect = nullptr, hRequest = nullptr;
@@ -355,6 +416,8 @@ static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage,
        mbstowcs_s(&nTemp, wBuffer, sizeof(wBuffer) / sizeof(wBuffer[0]), sHostName, nHostnameLen);
 #else
        nTemp = mbstowcs(wBuffer, sHostName, nHostnameLen);
+        if (nTemp > 0)
+            wBuffer[nTemp] = '\0';
 #endif

        if (nTemp > 0)
@@ -373,6 +436,8 @@ static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage,
            mbstowcs_s(&nTemp, wBuffer, sizeof(wBuffer) / sizeof(wBuffer[0]), sRequestedPage, strlen(sRequestedPage) + 1);
 #else
            nTemp = mbstowcs(wBuffer, sRequestedPage, strlen(sRequestedPage) + 1);
+            if (nTemp > 0)
+                wBuffer[nTemp] = '\0';
 #endif

            hRequest = WinHttpOpenRequest(hConnect,
@@ -410,12 +475,28 @@ static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage,
                }
                else
                {
-                    char buffer[16384];
+                    const DWORD nBufferSize = 16384;
+                    char* pBuffer = (char*)malloc(nBufferSize);
                    DWORD dwSize = sizeof(DWORD);
                    WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, WINHTTP_HEADER_NAME_BY_INDEX, pStatusCode, &dwSize, WINHTTP_NO_HEADER_INDEX);
+                    bSuccess = (*pStatusCode == 200);
+                    const DWORD nDefaultTotalBytes = 3 * 1024 * 1024;
+                    DWORD nTotalBytes = nDefaultTotalBytes;

-                    bSuccess = TRUE;
-                    do
+#ifndef RA_NOPROGRESS
+                    if (pProgressDialog)
+                    {
+                        dwSize = nBufferSize;
+                        if (WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_CONTENT_LENGTH, WINHTTP_HEADER_NAME_BY_INDEX, pBuffer, &dwSize, WINHTTP_NO_HEADER_INDEX))
+                        {
+                            nTotalBytes = wcstoul((const wchar_t*)pBuffer, NULL, 10);
+
+                            SetProgressMessage(pProgressDialog, 0, nTotalBytes);
+                        }
+                    }
+#endif
+
+                    while (bSuccess)
                    {
                        nBytesAvailable = 0;
                        WinHttpQueryDataAvailable(hRequest, &nBytesAvailable);
@@ -424,20 +505,17 @@ static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage,

                        do
                        {
-                            if (nBytesAvailable > sizeof(buffer))
-                                nBytesToRead = sizeof(buffer);
+                            if (nBytesAvailable > nBufferSize)
+                                nBytesToRead = nBufferSize;
                            else
                                nBytesToRead = nBytesAvailable;

                            nBytesFetched = 0;
-                            if (WinHttpReadData(hRequest, buffer, nBytesToRead, &nBytesFetched))
+                            if (WinHttpReadData(hRequest, pBuffer, nBytesToRead, &nBytesFetched))
                            {
-                                size_t nBytesWritten = fnDownload(buffer, nBytesFetched, pDownloadUserData);
+                                size_t nBytesWritten = fnDownload(pBuffer, nBytesFetched, pDownloadUserData, pStatusCode);
                                if (nBytesWritten < nBytesFetched)
                                {
-                                    if (*pStatusCode == 200)
-                                        *pStatusCode = 998;
-
                                    bSuccess = FALSE;
                                    break;
                                }
@@ -453,8 +531,27 @@ static BOOL DoBlockingHttpCall(const char* sHostUrl, const char* sRequestedPage,
                                bSuccess = FALSE;
                                break;
                            }
+
+#ifndef RA_NOPROGRESS
+                            if (pProgressDialog)
+                            {
+                                if (pProgressDialog->HasUserCancelled())
+                                {
+                                    bSuccess = FALSE;
+                                    *pStatusCode = 0;
+                                    break;
+                                }
+
+                                pProgressDialog->SetProgress(*pBytesRead, nTotalBytes);
+
+                                if (nTotalBytes != nDefaultTotalBytes)
+                                    SetProgressMessage(pProgressDialog, *pBytesRead, nTotalBytes);
+                            }
+#endif
                        } while (nBytesAvailable > 0);
-                    } while (TRUE);
+                    };
+
+                    free(pBuffer);
                }

                WinHttpCloseHandle(hRequest);
@@ -502,7 +599,7 @@ static BOOL DoBlockingHttpCallWithRetry(const char* sHostUrl, const char* sReque
        downloadBuffer.pBuffer = pBufferOut;
        downloadBuffer.nBufferSize = nBufferOutSize;

-        if (DoBlockingHttpCall(sHostUrl, sRequestedPage, sPostData, DownloadToBuffer, &downloadBuffer, pBytesRead, pStatusCode) != FALSE)
+        if (DoBlockingHttpCall(sHostUrl, sRequestedPage, sPostData, DownloadToBuffer, &downloadBuffer, pBytesRead, pStatusCode, NULL) != FALSE)
            return TRUE;

        if (!IsNetworkError(*pStatusCode))
@@ -515,26 +612,54 @@ static BOOL DoBlockingHttpCallWithRetry(const char* sHostUrl, const char* sReque
 }

 static BOOL DoBlockingHttpCallWithRetry(const char* sHostUrl, const char* sRequestedPage, const char* sPostData,
-  FILE* pFile, DWORD* pBytesRead, DWORD* pStatusCode)
+  FILE* pFile, DWORD* pBytesRead, DWORD* pStatusCode, const wchar_t* sMessage)
 {
-  int nRetries = 4;
-  do
-  {
-      fseek(pFile, 0, SEEK_SET);
-      if (DoBlockingHttpCall(sHostUrl, sRequestedPage, sPostData, DownloadToFile, pFile, pBytesRead, pStatusCode) != FALSE)
-        return TRUE;
+    IProgressDialog* pProgressDialog = NULL;
+#ifndef RA_NOPROGRESS
+    HRESULT hrInit = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+    HRESULT hr = CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, IID_IProgressDialog, (LPVOID*)&pProgressDialog);

-      if (!IsNetworkError(*pStatusCode))
-        return FALSE;
+    if (SUCCEEDED(hr))
+    {
+        if (sMessage)
+            pProgressDialog->SetLine(1, sMessage, FALSE, NULL);
+        pProgressDialog->StartProgressDialog(NULL, NULL, PROGDLG_NORMAL, NULL);
+    }
+#endif

-      --nRetries;
-  } while (nRetries);
+    BOOL success = FALSE;
+    int nRetries = 4;
+    do
+    {
+        fseek(pFile, 0, SEEK_SET);
+        if (DoBlockingHttpCall(sHostUrl, sRequestedPage, sPostData, DownloadToFile, pFile, pBytesRead, pStatusCode, pProgressDialog) != FALSE)
+        {
+            success = TRUE;
+            break;
+        }

-  return FALSE;
+        if (!IsNetworkError(*pStatusCode))
+            break;
+
+        --nRetries;
+    } while (nRetries);
+
+#ifndef RA_NOPROGRESS
+    if (pProgressDialog)
+    {
+        pProgressDialog->StopProgressDialog();
+        pProgressDialog->Release();
+    }
+
+    if (hrInit == S_OK)
+        CoUninitialize();
+#endif
+
+    return success;
 }

 #ifndef RA_UTEST
-static std::wstring GetIntegrationPath()
+static std::wstring GetIntegrationPath(const wchar_t* sFilename)
 {
    wchar_t sBuffer[2048];
    DWORD iIndex = GetModuleFileNameW(0, sBuffer, 2048);
@@ -542,29 +667,33 @@ static std::wstring GetIntegrationPath()
        --iIndex;

 #if defined(_MSC_VER) && _MSC_VER >= 1400
-    wcscpy_s(&sBuffer[iIndex], sizeof(sBuffer)/sizeof(sBuffer[0]) - iIndex, L"RA_Integration.dll");
+    wcscpy_s(&sBuffer[iIndex], sizeof(sBuffer)/sizeof(sBuffer[0]) - iIndex, sFilename);
 #else
-    wcscpy(&sBuffer[iIndex], L"RA_Integration.dll");
+    wcscpy(&sBuffer[iIndex], sFilename);
 #endif

    return std::wstring(sBuffer);
 }
 #endif

-#if 0
-
 static void FetchIntegrationFromWeb(char* sLatestVersionUrl, DWORD* pStatusCode)
 {
    DWORD nBytesRead = 0;
-    const wchar_t* sDownloadFilename = L"RA_Integration.download";
-    const wchar_t* sFilename = L"RA_Integration.dll";
-    const wchar_t* sOldFilename = L"RA_Integration.old";
+    const std::wstring sDownloadFilename = GetIntegrationPath(RA_INT_DLL ".download");
+    const std::wstring sOldFilename = GetIntegrationPath(RA_INT_DLL ".old");
+    const std::wstring sNewFilename = GetIntegrationPath(RA_INT_DLL);
+    std::wstring sFilename = sNewFilename;
+
+#ifdef RA_X64
+    if (GetFileAttributesW(sFilename.c_str()) == INVALID_FILE_ATTRIBUTES)
+        sFilename = GetIntegrationPath(L"RA_Integration.dll");
+#endif

 #if defined(_MSC_VER) && _MSC_VER >= 1400
    FILE* pf;
-    errno_t nErr = _wfopen_s(&pf, sDownloadFilename, L"wb");
+    errno_t nErr = _wfopen_s(&pf, sDownloadFilename.c_str(), L"wb");
 #else
-    FILE* pf = _wfopen(sDownloadFilename, L"wb");
+    FILE* pf = _wfopen(sDownloadFilename.c_str(), L"wb");
 #endif

    if (!pf)
@@ -573,12 +702,13 @@ static void FetchIntegrationFromWeb(char* sLatestVersionUrl, DWORD* pStatusCode)
        wchar_t sErrBuffer[2048];
        _wcserror_s(sErrBuffer, sizeof(sErrBuffer) / sizeof(sErrBuffer[0]), nErr);

-        std::wstring sErrMsg = std::wstring(L"Unable to write ") + sOldFilename + L"\n" + sErrBuffer;
+        std::wstring sErrMsg = std::wstring(L"Unable to write " RA_INT_DLL L".download\n") + sErrBuffer;
 #else
-        std::wstring sErrMsg = std::wstring(L"Unable to write ") + sOldFilename + L"\n" + _wcserror(errno);
+        std::wstring sErrMsg = std::wstring(L"Unable to write " RA_INT_DLL L".download\n") + _wcserror(errno);
 #endif

        MessageBoxW(nullptr, sErrMsg.c_str(), L"Error", MB_OK | MB_ICONERROR);
+        *pStatusCode = 0;
        return;
    }

@@ -594,36 +724,36 @@ static void FetchIntegrationFromWeb(char* sLatestVersionUrl, DWORD* pStatusCode)
    }
    *pSplit++ = '\0';

-    if (DoBlockingHttpCallWithRetry(sLatestVersionUrl, pSplit, nullptr, pf, &nBytesRead, pStatusCode))
+    if (DoBlockingHttpCallWithRetry(sLatestVersionUrl, pSplit, nullptr, pf, &nBytesRead, pStatusCode, "Downloading " RA_INT_DLL))
    {
        fclose(pf);

        /* wait up to one second for the DLL to actually be released - sometimes it's not immediate */
        for (int i = 0; i < 10; i++)
        {
-            if (GetModuleHandleW(sFilename) == nullptr)
+            if (GetModuleHandleW(sFilename.c_str()) == nullptr)
                break;

            Sleep(100);
        }

        // delete the last old dll if it's still present
-        DeleteFileW(sOldFilename);
+        DeleteFileW(sOldFilename.c_str());

        // if there's a dll present, rename it
-        if (GetFileAttributesW(sFilename) != INVALID_FILE_ATTRIBUTES &&
-            !MoveFileW(sFilename, sOldFilename))
+        if (GetFileAttributesW(sFilename.c_str()) != INVALID_FILE_ATTRIBUTES &&
+            !MoveFileW(sFilename.c_str(), sOldFilename.c_str()))
        {
            MessageBoxW(nullptr, L"Could not rename old dll", L"Error", MB_OK | MB_ICONERROR);
        }
        // rename the download to be the dll
-        else if (!MoveFileW(sDownloadFilename, sFilename))
+        else if (!MoveFileW(sDownloadFilename.c_str(), sNewFilename.c_str()))
        {
            MessageBoxW(nullptr, L"Could not rename new dll", L"Error", MB_OK | MB_ICONERROR);
        }

        // delete the old dll
-        DeleteFileW(sOldFilename);
+        DeleteFileW(sOldFilename.c_str());
    }
    else
    {
@@ -631,8 +761,6 @@ static void FetchIntegrationFromWeb(char* sLatestVersionUrl, DWORD* pStatusCode)
    }
 }

-#endif
-
 //Returns the last Win32 error, in string format. Returns an empty string if there is no error.
 static std::string GetLastErrorAsString()
 {
@@ -657,9 +785,15 @@ static const char* CCONV _RA_InstallIntegration()
 {
    SetErrorMode(0);

-    std::wstring sIntegrationPath = GetIntegrationPath();
+    std::wstring sIntegrationPath = GetIntegrationPath(RA_INT_DLL);

    DWORD dwAttrib = GetFileAttributesW(sIntegrationPath.c_str());
+#ifdef RA_X64
+    if (dwAttrib == INVALID_FILE_ATTRIBUTES) {
+        sIntegrationPath = GetIntegrationPath(L"RA_Integration.dll");
+        dwAttrib = GetFileAttributesW(sIntegrationPath.c_str());
+    }
+#endif
    if (dwAttrib == INVALID_FILE_ATTRIBUTES)
        return "0.0";

@@ -667,7 +801,23 @@ static const char* CCONV _RA_InstallIntegration()
    if (g_hRADLL == nullptr)
    {
        char buffer[1024];
-        sprintf_s(buffer, 1024, "Could not load RA_Integration.dll: %d\n%s\n", ::GetLastError(), GetLastErrorAsString().c_str());
+        if (::GetLastError() == ERROR_BAD_EXE_FORMAT)
+        {
+#ifdef RA_X64
+          sprintf_s(buffer, sizeof(buffer), "Could not load RA_Integration-x64.dll (error %d)\nAre you trying to load the 32-bit version?\n", ::GetLastError());
+#else
+          sprintf_s(buffer, sizeof(buffer), "Could not load RA_Integration.dll (error %d)\nAre you trying to load the 64-bit version?\n", ::GetLastError());
+#endif
+        }
+        else
+        {
+#ifdef RA_X64
+            sprintf_s(buffer, sizeof(buffer), "Could not load RA_Integration-x64.dll (error %d)\n%s\n", ::GetLastError(), GetLastErrorAsString().c_str());
+#else
+            sprintf_s(buffer, sizeof(buffer), "Could not load RA_Integration.dll (error %d)\n%s\n", ::GetLastError(), GetLastErrorAsString().c_str());
+#endif
+        }
+
        MessageBoxA(nullptr, buffer, "Warning", MB_OK | MB_ICONWARNING);

        return "0.0";
@@ -876,7 +1026,7 @@ static void RA_InitCommon(HWND hMainHWND, int nEmulatorID, const char* sClientNa
    GetJsonField(buffer, "LatestVersion", sVersionBuffer, sizeof(sVersionBuffer));
    const unsigned long long nLatestDLLVer = ParseVersion(sVersionBuffer);

-#if defined(_M_X64) || defined(__amd64__)
+#ifdef RA_X64
    GetJsonField(buffer, "LatestVersionUrlX64", sLatestVersionUrl, sizeof(sLatestVersionUrl));
 #else
    GetJsonField(buffer, "LatestVersionUrl", sLatestVersionUrl, sizeof(sLatestVersionUrl));
@@ -930,16 +1080,18 @@ static void RA_InitCommon(HWND hMainHWND, int nEmulatorID, const char* sClientNa

    if (nMBReply == IDYES)
    {
-        //FetchIntegrationFromWeb(sLatestVersionUrl, &nStatusCode);
-        nStatusCode = 0;
+        FetchIntegrationFromWeb(sLatestVersionUrl, &nStatusCode);

-        if (nStatusCode == 200)
-            nVerInstalled = ParseVersion(_RA_InstallIntegration());
-
-        if (nVerInstalled < nLatestDLLVer)
+        if (nStatusCode != 0) // 0 indicates an error was already reported
        {
-            sprintf_s(buffer, sizeof(buffer), "Failed to update toolset (status code %u).", nStatusCode);
-            MessageBoxA(hMainHWND, buffer, "Error", MB_OK | MB_ICONERROR);
+            if (nStatusCode == 200)
+                nVerInstalled = ParseVersion(_RA_InstallIntegration());
+
+            if (nVerInstalled < nLatestDLLVer)
+            {
+                sprintf_s(buffer, sizeof(buffer), "Failed to update toolset (status code %u).", nStatusCode);
+                MessageBoxA(hMainHWND, buffer, "Error", MB_OK | MB_ICONERROR);
+            }
        }
    }

@@ -1,91 +0,0 @@
-add_library(pcsx2-rapidyaml
-  include/c4/base64.hpp
-  include/c4/blob.hpp
-  include/c4/charconv.hpp
-  include/c4/compiler.hpp
-  include/c4/config.hpp
-  include/c4/cpu.hpp
-  include/c4/dump.hpp
-  include/c4/error.hpp
-  include/c4/export.hpp
-  include/c4/format.hpp
-  include/c4/language.hpp
-  include/c4/memory_util.hpp
-  include/c4/platform.hpp
-  include/c4/preprocessor.hpp
-  include/c4/std/std.hpp
-  include/c4/std/std_fwd.hpp
-  include/c4/std/string.hpp
-  include/c4/std/string_fwd.hpp
-  include/c4/std/string_view.hpp
-  include/c4/std/tuple.hpp
-  include/c4/std/vector.hpp
-  include/c4/std/vector_fwd.hpp
-  include/c4/substr.hpp
-  include/c4/substr_fwd.hpp
-  include/c4/szconv.hpp
-  include/c4/types.hpp
-  include/c4/utf.hpp
-  include/c4/windows.hpp
-  include/c4/windows_pop.hpp
-  include/c4/windows_push.hpp
-  include/c4/yml/common.hpp
-  include/c4/yml/detail/dbgprint.hpp
-  include/c4/yml/detail/stack.hpp
-  include/c4/yml/emit.def.hpp
-  include/c4/yml/emit.hpp
-  include/c4/yml/event_handler_stack.hpp
-  include/c4/yml/event_handler_tree.hpp
-  include/c4/yml/filter_processor.hpp
-  include/c4/yml/fwd.hpp
-  include/c4/yml/export.hpp
-  include/c4/yml/node.hpp
-  include/c4/yml/node_type.hpp
-  include/c4/yml/parse.hpp
-  include/c4/yml/parse_engine.def.hpp
-  include/c4/yml/parse_engine.hpp
-  include/c4/yml/parser_state.hpp
-  include/c4/yml/reference_resolver.hpp
-  include/c4/yml/preprocess.hpp
-  include/c4/yml/std/map.hpp
-  include/c4/yml/std/std.hpp
-  include/c4/yml/std/string.hpp
-  include/c4/yml/std/vector.hpp
-  include/c4/yml/tag.hpp
-  include/c4/yml/tree.hpp
-  include/c4/yml/version.hpp
-  include/c4/yml/writer.hpp
-  include/c4/yml/yml.hpp
-  include/ryml.hpp
-  include/ryml_std.hpp
-  src/c4/base64.cpp
-  src/c4/error.cpp
-  src/c4/format.cpp
-  src/c4/language.cpp
-  src/c4/memory_util.cpp
-  src/c4/utf.cpp
-  src/c4/yml/common.cpp
-  src/c4/yml/node.cpp
-  src/c4/yml/parse.cpp
-  src/c4/yml/preprocess.cpp
-  src/c4/yml/tree.cpp
-  src/c4/yml/node_type.cpp
-  src/c4/yml/reference_resolver.cpp
-  src/c4/yml/tag.cpp
-  src/c4/yml/version.cpp
-)
-
-target_include_directories(pcsx2-rapidyaml PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../fast_float/include"
-)
-target_include_directories(pcsx2-rapidyaml INTERFACE
-  "${CMAKE_CURRENT_SOURCE_DIR}/include"
-)
-
-target_compile_definitions(pcsx2-rapidyaml PUBLIC
-  "C4_NO_DEBUG_BREAK"
-)
-
-add_library(rapidyaml::rapidyaml ALIAS pcsx2-rapidyaml)
@@ -1,141 +0,0 @@
-#ifndef _C4_BASE64_HPP_
-#define _C4_BASE64_HPP_
-
-/** @file base64.hpp encoding/decoding for base64.
- * @see https://en.wikipedia.org/wiki/Base64
- * @see https://www.base64encode.org/
- * */
-
-#include "c4/charconv.hpp"
-#include "c4/blob.hpp"
-
-namespace c4 {
-
-/** @defgroup doc_base64 Base64 encoding/decoding
- * @see https://en.wikipedia.org/wiki/Base64
- * @see https://www.base64encode.org/
- * @{ */
-
-/** check that the given buffer is a valid base64 encoding
- * @see https://en.wikipedia.org/wiki/Base64 */
-C4CORE_EXPORT bool base64_valid(csubstr encoded);
-
-
-/** base64-encode binary data.
- * @param encoded [out] output buffer for encoded data
- * @param data [in] the input buffer with the binary data
- *
- * @return the number of bytes needed to return the output (ie the
- * required size for @p encoded). No writes occur beyond the end of
- * the output buffer, so it is safe to do a speculative call where the
- * encoded buffer is empty, or maybe too small. The caller should
- * ensure that the returned size is smaller than the size of the
- * encoded buffer.
- *
- * @note the result depends on endianness. If transfer between
- * little/big endian systems is desired, the caller should normalize
- * @p data before encoding.
- *
- * @see https://en.wikipedia.org/wiki/Base64 */
-C4CORE_EXPORT size_t base64_encode(substr encoded, cblob data);
-
-
-/** decode the base64 encoding in the given buffer
- * @param encoded [in] the encoded base64
- * @param data [out] the output buffer
- *
- * @return the number of bytes needed to return the output (ie the
- * required size for @p data). No writes occur beyond the end of the
- * output buffer, so it is safe to do a speculative call where the
- * data buffer is empty, or maybe too small. The caller should ensure
- * that the returned size is smaller than the size of the data buffer.
- *
- * @note the result depends on endianness. If transfer between
- * little/big endian systems is desired, the caller should normalize
- * @p data after decoding.
- *
- * @see https://en.wikipedia.org/wiki/Base64 */
-C4CORE_EXPORT size_t base64_decode(csubstr encoded, blob data);
-
-/** @} */ // base64
-
-namespace fmt {
-
-/** @addtogroup doc_format_specifiers
- * @{ */
-
-/** @defgroup doc_base64_fmt Base64
- * @{ */
-
-template<typename CharOrConstChar>
-struct base64_wrapper_
-{
-    blob_<CharOrConstChar> data;
-    base64_wrapper_() : data() {}
-    base64_wrapper_(blob_<CharOrConstChar> blob) : data(blob) {}
-};
-/** a tag type to mark a payload as base64-encoded */
-using const_base64_wrapper = base64_wrapper_<cbyte>;
-/** a tag type to mark a payload to be encoded as base64 */
-using base64_wrapper = base64_wrapper_<byte>;
-
-
-/** mark a variable to be written in base64 format */
-template<class ...Args>
-C4_ALWAYS_INLINE const_base64_wrapper cbase64(Args const& C4_RESTRICT ...args)
-{
-    return const_base64_wrapper(cblob(args...));
-}
-/** mark a csubstr to be written in base64 format */
-C4_ALWAYS_INLINE const_base64_wrapper cbase64(csubstr s)
-{
-    return const_base64_wrapper(cblob(s.str, s.len));
-}
-/** mark a variable to be written in base64 format */
-template<class ...Args>
-C4_ALWAYS_INLINE const_base64_wrapper base64(Args const& C4_RESTRICT ...args)
-{
-    return const_base64_wrapper(cblob(args...));
-}
-/** mark a csubstr to be written in base64 format */
-C4_ALWAYS_INLINE const_base64_wrapper base64(csubstr s)
-{
-    return const_base64_wrapper(cblob(s.str, s.len));
-}
-
-/** mark a variable to be read in base64 format */
-template<class ...Args>
-C4_ALWAYS_INLINE base64_wrapper base64(Args &... args)
-{
-    return base64_wrapper(blob(args...));
-}
-/** mark a variable to be read in base64 format */
-C4_ALWAYS_INLINE base64_wrapper base64(substr s)
-{
-    return base64_wrapper(blob(s.str, s.len));
-}
-
-/** @} */ // base64_fmt
-
-/** @} */ // format_specifiers
-
-} // namespace fmt
-
-
-/** write a variable in base64 format
- * @ingroup doc_to_chars */
-inline size_t to_chars(substr buf, fmt::const_base64_wrapper b)
-{
-    return base64_encode(buf, b.data);
-}
-
-/** read a variable in base64 format
- * @ingroup doc_from_chars */
-inline size_t from_chars(csubstr buf, fmt::base64_wrapper *b)
-{
-    return base64_decode(buf, b->data);
-}
-
-} // namespace c4
-
-#endif /* _C4_BASE64_HPP_ */
@@ -1,71 +0,0 @@
-#ifndef _C4_BLOB_HPP_
-#define _C4_BLOB_HPP_
-
-#include "c4/types.hpp"
-#include "c4/error.hpp"
-
-/** @file blob.hpp Mutable and immutable binary data blobs.
-*/
-
-namespace c4 {
-
-template<class T>
-struct blob_;
-
-namespace detail {
-template<class T> struct is_blob_type : std::integral_constant<bool, false> {};
-template<class T> struct is_blob_type<blob_<T>> : std::integral_constant<bool, true> {};
-template<class T> struct is_blob_value_type : std::integral_constant<bool, (std::is_fundamental<T>::value || std::is_trivially_copyable<T>::value)> {};
-} // namespace
-
-// NOLINTBEGIN(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-
-template<class T>
-struct blob_
-{
-    static_assert(std::is_same<T, byte>::value || std::is_same<T, cbyte>::value, "must be either byte or cbyte");
-    static_assert(sizeof(T) == 1u, "must be either byte or cbyte");
-
-public:
-
-    T *    buf;
-    size_t len;
-
-public:
-
-    C4_ALWAYS_INLINE blob_() noexcept = default;
-    C4_ALWAYS_INLINE blob_(blob_ const& that) noexcept = default;
-    C4_ALWAYS_INLINE blob_(blob_     && that) noexcept = default;
-    C4_ALWAYS_INLINE blob_& operator=(blob_     && that) noexcept = default;
-    C4_ALWAYS_INLINE blob_& operator=(blob_ const& that) noexcept = default;
-
-    template<class U, class=typename std::enable_if<std::is_const<T>::value && std::is_same<typename std::add_const<U>::type, T>::value, U>::type> C4_ALWAYS_INLINE blob_(blob_<U> const& that) noexcept : buf(that.buf), len(that.len) {} // NOLINT
-    template<class U, class=typename std::enable_if<std::is_const<T>::value && std::is_same<typename std::add_const<U>::type, T>::value, U>::type> C4_ALWAYS_INLINE blob_(blob_<U>     && that) noexcept : buf(that.buf), len(that.len) {} // NOLINT
-    template<class U, class=typename std::enable_if<std::is_const<T>::value && std::is_same<typename std::add_const<U>::type, T>::value, U>::type> C4_ALWAYS_INLINE blob_& operator=(blob_<U>     && that) noexcept { buf = that.buf; len = that.len; } // NOLINT
-    template<class U, class=typename std::enable_if<std::is_const<T>::value && std::is_same<typename std::add_const<U>::type, T>::value, U>::type> C4_ALWAYS_INLINE blob_& operator=(blob_<U> const& that) noexcept { buf = that.buf; len = that.len; } // NOLINT
-
-    C4_ALWAYS_INLINE blob_(void       *ptr, size_t n) noexcept : buf(reinterpret_cast<T*>(ptr)), len(n) {} // NOLINT
-    C4_ALWAYS_INLINE blob_(void const *ptr, size_t n) noexcept : buf(reinterpret_cast<T*>(ptr)), len(n) {} // NOLINT
-
-    #define _C4_REQUIRE_BLOBTYPE(ty) class=typename std::enable_if<((!detail::is_blob_type<ty>::value) && (detail::is_blob_value_type<ty>::value)), T>::type
-    template<class U, _C4_REQUIRE_BLOBTYPE(U)> C4_ALWAYS_INLINE blob_(U &var) noexcept : buf(reinterpret_cast<T*>(&var)), len(sizeof(U)) {} // NOLINT
-    template<class U, _C4_REQUIRE_BLOBTYPE(U)> C4_ALWAYS_INLINE blob_(U *ptr, size_t n) noexcept : buf(reinterpret_cast<T*>(ptr)), len(sizeof(U) * n) { C4_ASSERT(is_aligned(ptr)); } // NOLINT
-    template<class U, _C4_REQUIRE_BLOBTYPE(U)> C4_ALWAYS_INLINE blob_& operator= (U &var) noexcept { buf = reinterpret_cast<T*>(&var); len = sizeof(U); return *this; } // NOLINT
-    template<class U, size_t N, _C4_REQUIRE_BLOBTYPE(U)> C4_ALWAYS_INLINE blob_(U (&arr)[N]) noexcept : buf(reinterpret_cast<T*>(arr)), len(sizeof(U) * N) {} // NOLINT
-    template<class U, size_t N, _C4_REQUIRE_BLOBTYPE(U)> C4_ALWAYS_INLINE blob_& operator= (U (&arr)[N]) noexcept { buf = reinterpret_cast<T*>(arr); len = sizeof(U) * N; return *this; } // NOLINT
-    #undef _C4_REQUIRE_BLOBTYPE
-};
-
-// NOLINTEND(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-
-/** an immutable binary blob */
-using cblob = blob_<cbyte>;
-/** a mutable binary blob */
-using  blob = blob_< byte>;
-
-C4_MUST_BE_TRIVIAL_COPY(blob);
-C4_MUST_BE_TRIVIAL_COPY(cblob);
-
-} // namespace c4
-
-#endif // _C4_BLOB_HPP_
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-
-<!--
-Very good intro:
-@see https://code.msdn.microsoft.com/windowsdesktop/Writing-type-visualizers-2eae77a2
-See also:
-@see http://blogs.msdn.com/b/vcblog/archive/2013/06/28/using-visual-studio-2013-to-write-maintainable-native-visualizations-natvis.aspx?PageIndex=2
-@see http://blogs.msdn.com/b/vcblog/archive/2015/09/28/debug-visualizers-in-visual-c-2015.aspx
-@see http://stackoverflow.com/questions/36883414/limit-display-of-char-in-natvis-file-to-specific-length
-->
-
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-
-  <Type Name="c4::basic_substring&lt;*&gt;">
-    <DisplayString>{str,[len]} (sz={len})</DisplayString>
-    <StringView>str,[len]</StringView>
-    <Expand>
-      <Item Name="[size]">len</Item>
-      <ArrayItems>
-        <Size>len</Size>
-        <ValuePointer>str</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-
-  <Type Name="c4::span&lt;*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size})</DisplayString>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-  <Type Name="c4::spanrs&lt;*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size}, cap={m_capacity})</DisplayString>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <Item Name="[capacity]">m_capacity</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-  <!-- display span<char>/span<const char> as a string too -->
-  <Type Name="c4::span&lt;char,*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size})</DisplayString>
-    <StringView>m_ptr,[m_size]</StringView>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-  <Type Name="c4::span&lt;const char,*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size})</DisplayString>
-    <StringView>m_ptr,[m_size]</StringView>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-  <!-- display spanrs<char>/spanrs<const char> as a string too -->
-  <Type Name="c4::spanrs&lt;char,*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size}, cap={m_capacity})</DisplayString>
-    <StringView>m_ptr,[m_size]</StringView>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <Item Name="[capacity]">m_capacity</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-  <Type Name="c4::spanrs&lt;const char,*&gt;">
-    <DisplayString>{m_ptr,[m_size]} (sz={m_size}, cap={m_capacity})</DisplayString>
-    <StringView>m_ptr,[m_size]</StringView>
-    <Expand>
-      <Item Name="[size]">m_size</Item>
-      <Item Name="[capacity]">m_capacity</Item>
-      <ArrayItems>
-        <Size>m_size</Size>
-        <ValuePointer>m_ptr</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-
-  <!-- =========================================================================================== -->
-  <Type Name="c4::string_impl&lt;*,*,*,*&gt;">
-    <DisplayString>{(($T3*)this)->m_str,[(($T3*)this)->m_size]} (sz={(($T3*)this)->m_size})</DisplayString>
-    <StringView>(($T3*)this)->m_str,[(($T3*)this)->m_size]</StringView>
-    <Expand>
-      <Synthetic Name="m_str">
-        <DisplayString>{(($T3*)this)->m_str,[(($T3*)this)->m_size]}</DisplayString>
-        <StringView>(($T3*)this)->m_str,[(($T3*)this)->m_size]</StringView>
-      </Synthetic>
-      <Synthetic Name="m_size">
-        <DisplayString>{(($T3*)this)->m_size}</DisplayString>
-      </Synthetic>
-    </Expand>
-  </Type>
-  <Type Name="c4::basic_substring&lt;*,*&gt;">
-    <DisplayString>{m_str,[m_size]} (sz={m_size})</DisplayString>
-    <StringView>m_str,[m_size]</StringView>
-    <Expand>
-      <Synthetic Name="[size]">
-        <DisplayString>{m_size}</DisplayString>
-      </Synthetic>
-    </Expand>
-  </Type>
-  <Type Name="c4::basic_substringrs&lt;*,*&gt;">
-    <DisplayString>{m_str,[m_size]} (sz={m_size},cap={m_capacity})</DisplayString>
-    <StringView>m_str,[m_size]</StringView>
-    <Expand>
-      <Synthetic Name="[size]">
-        <DisplayString>{m_size}</DisplayString>
-      </Synthetic>
-      <Synthetic Name="[capacity]">
-        <DisplayString>{m_capacity}</DisplayString>
-      </Synthetic>
-      <Synthetic Name="[full]">
-        <DisplayString>{m_str,[m_capacity]}</DisplayString>
-        <StringView>m_str,[m_capacity]</StringView>
-      </Synthetic>
-    </Expand>
-  </Type>
-  <Type Name="c4::basic_string&lt;*,*,*&gt;">
-    <DisplayString>{m_str,[m_size]} (sz={m_size},cap={m_capacity})</DisplayString>
-    <StringView>m_str,[m_size]</StringView>
-    <Expand>
-      <Synthetic Name="[size]">
-        <DisplayString>{m_size}</DisplayString>
-      </Synthetic>
-      <Synthetic Name="[full]">
-        <DisplayString>{m_str,[m_capacity]}</DisplayString>
-        <StringView>m_str,[m_capacity]</StringView>
-      </Synthetic>
-    </Expand>
-  </Type>
-
-  <!-- enum symbols -->
-  <Type Name="c4::EnumSymbols&lt;*&gt;::Sym">
-    <DisplayString>{value} - {name}</DisplayString>
-    <Expand>
-      <Item Name="[value]">value</Item>
-      <Item Name="[name]">name</Item>
-    </Expand>
-  </Type>
-  <Type Name="c4::EnumSymbols&lt;*&gt;">
-    <DisplayString>{m_symbols,[m_num]} (sz={m_num})</DisplayString>
-    <Expand>
-      <Item Name="[size]">m_num</Item>
-      <ArrayItems>
-        <Size>m_num</Size>
-        <ValuePointer>m_symbols</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-
-</AutoVisualizer>
@@ -1,120 +0,0 @@
-#ifndef _C4_COMPILER_HPP_
-#define _C4_COMPILER_HPP_
-
-/** @file compiler.hpp Provides compiler information macros
- * @ingroup basic_headers */
-
-#include "c4/platform.hpp"
-
-// Compilers:
-//      C4_MSVC
-//             Visual Studio 2022: MSVC++ 17, 1930
-//             Visual Studio 2019: MSVC++ 16, 1920
-//             Visual Studio 2017: MSVC++ 15
-//             Visual Studio 2015: MSVC++ 14
-//             Visual Studio 2013: MSVC++ 13
-//             Visual Studio 2013: MSVC++ 12
-//             Visual Studio 2012: MSVC++ 11
-//             Visual Studio 2010: MSVC++ 10
-//             Visual Studio 2008: MSVC++ 09
-//             Visual Studio 2005: MSVC++ 08
-//      C4_CLANG
-//      C4_GCC
-//      C4_ICC (intel compiler)
-/** @see http://sourceforge.net/p/predef/wiki/Compilers/ for a list of compiler identifier macros */
-/** @see https://msdn.microsoft.com/en-us/library/b0084kay.aspx for VS2013 predefined macros */
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#   define C4_MSVC
-#   define C4_MSVC_VERSION_2022 17
-#   define C4_MSVC_VERSION_2019 16
-#   define C4_MSVC_VERSION_2017 15
-#   define C4_MSVC_VERSION_2015 14
-#   define C4_MSVC_VERSION_2013 12
-#   define C4_MSVC_VERSION_2012 11
-#   if _MSC_VER >= 1930
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2022  // visual studio 2022
-#       define C4_MSVC_2022
-#   elif _MSC_VER >= 1920
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2019  // visual studio 2019
-#       define C4_MSVC_2019
-#   elif _MSC_VER >= 1910
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2017  // visual studio 2017
-#       define C4_MSVC_2017
-#   elif _MSC_VER == 1900
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2015  // visual studio 2015
-#       define C4_MSVC_2015
-#   elif _MSC_VER == 1800
-#       error "MSVC version not supported"
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2013  // visual studio 2013
-#       define C4_MSVC_2013
-#   elif _MSC_VER == 1700
-#       error "MSVC version not supported"
-#       define C4_MSVC_VERSION C4_MSVC_VERSION_2012  // visual studio 2012
-#       define C4_MSVC_2012
-#   elif _MSC_VER == 1600
-#       error "MSVC version not supported"
-#       define C4_MSVC_VERSION 10  // visual studio 2010
-#       define C4_MSVC_2010
-#   elif _MSC_VER == 1500
-#       error "MSVC version not supported"
-#       define C4_MSVC_VERSION 09  // visual studio 2008
-#       define C4_MSVC_2008
-#   elif _MSC_VER == 1400
-#       error "MSVC version not supported"
-#       define C4_MSVC_VERSION 08  // visual studio 2005
-#       define C4_MSVC_2005
-#   else
-#       error "MSVC version not supported"
-#   endif // _MSC_VER
-#else
-#   define C4_MSVC_VERSION 0   // visual studio not present
-#   define C4_GCC_LIKE
-#   ifdef __INTEL_COMPILER // check ICC before checking GCC, as ICC defines __GNUC__ too
-#       define C4_ICC
-#       define C4_ICC_VERSION __INTEL_COMPILER
-#   elif defined(__APPLE_CC__)
-#       define C4_XCODE
-#       if defined(__clang__)
-#           define C4_CLANG
-#           ifndef __apple_build_version__
-#               define C4_CLANG_VERSION C4_VERSION_ENCODED(__clang_major__, __clang_minor__, __clang_patchlevel__)
-#           else
-#               define C4_CLANG_VERSION __apple_build_version__
-#           endif
-#       else
-#           define C4_XCODE_VERSION __APPLE_CC__
-#       endif
-#   elif defined(__clang__)
-#       define C4_CLANG
-#       ifndef __apple_build_version__
-#           define C4_CLANG_VERSION C4_VERSION_ENCODED(__clang_major__, __clang_minor__, __clang_patchlevel__)
-#       else
-#           define C4_CLANG_VERSION __apple_build_version__
-#       endif
-#   elif defined(__GNUC__)
-#       ifdef __MINGW32__
-#           define C4_MINGW
-#       endif
-#       define C4_GCC
-#       if defined(__GNUC_PATCHLEVEL__)
-#           define C4_GCC_VERSION C4_VERSION_ENCODED(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#       else
-#           define C4_GCC_VERSION C4_VERSION_ENCODED(__GNUC__, __GNUC_MINOR__, 0)
-#       endif
-#       if __GNUC__ < 5
-#           if __GNUC__ == 4 && __GNUC_MINOR__ >= 8
-// provided by cmake sub-project
-#               include "c4/gcc-4.8.hpp"
-#           else
-// we do not support GCC < 4.8:
-//  * misses std::is_trivially_copyable
-//  * misses std::align
-//  * -Wshadow has false positives when a local function parameter has the same name as a method
-#               error "GCC < 4.8 is not supported"
-#           endif
-#       endif
-#   endif
-#endif // defined(C4_WIN) && defined(_MSC_VER)
-
-#endif /* _C4_COMPILER_HPP_ */
@@ -1,39 +0,0 @@
-#ifndef _C4_CONFIG_HPP_
-#define _C4_CONFIG_HPP_
-
-/** @defgroup basic_headers Basic headers
- * @brief Headers providing basic macros, platform+cpu+compiler information,
- * C++ facilities and basic typedefs. */
-
-/** @file config.hpp Contains configuration defines and includes the basic_headers.
- * @ingroup basic_headers */
-
-//#define C4_DEBUG
-
-#define C4_ERROR_SHOWS_FILELINE
-//#define C4_ERROR_SHOWS_FUNC
-//#define C4_ERROR_THROWS_EXCEPTION
-//#define C4_NO_ALLOC_DEFAULTS
-//#define C4_REDEFINE_CPPNEW
-
-#ifndef C4_SIZE_TYPE
-#   define C4_SIZE_TYPE size_t
-#endif
-
-#ifndef C4_STR_SIZE_TYPE
-#   define C4_STR_SIZE_TYPE C4_SIZE_TYPE
-#endif
-
-#ifndef C4_TIME_TYPE
-#   define C4_TIME_TYPE double
-#endif
-
-#include "c4/export.hpp"
-#include "c4/preprocessor.hpp"
-#include "c4/platform.hpp"
-#include "c4/cpu.hpp"
-#include "c4/compiler.hpp"
-#include "c4/language.hpp"
-#include "c4/types.hpp"
-
-#endif // _C4_CONFIG_HPP_
@@ -1,205 +0,0 @@
-#ifndef _C4_CPU_HPP_
-#define _C4_CPU_HPP_
-
-/** @file cpu.hpp Provides processor information macros
- * @ingroup basic_headers */
-
-// see also https://sourceforge.net/p/predef/wiki/Architectures/
-// see also https://sourceforge.net/p/predef/wiki/Endianness/
-// see also https://github.com/googlesamples/android-ndk/blob/android-mk/hello-jni/jni/hello-jni.c
-// see also http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/global/qprocessordetection.h
-
-#ifdef __ORDER_LITTLE_ENDIAN__
-#   define _C4EL __ORDER_LITTLE_ENDIAN__
-#else
-#   define _C4EL 1234
-#endif
-
-#ifdef __ORDER_BIG_ENDIAN__
-#   define _C4EB __ORDER_BIG_ENDIAN__
-#else
-#   define _C4EB 4321
-#endif
-
-// mixed byte order (eg, PowerPC or ia64)
-#define _C4EM 1111 // NOLINT
-
-
-// NOTE: to find defined macros in a platform,
-// g++ <flags> -dM -E - </dev/null | sort
-
-#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-#    define C4_CPU_X86_64
-#    define C4_WORDSIZE 8
-#    define C4_BYTE_ORDER _C4EL
-
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#    define C4_CPU_X86
-#    define C4_WORDSIZE 4
-#    define C4_BYTE_ORDER _C4EL
-
-#elif defined(__arm__) || defined(_M_ARM) \
-    || defined(__TARGET_ARCH_ARM) || defined(__aarch64__) || defined(_M_ARM64)
-#   if defined(__aarch64__) || defined(_M_ARM64)
-#       define C4_CPU_ARM64
-#       define C4_CPU_ARMV8
-#       define C4_WORDSIZE 8
-#   else
-#       define C4_CPU_ARM
-#       define C4_WORDSIZE 4
-#       if defined(__ARM_ARCH_8__) || defined(__ARM_ARCH_8A__)  \
-        || (defined(__ARCH_ARM) && __ARCH_ARM >= 8) \
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM >= 8)
-#           define C4_CPU_ARMV8
-#       elif defined(__ARM_ARCH_7__) || defined(_ARM_ARCH_7)    \
-        || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) \
-        || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) \
-        || defined(__ARM_ARCH_7EM__) \
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM >= 7) \
-        || (defined(_M_ARM) && _M_ARM >= 7)
-#           define C4_CPU_ARMV7
-#       elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-        || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) \
-        || defined(__ARM_ARCH_6K__)  || defined(__ARM_ARCH_6ZK__) \
-        || defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_6KZ__) \
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM >= 6)
-#           define C4_CPU_ARMV6
-#       elif (defined(__ARM_ARCH) && __ARM_ARCH == 5) \
-        || defined(__ARM_ARCH_5TEJ__) \
-        || defined(__ARM_ARCH_5TE__) \
-        || defined(__ARM_ARCH_5T__) \
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM >= 5)
-#           define C4_CPU_ARMV5
-#       elif (defined(__ARM_ARCH) && __ARM_ARCH == 4) \
-        || defined(__ARM_ARCH_4T__) \
-        || defined(__ARM_ARCH_4__) \
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM >= 4)
-#           define C4_CPU_ARMV4
-#       else
-#           error "unknown CPU architecture: ARM"
-#       endif
-#   endif
-#   if defined(__ARMEL__) || defined(__LITTLE_ENDIAN__) || defined(__AARCH64EL__) \
-       || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) \
-       || defined(_MSC_VER) // winarm64 does not provide any of the above macros,
-                            // but advises little-endianess:
-                            // https://docs.microsoft.com/en-us/cpp/build/overview-of-arm-abi-conventions?view=msvc-170
-                            // So if it is visual studio compiling, we'll assume little endian.
-#       define C4_BYTE_ORDER _C4EL
-#   elif defined(__ARMEB__) || defined(__BIG_ENDIAN__) || defined(__AARCH64EB__) \
-       || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-#       define C4_BYTE_ORDER _C4EB
-#   elif defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_PDP_ENDIAN__)
-#       define C4_BYTE_ORDER _C4EM
-#   else
-#       error "unknown endianness"
-#   endif
-
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-#   define C4_CPU_IA64
-#   define C4_WORDSIZE 8
-#   define C4_BYTE_ORDER _C4EM
-   // itanium is bi-endian - check byte order below
-
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)       \
-    || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \
-    || defined(_M_MPPC) || defined(_M_PPC)
-#   if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-#       define C4_CPU_PPC64
-#       define C4_WORDSIZE 8
-#   else
-#       define C4_CPU_PPC
-#       define C4_WORDSIZE 4
-#   endif
-#   define C4_BYTE_ORDER _C4EM
-   // ppc is bi-endian - check byte order below
-
-#elif defined(__s390x__) || defined(__zarch__) || defined(__SYSC_ZARCH_)
-#   define C4_CPU_S390_X
-#   define C4_WORDSIZE 8
-#   define C4_BYTE_ORDER _C4EB
-
-#elif defined(__xtensa__) || defined(__XTENSA__)
-#   define C4_CPU_XTENSA
-#   define C4_WORDSIZE 4
-// not sure about this...
-#   if defined(__XTENSA_EL__) || defined(__xtensa_el__)
-#       define C4_BYTE_ORDER _C4EL
-#   else
-#       define C4_BYTE_ORDER _C4EB
-#   endif
-
-#elif defined(__riscv)
-#   if __riscv_xlen == 64
-#       define C4_CPU_RISCV64
-#       define C4_WORDSIZE 8
-#   else
-#       define C4_CPU_RISCV32
-#       define C4_WORDSIZE 4
-#   endif
-#   define C4_BYTE_ORDER _C4EL
-
-#elif defined(__EMSCRIPTEN__)
-#   define C4_BYTE_ORDER _C4EL
-#   define C4_WORDSIZE 4
-
-#elif defined(__loongarch__)
-#   if defined(__loongarch64)
-#       define C4_CPU_LOONGARCH64
-#       define C4_WORDSIZE 8
-#   else
-#       define C4_CPU_LOONGARCH
-#       define C4_WORDSIZE 4
-#   endif
-#   define C4_BYTE_ORDER _C4EL
-
-#elif defined(__mips__) || defined(_mips) || defined(mips)
-#   if defined(__mips)
-#       if __mips == 64
-#           define C4_CPU_MIPS64
-#           define C4_WORDSIZE 8
-#       elif __mips == 32
-#           define C4_CPU_MIPS32
-#           define C4_WORDSIZE 4
-#       endif
-#   elif defined(__arch64__) || (defined(__SIZE_WIDTH__) && __SIZE_WIDTH__ == 64) || (defined(__LP64__) && __LP64__)
-#       define C4_CPU_MIPS64
-#       define C4_WORDSIZE 8
-#   elif defined(__arch32__) || (defined(__SIZE_WIDTH__) && __SIZE_WIDTH__ == 32) || (defined(__LP32__) && __LP32__)
-#       define C4_CPU_MIPS32
-#       define C4_WORDSIZE 4
-#   else
-#       error "unknown mips architecture"
-#   endif
-#   if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#       define C4_BYTE_ORDER _C4EB
-#   elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#       define C4_BYTE_ORDER _C4EL
-#   else
-#       error "unknown mips endianness"
-#   endif
-
-#elif defined(__sparc__) || defined(__sparc) || defined(sparc)
-#   if defined(__arch64__) || (defined(__SIZE_WIDTH__) && __SIZE_WIDTH__ == 64) || (defined(__LP64__) && __LP64__)
-#       define C4_CPU_SPARC64
-#       define C4_WORDSIZE 8
-#   elif defined(__arch32__) || (defined(__SIZE_WIDTH__) && __SIZE_WIDTH__ == 32) || (defined(__LP32__) && __LP32__)
-#       define C4_CPU_SPARC32
-#       define C4_WORDSIZE 4
-#   else
-#       error "unknown sparc architecture"
-#   endif
-#   define C4_BYTE_ORDER _C4EB
-
-#elif defined(SWIG)
-#   error "please define CPU architecture macros when compiling with swig"
-
-#else
-#   error "unknown CPU architecture"
-#endif
-
-#define C4_LITTLE_ENDIAN (C4_BYTE_ORDER == _C4EL)
-#define C4_BIG_ENDIAN (C4_BYTE_ORDER == _C4EB)
-#define C4_MIXED_ENDIAN (C4_BYTE_ORDER == _C4EM)
-
-#endif /* _C4_CPU_HPP_ */
@@ -1,798 +0,0 @@
-#ifndef C4_DUMP_HPP_
-#define C4_DUMP_HPP_
-
-#include <c4/substr.hpp>
-
-/** @file dump.hpp This file provides functions to dump several
- * arguments as strings to a user-provided function sink, for example
- * to implement a type-safe printf()-like function (where the sink
- * would just be a plain call to putchars()). The function sink can be
- * passed either by dynamic dispatching or by static dispatching (as a
- * template argument). There are analogs to @ref c4::cat() (@ref
- * c4::cat_dump() and @ref c4::cat_dump_resume()), @ref c4::catsep()
- * (@ref catsetp_dump() and @ref catsep_dump_resume()) and @ref
- * c4::format() (@ref c4::format_dump() and @ref
- * c4::format_dump_resume()). The analogs have two types: immediate
- * and resuming. An analog of immediate type cannot be retried when
- * the work buffer is too small; this means that successful dumps in
- * the first (successful) arguments will be dumped again in the
- * subsequent attempt to call. An analog of resuming type will only
- * ever dump as-yet-undumped arguments, through the use of @ref
- * DumpResults return type. */
-
-namespace c4 {
-
-C4_SUPPRESS_WARNING_GCC_CLANG_WITH_PUSH("-Wold-style-cast")
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/** @defgroup dump_building_blocks Basic building blocks for dumping.
- *
- * The basic building block: given an argument and a
- * buffer, serialize the argument to the buffer using @ref
- * c4::to_chars(), and dump the buffer to the provided sink
- * function. When the argument is a string, no serialization is
- * performed, and the argument is dumped directly to the sink.
- *
- * @{ */
-
-
-/** Type of the function to be used as the sink. This function
- * receives as its argument the string with characters to send to the
- * sink.
- *
- * @warning the string passed to the sink may have zero length. If the
- * user sink uses memcpy(), the call to memcpy() should be defended
- * with a check for zero length (calling memcpy with zero length is
- * undefined behavior).
- * */
-using SinkPfn = void (*)(csubstr str);
-
-
-/** a traits class to use in SFINAE with @ref c4::dump() to select if
- * a type is treated as string type (which is dumped directly to the
- * sink, using to_csubstr()), or if the type is treated as a value,
- * which is first serialized to a buffer using to_chars(), and then
- * the serialization serialized as */
-template<class T> struct dump_directly : public std::false_type {};
-template<> struct dump_directly<csubstr> : public std::true_type {};
-template<> struct dump_directly< substr> : public std::true_type {};
-template<> struct dump_directly<const char*> : public std::true_type {};
-template<> struct dump_directly<      char*> : public std::true_type {};
-template<size_t N> struct dump_directly<const char (&)[N]> : public std::true_type {};
-template<size_t N> struct dump_directly<      char (&)[N]> : public std::true_type {};
-template<size_t N> struct dump_directly<const char[N]> : public std::true_type {};
-template<size_t N> struct dump_directly<      char[N]> : public std::true_type {};
-
-
-/** Dump a string-type object to the (statically dispatched) sink. The
- * string is dumped directly, without any intermediate serialization.
- *
- * @return the number of bytes needed to serialize the string-type
- * object, which is always 0 because there is no serialization
- *
- * @note the argument is considered a value when @ref
- * dump_directly<Arg> is a false type, which is the default. To enable
- * the argument to be treated as a string type, which is dumped
- * directly to the sink without intermediate serialization, define
- * dump_directly<T> to a true type.
- *
- * @warning the string passed to the sink may have zero length. If the
- * user sink uses memcpy(), the call to memcpy() should be defended
- * with a check for zero length (calling memcpy with zero length is
- * undefined behavior).
- *
- * @see dump_directly<T>
- */
-template<SinkPfn sinkfn, class Arg>
-inline auto dump(substr buf, Arg const& a)
-    -> typename std::enable_if<dump_directly<Arg>::value, size_t>::type
-{
-    C4_ASSERT(!buf.overlaps(a));
-    C4_UNUSED(buf);
-    // dump directly, no need to serialize to the buffer
-    sinkfn(to_csubstr(a));
-    return 0; // no space was used in the buffer
-}
-/** Dump a string-type object to the (dynamically dispatched)
- * sink. The string is dumped directly, without any intermediate
- * serialization to the buffer.
- *
- * @return the number of bytes needed to serialize the string-type
- * object, which is always 0 because there is no serialization
- *
- * @note the argument is considered a value when @ref
- * dump_directly<Arg> is a false type, which is the default. To enable
- * the argument to be treated as a string type, which is dumped
- * directly to the sink without intermediate serialization, define
- * dump_directly<T> to a true type.
- *
- * @warning the string passed to the sink may have zero length. If the
- * user sink uses memcpy(), the call to memcpy() should be defended
- * with a check for zero length (calling memcpy with zero length is
- * undefined behavior).
- *
- * @see dump_directly<T>
- * */
-template<class SinkFn, class Arg>
-inline auto dump(SinkFn &&sinkfn, substr buf, Arg const& a)
-    -> typename std::enable_if<dump_directly<Arg>::value, size_t>::type
-{
-    C4_UNUSED(buf);
-    C4_ASSERT(!buf.overlaps(a));
-    // dump directly, no need to serialize to the buffer
-    std::forward<SinkFn>(sinkfn)(to_csubstr(a));
-    return 0; // no space was used in the buffer
-}
-
-
-/** Dump a value to the sink. Given an argument @p a and a buffer @p
- * buf, serialize the argument to the buffer using @ref to_chars(),
- * and then dump the buffer to the (statically dispatched) sink
- * function passed as the template argument. If the buffer is too
- * small to serialize the argument, the sink function is not called.
- *
- * @note the argument is considered a value when @ref
- * dump_directly<Arg> is a false type, which is the default. To enable
- * the argument to be treated as a string type, which is dumped
- * directly to the sink without intermediate serialization, define
- * dump_directly<T> to a true type.
- *
- * @see dump_directly<T>
- *
- * @return the number of characters required to serialize the
- * argument. */
-template<SinkPfn sinkfn, class Arg>
-inline auto dump(substr buf, Arg const& a)
-    -> typename std::enable_if<!dump_directly<Arg>::value, size_t>::type
-{
-    // serialize to the buffer
-    const size_t sz = to_chars(buf, a);
-    // dump the buffer to the sink
-    if(C4_LIKELY(sz <= buf.len))
-    {
-        // NOTE: don't do this:
-        //sinkfn(buf.first(sz));
-        // ... but do this instead:
-        sinkfn({buf.str, sz});
-        // ... this is needed because Release builds for armv5 and
-        // armv6 were failing for the first call, with the wrong
-        // buffer being passed into the function (!)
-    }
-    return sz;
-}
-/** Dump a value to the sink. Given an argument @p a and a buffer @p
- * buf, serialize the argument to the buffer using @ref
- * c4::to_chars(), and then dump the buffer to the (dynamically
- * dispatched) sink function, passed as @p sinkfn. If the buffer is too
- * small to serialize the argument, the sink function is not called.
- *
- * @note the argument is considered a value when @ref
- * dump_directly<Arg> is a false type, which is the default. To enable
- * the argument to be treated as a string type, which is dumped
- * directly to the sink without intermediate serialization, define
- * dump_directly<T> to a true type.
- *
- * @see @ref dump_directly<T>
- *
- * @return the number of characters required to serialize the
- * argument. */
-template<class SinkFn, class Arg>
-inline auto dump(SinkFn &&sinkfn, substr buf, Arg const& a)
-    -> typename std::enable_if<!dump_directly<Arg>::value, size_t>::type
-{
-    // serialize to the buffer
-    const size_t sz = to_chars(buf, a);
-    // dump the buffer to the sink
-    if(C4_LIKELY(sz <= buf.len))
-    {
-        // NOTE: don't do this:
-        //std::forward<SinkFn>(sinkfn)(buf.first(sz));
-        // ... but do this instead:
-        std::forward<SinkFn>(sinkfn)({buf.str, sz});
-        // ... this is needed because Release builds for armv5 and
-        // armv6 were failing for the first call, with the wrong
-        // buffer being passed into the function (!)
-    }
-    return sz;
-}
-
-
-/** An opaque type used by resumeable dump functions like @ref
- * cat_dump_resume(), @ref catsep_dump_resume() or @ref
- * format_dump_resume(). */
-struct DumpResults
-{
-    enum : size_t { noarg = (size_t)-1 };
-    size_t bufsize = 0;
-    size_t lastok = noarg;
-    bool success_until(size_t expected) const { return lastok == noarg ? false : lastok >= expected; }
-    bool write_arg(size_t arg) const { return lastok == noarg || arg > lastok; }
-    size_t argfail() const { return lastok + 1; }
-};
-
-/** @} */
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-
-/** @defgroup cat_dump Dump several arguments to a sink,
- * concatenated. This is the analog to @ref c4::cat(), with the
- * significant difference that each argument is immediately sent to
- * the sink (resulting in multiple calls to the sink function, once
- * per argument), whereas equivalent usage of c4::cat() would first
- * serialize all the arguments to the buffer, and then call the sink
- * once at the end. As a consequence, the size needed for the buffer
- * is only the maximum of the size needed for the arguments, whereas
- * with c4::cat(), the size needed for the buffer would be the sum of
- * the size needed for the arguments. When the size of dump
- *
- * @{ */
-
-/// @cond dev
-// terminates the variadic recursion
-template<class SinkFn>
-size_t cat_dump(SinkFn &&, substr) // NOLINT
-{
-    return 0;
-}
-
-// terminates the variadic recursion
-template<SinkPfn sinkfn>
-size_t cat_dump(substr) // NOLINT
-{
-    return 0;
-}
-/// @endcond
-
-
-/** Dump several arguments to the (dynamically dispatched) sink
- * function, as if through c4::cat(). For each argument, @ref dump()
- * is called with the buffer and sink. If any of the arguments is too
- * large for the buffer, no subsequent argument is sent to the sink,
- * (but all the arguments are still processed to compute the size
- * required for the buffer). This function can be safely called with an
- * empty buffer.
- *
- * @return the size required for the buffer, which is the maximum size
- * across all arguments
- *
- * @note subsequent calls with the same set of arguments will dump
- * again the first successful arguments. If each argument must only be
- * sent once to the sink (for example with printf-like behavior), use
- * instead @ref cat_dump_resume(). */
-template<class SinkFn, class Arg, class... Args>
-size_t cat_dump(SinkFn &&sinkfn, substr buf, Arg const& a, Args const& ...more)
-{
-    const size_t size_for_a = dump(std::forward<SinkFn>(sinkfn), buf, a);
-    if(C4_UNLIKELY(size_for_a > buf.len))
-        buf.len = 0; // ensure no more calls to the sink
-    const size_t size_for_more = cat_dump(std::forward<SinkFn>(sinkfn), buf, more...);
-    return size_for_more > size_for_a ? size_for_more : size_for_a;
-}
-
-
-/** Dump several arguments to the (statically dispatched) sink
- * function, as if through c4::cat(). For each argument, @ref dump()
- * is called with the buffer and sink. If any of the arguments is too
- * large for the buffer, no subsequent argument is sent to the sink,
- * (but all the arguments are still processed to compute the size
- * required for the buffer). This function can be safely called with an
- * empty buffer.
- *
- * @return the size required for the buffer, which is the maximum size
- * across all arguments
- *
- * @note subsequent calls with the same set of arguments will dump
- * again the first successful arguments. If each argument must only be
- * sent once to the sink (for example with printf-like behavior), use
- * instead @ref cat_dump_resume(). */
-template<SinkPfn sinkfn, class Arg, class... Args>
-size_t cat_dump(substr buf, Arg const& a, Args const& ...more)
-{
-    const size_t size_for_a = dump<sinkfn>(buf, a);
-    if(C4_UNLIKELY(size_for_a > buf.len))
-        buf.len = 0; // ensure no more calls to the sink
-    const size_t size_for_more = cat_dump<sinkfn>(buf, more...);
-    return size_for_more > size_for_a ? size_for_more : size_for_a;
-}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/// @cond dev
-namespace detail {
-
-// terminates the variadic recursion
-template<SinkPfn sinkfn>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(size_t, DumpResults results, substr)
-{
-    return results;
-}
-
-// terminates the variadic recursion
-template<class SinkFn>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(size_t, SinkFn &&, DumpResults results, substr) // NOLINT
-{
-    return results;
-}
-
-template<SinkPfn sinkfn, class Arg, class... Args>
-DumpResults cat_dump_resume(size_t currarg, DumpResults results, substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    if(C4_LIKELY(results.write_arg(currarg)))
-    {
-        size_t sz = dump<sinkfn>(buf, a);  // yield to the specialized function
-        if(currarg == results.lastok + 1 && sz <= buf.len)
-            results.lastok = currarg;
-        results.bufsize = sz > results.bufsize ? sz : results.bufsize;
-    }
-    return detail::cat_dump_resume<sinkfn>(currarg + 1u, results, buf, more...);
-}
-
-template<class SinkFn, class Arg, class... Args>
-DumpResults cat_dump_resume(size_t currarg, SinkFn &&sinkfn, DumpResults results, substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    if(C4_LIKELY(results.write_arg(currarg)))
-    {
-        size_t sz = dump(std::forward<SinkFn>(sinkfn), buf, a);  // yield to the specialized function
-        if(currarg == results.lastok + 1 && sz <= buf.len)
-            results.lastok = currarg;
-        results.bufsize = sz > results.bufsize ? sz : results.bufsize;
-    }
-    return detail::cat_dump_resume(currarg + 1u, std::forward<SinkFn>(sinkfn), results, buf, more...);
-}
-} // namespace detail
-/// @endcond
-
-
-template<SinkPfn sinkfn, class Arg, class... Args>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    return detail::cat_dump_resume<sinkfn>(0u, DumpResults{}, buf, a, more...);
-}
-
-template<class SinkFn, class Arg, class... Args>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(SinkFn &&sinkfn, substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    return detail::cat_dump_resume(0u, std::forward<SinkFn>(sinkfn), DumpResults{}, buf, a, more...);
-}
-
-
-template<SinkPfn sinkfn, class Arg, class... Args>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(DumpResults results, substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    if(results.bufsize > buf.len)
-        return results;
-    return detail::cat_dump_resume<sinkfn>(0u, results, buf, a, more...);
-}
-
-template<class SinkFn, class Arg, class... Args>
-C4_ALWAYS_INLINE DumpResults cat_dump_resume(SinkFn &&sinkfn, DumpResults results, substr buf, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    if(results.bufsize > buf.len)
-        return results;
-    return detail::cat_dump_resume(0u, std::forward<SinkFn>(sinkfn), results, buf, a, more...);
-}
-
-/** @} */
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/// @cond dev
-// terminate the recursion
-template<class SinkFn, class Sep>
-size_t catsep_dump(SinkFn &&, substr, Sep const& C4_RESTRICT) // NOLINT
-{
-    return 0;
-}
-
-// terminate the recursion
-template<SinkPfn sinkfn, class Sep>
-size_t catsep_dump(substr, Sep const& C4_RESTRICT) // NOLINT
-{
-    return 0;
-}
-/// @endcond
-
-/** take the function pointer as a function argument */
-template<class SinkFn, class Sep, class Arg, class... Args>
-size_t catsep_dump(SinkFn &&sinkfn, substr buf, Sep const& sep, Arg const& a, Args const& ...more)
-{
-    size_t sz = dump(std::forward<SinkFn>(sinkfn), buf, a);
-    if(C4_UNLIKELY(sz > buf.len))
-        buf.len = 0; // ensure no more calls
-    if C4_IF_CONSTEXPR (sizeof...(more) > 0)
-    {
-        size_t szsep = dump(std::forward<SinkFn>(sinkfn), buf, sep);
-        if(C4_UNLIKELY(szsep > buf.len))
-            buf.len = 0; // ensure no more calls
-        sz = sz > szsep ? sz : szsep;
-    }
-    size_t size_for_more = catsep_dump(std::forward<SinkFn>(sinkfn), buf, sep, more...);
-    return size_for_more > sz ? size_for_more : sz;
-}
-
-/** take the function pointer as a template argument */
-template<SinkPfn sinkfn, class Sep, class Arg, class... Args>
-size_t catsep_dump(substr buf, Sep const& sep, Arg const& a, Args const& ...more)
-{
-    size_t sz = dump<sinkfn>(buf, a);
-    if(C4_UNLIKELY(sz > buf.len))
-        buf.len = 0; // ensure no more calls
-    if C4_IF_CONSTEXPR (sizeof...(more) > 0)
-    {
-        size_t szsep = dump<sinkfn>(buf, sep);
-        if(C4_UNLIKELY(szsep > buf.len))
-            buf.len = 0; // ensure no more calls
-        sz = sz > szsep ? sz : szsep;
-    }
-    size_t size_for_more = catsep_dump<sinkfn>(buf, sep, more...);
-    return size_for_more > sz ? size_for_more : sz;
-}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/// @cond dev
-namespace detail {
-template<SinkPfn sinkfn, class Arg>
-void catsep_dump_resume_(size_t currarg, DumpResults *C4_RESTRICT results, substr *buf, Arg const& a)
-{
-    if(C4_LIKELY(results->write_arg(currarg)))
-    {
-        size_t sz = dump<sinkfn>(*buf, a);
-        results->bufsize = sz > results->bufsize ? sz : results->bufsize;
-        if(C4_LIKELY(sz <= buf->len))
-            results->lastok = currarg;
-        else
-            buf->len = 0;
-    }
-}
-
-template<class SinkFn, class Arg>
-void catsep_dump_resume_(size_t currarg, SinkFn &&sinkfn, DumpResults *C4_RESTRICT results, substr *C4_RESTRICT buf, Arg const& C4_RESTRICT a)
-{
-    if(C4_LIKELY(results->write_arg(currarg)))
-    {
-        size_t sz = dump(std::forward<SinkFn>(sinkfn), *buf, a);
-        results->bufsize = sz > results->bufsize ? sz : results->bufsize;
-        if(C4_LIKELY(sz <= buf->len))
-            results->lastok = currarg;
-        else
-            buf->len = 0;
-    }
-}
-
-template<SinkPfn sinkfn, class Sep, class Arg>
-C4_ALWAYS_INLINE void catsep_dump_resume(size_t currarg, DumpResults *C4_RESTRICT results, substr *C4_RESTRICT buf, Sep const&, Arg const& a)
-{
-    detail::catsep_dump_resume_<sinkfn>(currarg, results, buf, a);
-}
-
-template<class SinkFn, class Sep, class Arg>
-C4_ALWAYS_INLINE void catsep_dump_resume(size_t currarg, SinkFn &&sinkfn, DumpResults *C4_RESTRICT results, substr *C4_RESTRICT buf, Sep const&, Arg const& a)
-{
-    detail::catsep_dump_resume_(currarg, std::forward<SinkFn>(sinkfn), results, buf, a);
-}
-
-template<SinkPfn sinkfn, class Sep, class Arg, class... Args>
-C4_ALWAYS_INLINE void catsep_dump_resume(size_t currarg, DumpResults *C4_RESTRICT results, substr *C4_RESTRICT buf, Sep const& sep, Arg const& a, Args const& ...more)
-{
-    detail::catsep_dump_resume_<sinkfn>(currarg     , results, buf, a);
-    detail::catsep_dump_resume_<sinkfn>(currarg + 1u, results, buf, sep);
-    detail::catsep_dump_resume <sinkfn>(currarg + 2u, results, buf, sep, more...);
-}
-
-template<class SinkFn, class Sep, class Arg, class... Args>
-C4_ALWAYS_INLINE void catsep_dump_resume(size_t currarg, SinkFn &&sinkfn, DumpResults *C4_RESTRICT results, substr *C4_RESTRICT buf, Sep const& sep, Arg const& a, Args const& ...more)
-{
-    detail::catsep_dump_resume_(currarg     , std::forward<SinkFn>(sinkfn), results, buf, a);
-    detail::catsep_dump_resume_(currarg + 1u, std::forward<SinkFn>(sinkfn), results, buf, sep);
-    detail::catsep_dump_resume (currarg + 2u, std::forward<SinkFn>(sinkfn), results, buf, sep, more...);
-}
-} // namespace detail
-/// @endcond
-
-
-template<SinkPfn sinkfn, class Sep, class... Args>
-C4_ALWAYS_INLINE DumpResults catsep_dump_resume(substr buf, Sep const& sep, Args const& ...args)
-{
-    DumpResults results;
-    detail::catsep_dump_resume<sinkfn>(0u, &results, &buf, sep, args...);
-    return results;
-}
-
-template<class SinkFn, class Sep, class... Args>
-C4_ALWAYS_INLINE DumpResults catsep_dump_resume(SinkFn &&sinkfn, substr buf, Sep const& sep, Args const& ...args)
-{
-    DumpResults results;
-    detail::catsep_dump_resume(0u, std::forward<SinkFn>(sinkfn), &results, &buf, sep, args...);
-    return results;
-}
-
-
-template<SinkPfn sinkfn, class Sep, class... Args>
-C4_ALWAYS_INLINE DumpResults catsep_dump_resume(DumpResults results, substr buf, Sep const& sep, Args const& ...args)
-{
-    detail::catsep_dump_resume<sinkfn>(0u, &results, &buf, sep, args...);
-    return results;
-}
-
-template<class SinkFn, class Sep, class... Args>
-C4_ALWAYS_INLINE DumpResults catsep_dump_resume(SinkFn &&sinkfn, DumpResults results, substr buf, Sep const& sep, Args const& ...args)
-{
-    detail::catsep_dump_resume(0u, std::forward<SinkFn>(sinkfn), &results, &buf, sep, args...);
-    return results;
-}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/// @cond dev
-namespace detail {
-// terminate the recursion
-C4_ALWAYS_INLINE size_t _format_dump_compute_size()
-{
-    return 0u;
-}
-template<class T>
-C4_ALWAYS_INLINE auto _format_dump_compute_size(T const&)
-    -> typename std::enable_if<dump_directly<T>::value, size_t>::type
-{
-    return 0u; // no buffer needed
-}
-template<class T>
-C4_ALWAYS_INLINE auto _format_dump_compute_size(T const& v)
-    -> typename std::enable_if<!dump_directly<T>::value, size_t>::type
-{
-    return to_chars(substr{}, v);
-}
-template<class Arg, class... Args>
-size_t _format_dump_compute_size(Arg const& a, Args const& ...more)
-{
-    const size_t sz = _format_dump_compute_size(a); // don't call to_chars() directly
-    const size_t rest = _format_dump_compute_size(more...);
-    return sz > rest ? sz : rest;
-}
-} // namespace detail
-
-// terminate the recursion
-template<class SinkFn>
-C4_ALWAYS_INLINE size_t format_dump(SinkFn &&sinkfn, substr, csubstr fmt)
-{
-    // we can dump without using buf, so no need to check it
-    std::forward<SinkFn>(sinkfn)(fmt);
-    return 0u;
-}
-// terminate the recursion
-/** take the function pointer as a template argument */
-template<SinkPfn sinkfn>
-C4_ALWAYS_INLINE size_t format_dump(substr, csubstr fmt)
-{
-    // we can dump without using buf, so no need to check it
-    sinkfn(fmt);
-    return 0u;
-}
-/// @endcond
-
-
-/** take the function pointer as a function argument */
-template<class SinkFn, class Arg, class... Args>
-C4_NO_INLINE size_t format_dump(SinkFn &&sinkfn, substr buf, csubstr fmt, Arg const& a, Args const& ...more)
-{
-    // we can dump without using buf
-    // but we'll only dump if the buffer is ok
-    size_t pos = fmt.find("{}"); // @todo use _find_fmt()
-    if(C4_UNLIKELY(pos == csubstr::npos))
-    {
-        std::forward<SinkFn>(sinkfn)(fmt);
-        return 0u;
-    }
-    std::forward<SinkFn>(sinkfn)(fmt.first(pos)); // we can dump without using buf
-    fmt = fmt.sub(pos + 2); // skip {} do this before assigning to pos again
-    pos = dump(std::forward<SinkFn>(sinkfn), buf, a); // reuse pos to get needed_size
-    // dump no more if the buffer was exhausted
-    size_t size_for_more;
-    if(C4_LIKELY(pos <= buf.len))
-        size_for_more = format_dump(std::forward<SinkFn>(sinkfn), buf, fmt, more...);
-    else
-        size_for_more = detail::_format_dump_compute_size(more...);
-    return size_for_more > pos ? size_for_more : pos;
-}
-
-/** take the function pointer as a template argument */
-template<SinkPfn sinkfn, class Arg, class... Args>
-C4_NO_INLINE size_t format_dump(substr buf, csubstr fmt, Arg const& C4_RESTRICT a, Args const& ...more)
-{
-    // we can dump without using buf
-    // but we'll only dump if the buffer is ok
-    size_t pos = fmt.find("{}"); // @todo use _find_fmt()
-    if(C4_UNLIKELY(pos == csubstr::npos))
-    {
-        sinkfn(fmt);
-        return 0u;
-    }
-    sinkfn(fmt.first(pos)); // we can dump without using buf
-    fmt = fmt.sub(pos + 2); // skip {} do this before assigning to pos again
-    pos = dump<sinkfn>(buf, a); // reuse pos to get needed_size
-    // dump no more if the buffer was exhausted
-    size_t size_for_more;
-    if(C4_LIKELY(pos <= buf.len))
-        size_for_more = format_dump<sinkfn>(buf, fmt, more...);
-    else
-        size_for_more = detail::_format_dump_compute_size(more...);
-    return size_for_more > pos ? size_for_more : pos;
-}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/// @cond dev
-namespace detail {
-// terminate the recursion
-template<SinkPfn sinkfn>
-DumpResults format_dump_resume(size_t currarg, DumpResults results, substr, csubstr fmt)
-{
-    if(C4_LIKELY(results.write_arg(currarg)))
-    {
-        // we can dump without using buf
-        sinkfn(fmt);
-        results.lastok = currarg;
-    }
-    return results;
-}
-
-// terminate the recursion
-template<class SinkFn>
-DumpResults format_dump_resume(size_t currarg, SinkFn &&sinkfn, DumpResults results, substr, csubstr fmt)
-{
-    if(C4_LIKELY(results.write_arg(currarg)))
-    {
-        // we can dump without using buf
-        std::forward<SinkFn>(sinkfn)(fmt);
-        results.lastok = currarg;
-    }
-    return results;
-}
-
-template<SinkPfn sinkfn, class Arg, class... Args>
-DumpResults format_dump_resume(size_t currarg, DumpResults results, substr buf, csubstr fmt, Arg const& a, Args const& ...more)
-{
-    // we need to process the format even if we're not
-    // going to print the first arguments because we're resuming
-    const size_t pos = fmt.find("{}"); // @todo use _find_fmt()
-    if(C4_LIKELY(pos != csubstr::npos))
-    {
-        if(C4_LIKELY(results.write_arg(currarg)))
-        {
-            sinkfn(fmt.first(pos));
-            results.lastok = currarg;
-        }
-        if(C4_LIKELY(results.write_arg(currarg + 1u)))
-        {
-            const size_t len = dump<sinkfn>(buf, a);
-            results.bufsize = len > results.bufsize ? len : results.bufsize;
-            if(C4_LIKELY(len <= buf.len))
-            {
-                results.lastok = currarg + 1u;
-            }
-            else
-            {
-                const size_t rest = _format_dump_compute_size(more...);
-                results.bufsize = rest > results.bufsize ? rest : results.bufsize;
-                return results;
-            }
-        }
-    }
-    else
-    {
-        if(C4_LIKELY(results.write_arg(currarg)))
-        {
-            sinkfn(fmt);
-            results.lastok = currarg;
-        }
-        return results;
-    }
-    // NOTE: sparc64 had trouble with reassignment to fmt, and
-    // was passing the original fmt to the recursion:
-    //fmt = fmt.sub(pos + 2); // DONT!
-    return detail::format_dump_resume<sinkfn>(currarg + 2u, results, buf, fmt.sub(pos + 2), more...);
-}
-
-
-template<class SinkFn, class Arg, class... Args>
-DumpResults format_dump_resume(size_t currarg, SinkFn &&sinkfn, DumpResults results, substr buf, csubstr fmt, Arg const& a, Args const& ...more)
-{
-    // we need to process the format even if we're not
-    // going to print the first arguments because we're resuming
-    const size_t pos = fmt.find("{}"); // @todo use _find_fmt()
-    if(C4_LIKELY(pos != csubstr::npos))
-    {
-        if(C4_LIKELY(results.write_arg(currarg)))
-        {
-            std::forward<SinkFn>(sinkfn)(fmt.first(pos));
-            results.lastok = currarg;
-        }
-        if(C4_LIKELY(results.write_arg(currarg + 1u)))
-        {
-            const size_t len = dump(std::forward<SinkFn>(sinkfn), buf, a);
-            results.bufsize = len > results.bufsize ? len : results.bufsize;
-            if(C4_LIKELY(len <= buf.len))
-            {
-                results.lastok = currarg + 1u;
-            }
-            else
-            {
-                const size_t rest = _format_dump_compute_size(more...);
-                results.bufsize = rest > results.bufsize ? rest : results.bufsize;
-                return results;
-            }
-        }
-    }
-    else
-    {
-        if(C4_LIKELY(results.write_arg(currarg)))
-        {
-            std::forward<SinkFn>(sinkfn)(fmt);
-            results.lastok = currarg;
-        }
-        return results;
-    }
-    // NOTE: sparc64 had trouble with reassignment to fmt, and
-    // was passing the original fmt to the recursion:
-    //fmt = fmt.sub(pos + 2); // DONT!
-    return detail::format_dump_resume(currarg + 2u, std::forward<SinkFn>(sinkfn), results, buf, fmt.sub(pos + 2), more...);
-}
-} // namespace detail
-/// @endcond
-
-
-template<SinkPfn sinkfn, class... Args>
-C4_ALWAYS_INLINE DumpResults format_dump_resume(substr buf, csubstr fmt, Args const& ...args)
-{
-    return detail::format_dump_resume<sinkfn>(0u, DumpResults{}, buf, fmt, args...);
-}
-
-template<class SinkFn, class... Args>
-C4_ALWAYS_INLINE DumpResults format_dump_resume(SinkFn &&sinkfn, substr buf, csubstr fmt, Args const& ...args)
-{
-    return detail::format_dump_resume(0u, std::forward<SinkFn>(sinkfn), DumpResults{}, buf, fmt, args...);
-}
-
-
-template<SinkPfn sinkfn, class... Args>
-C4_ALWAYS_INLINE DumpResults format_dump_resume(DumpResults results, substr buf, csubstr fmt, Args const& ...args)
-{
-    return detail::format_dump_resume<sinkfn>(0u, results, buf, fmt, args...);
-}
-
-template<class SinkFn, class... Args>
-C4_ALWAYS_INLINE DumpResults format_dump_resume(SinkFn &&sinkfn, DumpResults results, substr buf, csubstr fmt, Args const& ...args)
-{
-    return detail::format_dump_resume(0u, std::forward<SinkFn>(sinkfn), results, buf, fmt, args...);
-}
-
-C4_SUPPRESS_WARNING_GCC_CLANG_POP
-
-} // namespace c4
-
-
-#endif /* C4_DUMP_HPP_ */
@@ -1,440 +0,0 @@
-#ifndef _C4_ERROR_HPP_
-#define _C4_ERROR_HPP_
-
-/** @file error.hpp Facilities for error reporting and runtime assertions. */
-
-/** @defgroup error_checking Error checking */
-
-#include "c4/config.hpp"
-
-#ifdef _DOXYGEN_
-    /** if this is defined and exceptions are enabled, then calls to C4_ERROR()
-     * will throw an exception
-     * @ingroup error_checking */
-#   define C4_EXCEPTIONS_ENABLED
-    /** if this is defined and exceptions are enabled, then calls to C4_ERROR()
-     *  will throw an exception
-     * @see C4_EXCEPTIONS_ENABLED
-     * @ingroup error_checking */
-#   define C4_ERROR_THROWS_EXCEPTION
-    /** evaluates to noexcept when C4_ERROR might be called and
-     * exceptions are disabled. Otherwise, defaults to nothing.
-     * @ingroup error_checking */
-#   define C4_NOEXCEPT
-#endif // _DOXYGEN_
-
-#if defined(C4_EXCEPTIONS_ENABLED) && defined(C4_ERROR_THROWS_EXCEPTION)
-#   define C4_NOEXCEPT
-#else
-#   define C4_NOEXCEPT noexcept
-#endif
-
-
-namespace c4 {
-namespace detail {
-struct fail_type__ {};
-} // detail
-} // c4
-#define C4_STATIC_ERROR(dummy_type, errmsg)                             \
-    static_assert(std::is_same<dummy_type, c4::detail::fail_type__>::value, errmsg)
-
-
-//-----------------------------------------------------------------------------
-
-#define C4_ASSERT_SAME_TYPE(ty1, ty2)                       \
-    C4_STATIC_ASSERT(std::is_same<ty1 C4_COMMA_X ty2>::value)
-
-#define C4_ASSERT_DIFF_TYPE(ty1, ty2)                       \
-    C4_STATIC_ASSERT( ! std::is_same<ty1 C4_COMMA_X ty2>::value)
-
-
-//-----------------------------------------------------------------------------
-
-#ifdef _DOXYGEN_
-/** utility macro that triggers a breakpoint when
- * the debugger is attached and NDEBUG is not defined.
- * @ingroup error_checking */
-#   define C4_DEBUG_BREAK()
-#endif // _DOXYGEN_
-
-
-#if defined(NDEBUG) || defined(C4_NO_DEBUG_BREAK)
-#   define C4_DEBUG_BREAK()
-#else
-#   ifdef __clang__
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wundef"
-#       if !defined(__APPLE_CC__)
-#           if __clang_major__ >= 10
-#               pragma clang diagnostic ignored "-Wgnu-inline-cpp-without-extern" // debugbreak/debugbreak.h:50:16: error: 'gnu_inline' attribute without 'extern' in C++ treated as externally available, this changed in Clang 10 [-Werror,-Wgnu-inline-cpp-without-extern]
-#           endif
-#       else
-#           if __clang_major__ >= 13
-#               pragma clang diagnostic ignored "-Wgnu-inline-cpp-without-extern" // debugbreak/debugbreak.h:50:16: error: 'gnu_inline' attribute without 'extern' in C++ treated as externally available, this changed in Clang 10 [-Werror,-Wgnu-inline-cpp-without-extern]
-#           endif
-#       endif
-#   elif defined(__GNUC__)
-#       pragma GCC diagnostic push
-#       pragma GCC diagnostic ignored "-Wundef"
-#   endif
-#   include <c4/ext/debugbreak/debugbreak.h>
-#   define C4_DEBUG_BREAK() if(c4::is_debugger_attached()) { ::debug_break(); }
-#   ifdef __clang__
-#       pragma clang diagnostic pop
-#   elif defined(__GNUC__)
-#       pragma GCC diagnostic pop
-#   endif
-#endif
-
-namespace c4 {
-C4CORE_EXPORT bool is_debugger_attached();
-} // namespace c4
-
-
-//-----------------------------------------------------------------------------
-
-#ifdef __clang__
-    /* NOTE: using , ## __VA_ARGS__ to deal with zero-args calls to
-     * variadic macros is not portable, but works in clang, gcc, msvc, icc.
-     * clang requires switching off compiler warnings for pedantic mode.
-     * @see http://stackoverflow.com/questions/32047685/variadic-macro-without-arguments */
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments" // warning: token pasting of ',' and __VA_ARGS__ is a GNU extension
-#elif defined(__GNUC__)
-    /* GCC also issues a warning for zero-args calls to variadic macros.
-     * This warning is switched on with -pedantic and apparently there is no
-     * easy way to turn it off as with clang. But marking this as a system
-     * header works.
-     * @see https://gcc.gnu.org/onlinedocs/cpp/System-Headers.html
-     * @see http://stackoverflow.com/questions/35587137/ */
-#   pragma GCC system_header
-#endif
-
-
-//-----------------------------------------------------------------------------
-
-namespace c4 {
-
-typedef enum : uint32_t {
-    /** when an error happens and the debugger is attached, call C4_DEBUG_BREAK().
-     * Without effect otherwise. */
-    ON_ERROR_DEBUGBREAK = 0x01u << 0u,
-    /** when an error happens log a message. */
-    ON_ERROR_LOG = 0x01u << 1u,
-    /** when an error happens invoke a callback if it was set with
-     * set_error_callback(). */
-    ON_ERROR_CALLBACK = 0x01u << 2u,
-    /** when an error happens call std::terminate(). */
-    ON_ERROR_ABORT = 0x01u << 3u,
-    /** when an error happens and exceptions are enabled throw an exception.
-     * Without effect otherwise. */
-    ON_ERROR_THROW = 0x01u << 4u,
-    /** the default flags. */
-    ON_ERROR_DEFAULTS = ON_ERROR_DEBUGBREAK|ON_ERROR_LOG|ON_ERROR_CALLBACK|ON_ERROR_ABORT
-} ErrorFlags_e;
-using error_flags = uint32_t;
-C4CORE_EXPORT void set_error_flags(error_flags f);
-C4CORE_EXPORT error_flags get_error_flags();
-
-
-using error_callback_type = void (*)(const char* msg, size_t msg_size);
-C4CORE_EXPORT void set_error_callback(error_callback_type cb);
-C4CORE_EXPORT error_callback_type get_error_callback();
-
-
-//-----------------------------------------------------------------------------
-/** RAII class controling the error settings inside a scope. */
-struct ScopedErrorSettings // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-    error_flags m_flags;
-    error_callback_type m_callback;
-
-    explicit ScopedErrorSettings(error_callback_type cb)
-    :   m_flags(get_error_flags()),
-        m_callback(get_error_callback())
-    {
-        set_error_callback(cb);
-    }
-    explicit ScopedErrorSettings(error_flags flags)
-    :   m_flags(get_error_flags()),
-        m_callback(get_error_callback())
-    {
-        set_error_flags(flags);
-    }
-    explicit ScopedErrorSettings(error_flags flags, error_callback_type cb)
-    :   m_flags(get_error_flags()),
-        m_callback(get_error_callback())
-    {
-        set_error_flags(flags);
-        set_error_callback(cb);
-    }
-    ~ScopedErrorSettings()
-    {
-        set_error_flags(m_flags);
-        set_error_callback(m_callback);
-    }
-};
-
-
-//-----------------------------------------------------------------------------
-
-/** source location */
-struct srcloc;
-
-// watchout: for VS the [[noreturn]] needs to come before other annotations like C4CORE_EXPORT
-[[noreturn]] C4CORE_EXPORT void handle_error(srcloc s, const char *fmt, ...);
-C4CORE_EXPORT void handle_warning(srcloc s, const char *fmt, ...);
-
-
-#   define C4_ERROR(msg, ...)                               \
-    do {                                                    \
-        if(c4::get_error_flags() & c4::ON_ERROR_DEBUGBREAK) \
-        {                                                   \
-            C4_DEBUG_BREAK()                                \
-        }                                                   \
-        c4::handle_error(C4_SRCLOC(), msg, ## __VA_ARGS__); \
-    } while(0)
-
-
-#   define C4_WARNING(msg, ...)                             \
-    c4::handle_warning(C4_SRCLOC(), msg, ## __VA_ARGS__)
-
-
-#if defined(C4_ERROR_SHOWS_FILELINE) && defined(C4_ERROR_SHOWS_FUNC)
-
-struct srcloc
-{
-    const char *file = "";
-    const char *func = "";
-    int line = 0;
-};
-#define C4_SRCLOC() c4::srcloc{__FILE__, C4_PRETTY_FUNC, __LINE__}
-
-#elif defined(C4_ERROR_SHOWS_FILELINE)
-
-struct srcloc
-{
-    const char *file;
-    int line;
-};
-#define C4_SRCLOC() c4::srcloc{__FILE__, __LINE__}
-
-#elif ! defined(C4_ERROR_SHOWS_FUNC)
-
-struct srcloc
-{
-};
-#define C4_SRCLOC() c4::srcloc()
-
-#else
-#   error not implemented
-#endif
-
-
-//-----------------------------------------------------------------------------
-// assertions
-
-// Doxygen needs this so that only one definition counts
-#ifdef _DOXYGEN_
-    /** Explicitly enables assertions, independently of NDEBUG status.
-     * This is meant to allow enabling assertions even when NDEBUG is defined.
-     * Defaults to undefined.
-     * @ingroup error_checking */
-#   define C4_USE_ASSERT
-    /** assert that a condition is true; this is turned off when NDEBUG
-     * is defined and C4_USE_ASSERT is not true.
-     * @ingroup error_checking  */
-#   define C4_ASSERT
-    /** same as C4_ASSERT(), additionally prints a printf-formatted message
-     * @ingroup error_checking */
-#   define C4_ASSERT_MSG
-    /** evaluates to C4_NOEXCEPT when C4_XASSERT is disabled; otherwise, defaults
-     * to noexcept
-     * @ingroup error_checking */
-#   define C4_NOEXCEPT_A
-#endif // _DOXYGEN_
-
-#ifndef C4_USE_ASSERT
-#   ifdef NDEBUG
-#       define C4_USE_ASSERT 0
-#   else
-#       define C4_USE_ASSERT 1
-#   endif
-#endif
-
-#if C4_USE_ASSERT
-#   define C4_ASSERT(cond) C4_CHECK(cond)
-#   define C4_ASSERT_MSG(cond, /*fmt, */...) C4_CHECK_MSG(cond, ## __VA_ARGS__)
-#   define C4_ASSERT_IF(predicate, cond) if(predicate) { C4_ASSERT(cond); }
-#   define C4_NOEXCEPT_A C4_NOEXCEPT
-#else
-#   define C4_ASSERT(cond)
-#   define C4_ASSERT_MSG(cond, /*fmt, */...)
-#   define C4_ASSERT_IF(predicate, cond)
-#   define C4_NOEXCEPT_A noexcept
-#endif
-
-
-//-----------------------------------------------------------------------------
-// extreme assertions
-
-// Doxygen needs this so that only one definition counts
-#ifdef _DOXYGEN_
-    /** Explicitly enables extreme assertions; this is meant to allow enabling
-     * assertions even when NDEBUG is defined. Defaults to undefined.
-     * @ingroup error_checking */
-#   define C4_USE_XASSERT
-    /** extreme assertion: can be switched off independently of
-     * the regular assertion; use for example for bounds checking in hot code.
-     * Turned on only when C4_USE_XASSERT is defined
-     * @ingroup error_checking */
-#   define C4_XASSERT
-    /** same as C4_XASSERT(), and additionally prints a printf-formatted message
-     * @ingroup error_checking */
-#   define C4_XASSERT_MSG
-    /** evaluates to C4_NOEXCEPT when C4_XASSERT is disabled; otherwise, defaults to noexcept
-     * @ingroup error_checking */
-#   define C4_NOEXCEPT_X
-#endif // _DOXYGEN_
-
-#ifndef C4_USE_XASSERT
-#   define C4_USE_XASSERT C4_USE_ASSERT
-#endif
-
-#if C4_USE_XASSERT
-#   define C4_XASSERT(cond) C4_CHECK(cond)
-#   define C4_XASSERT_MSG(cond, /*fmt, */...) C4_CHECK_MSG(cond, ## __VA_ARGS__)
-#   define C4_XASSERT_IF(predicate, cond) if(predicate) { C4_XASSERT(cond); }
-#   define C4_NOEXCEPT_X C4_NOEXCEPT
-#else
-#   define C4_XASSERT(cond)
-#   define C4_XASSERT_MSG(cond, /*fmt, */...)
-#   define C4_XASSERT_IF(predicate, cond)
-#   define C4_NOEXCEPT_X noexcept
-#endif
-
-
-//-----------------------------------------------------------------------------
-// checks: never switched-off
-
-/** Check that a condition is true, or raise an error when not
- * true. Unlike C4_ASSERT(), this check is not disabled in non-debug
- * builds.
- * @see C4_ASSERT
- * @ingroup error_checking
- *
- * @todo add constexpr-compatible compile-time assert:
- * https://akrzemi1.wordpress.com/2017/05/18/asserts-in-constexpr-functions/
- */
-#define C4_CHECK(cond)                              \
-    do {                                            \
-        if(C4_UNLIKELY(!(cond)))                    \
-        {                                           \
-            C4_ERROR("check failed: %s", #cond);    \
-        }                                           \
-    } while(0)
-
-
-/** like C4_CHECK(), and additionally log a printf-style message.
- * @see C4_CHECK
- * @ingroup error_checking */
-#define C4_CHECK_MSG(cond, fmt, ...)                                    \
-    do {                                                                \
-        if(C4_UNLIKELY(!(cond)))                                        \
-        {                                                               \
-            C4_ERROR("check failed: " #cond "\n" fmt, ## __VA_ARGS__);  \
-        }                                                               \
-    } while(0)
-
-
-//-----------------------------------------------------------------------------
-// Common error conditions
-
-#define C4_NOT_IMPLEMENTED() C4_ERROR("NOT IMPLEMENTED")
-#define C4_NOT_IMPLEMENTED_MSG(/*msg, */...) C4_ERROR("NOT IMPLEMENTED: " __VA_ARGS__)
-#define C4_NOT_IMPLEMENTED_IF(condition) do { if(C4_UNLIKELY(condition)) { C4_ERROR("NOT IMPLEMENTED"); } } while(0)
-#define C4_NOT_IMPLEMENTED_IF_MSG(condition, /*msg, */...) do { if(C4_UNLIKELY(condition)) { C4_ERROR("NOT IMPLEMENTED: " __VA_ARGS__); } } while(0)
-
-#define C4_NEVER_REACH() do { C4_ERROR("never reach this point"); C4_UNREACHABLE(); } while(0)
-#define C4_NEVER_REACH_MSG(/*msg, */...) do { C4_ERROR("never reach this point: " __VA_ARGS__); C4_UNREACHABLE(); } while(0)
-
-
-
-//-----------------------------------------------------------------------------
-// helpers for warning suppression
-// idea adapted from https://github.com/onqtam/doctest/
-
-// TODO: add C4_MESSAGE() https://stackoverflow.com/questions/18252351/custom-preprocessor-macro-for-a-conditional-pragma-message-xxx?rq=1
-
-
-#ifdef C4_MSVC
-#define C4_SUPPRESS_WARNING_MSVC_PUSH __pragma(warning(push))
-#define C4_SUPPRESS_WARNING_MSVC(w)  __pragma(warning(disable : w))
-#define C4_SUPPRESS_WARNING_MSVC_POP __pragma(warning(pop))
-#else // C4_MSVC
-#define C4_SUPPRESS_WARNING_MSVC_PUSH
-#define C4_SUPPRESS_WARNING_MSVC(w)
-#define C4_SUPPRESS_WARNING_MSVC_POP
-#endif // C4_MSVC
-
-
-#ifdef C4_CLANG
-#define C4_PRAGMA_TO_STR(x) _Pragma(#x)
-#define C4_SUPPRESS_WARNING_CLANG_PUSH _Pragma("clang diagnostic push")
-#define C4_SUPPRESS_WARNING_CLANG(w) C4_PRAGMA_TO_STR(clang diagnostic ignored w)
-#define C4_SUPPRESS_WARNING_CLANG_POP _Pragma("clang diagnostic pop")
-#else // C4_CLANG
-#define C4_SUPPRESS_WARNING_CLANG_PUSH
-#define C4_SUPPRESS_WARNING_CLANG(w)
-#define C4_SUPPRESS_WARNING_CLANG_POP
-#endif // C4_CLANG
-
-
-#ifdef C4_GCC
-#define C4_PRAGMA_TO_STR(x) _Pragma(#x)
-#define C4_SUPPRESS_WARNING_GCC_PUSH _Pragma("GCC diagnostic push")
-#define C4_SUPPRESS_WARNING_GCC(w) C4_PRAGMA_TO_STR(GCC diagnostic ignored w)
-#define C4_SUPPRESS_WARNING_GCC_POP _Pragma("GCC diagnostic pop")
-#else // C4_GCC
-#define C4_SUPPRESS_WARNING_GCC_PUSH
-#define C4_SUPPRESS_WARNING_GCC(w)
-#define C4_SUPPRESS_WARNING_GCC_POP
-#endif // C4_GCC
-
-
-#define C4_SUPPRESS_WARNING_MSVC_WITH_PUSH(w)   \
-    C4_SUPPRESS_WARNING_MSVC_PUSH               \
-    C4_SUPPRESS_WARNING_MSVC(w)
-
-#define C4_SUPPRESS_WARNING_CLANG_WITH_PUSH(w)  \
-    C4_SUPPRESS_WARNING_CLANG_PUSH              \
-    C4_SUPPRESS_WARNING_CLANG(w)
-
-#define C4_SUPPRESS_WARNING_GCC_WITH_PUSH(w)    \
-    C4_SUPPRESS_WARNING_GCC_PUSH                \
-    C4_SUPPRESS_WARNING_GCC(w)
-
-
-#define C4_SUPPRESS_WARNING_GCC_CLANG_PUSH \
-    C4_SUPPRESS_WARNING_GCC_PUSH     \
-    C4_SUPPRESS_WARNING_CLANG_PUSH
-
-#define C4_SUPPRESS_WARNING_GCC_CLANG(w) \
-    C4_SUPPRESS_WARNING_GCC(w)     \
-    C4_SUPPRESS_WARNING_CLANG(w)
-
-#define C4_SUPPRESS_WARNING_GCC_CLANG_WITH_PUSH(w) \
-    C4_SUPPRESS_WARNING_GCC_WITH_PUSH(w)     \
-    C4_SUPPRESS_WARNING_CLANG_WITH_PUSH(w)
-
-#define C4_SUPPRESS_WARNING_GCC_CLANG_POP \
-    C4_SUPPRESS_WARNING_GCC_POP     \
-    C4_SUPPRESS_WARNING_CLANG_POP
-
-} // namespace c4
-
-#ifdef __clang__
-#   pragma clang diagnostic pop
-#endif
-
-#endif /* _C4_ERROR_HPP_ */
@@ -1,18 +0,0 @@
-#ifndef C4_EXPORT_HPP_
-#define C4_EXPORT_HPP_
-
-#ifdef _WIN32
-    #ifdef C4CORE_SHARED
-        #ifdef C4CORE_EXPORTS
-            #define C4CORE_EXPORT __declspec(dllexport)
-        #else
-            #define C4CORE_EXPORT __declspec(dllimport)
-        #endif
-    #else
-        #define C4CORE_EXPORT
-    #endif
-#else
-    #define C4CORE_EXPORT
-#endif
-
-#endif /* C4CORE_EXPORT_HPP_ */
@@ -1,358 +0,0 @@
-#ifndef _C4_LANGUAGE_HPP_
-#define _C4_LANGUAGE_HPP_
-
-/** @file language.hpp Provides language standard information macros and
- * compiler agnostic utility macros: namespace facilities, function attributes,
- * variable attributes, etc.
- * @ingroup basic_headers */
-
-#include "c4/preprocessor.hpp"
-#include "c4/compiler.hpp"
-
-/* Detect C++ standard.
- * @see http://stackoverflow.com/a/7132549/5875572 */
-#ifndef C4_CPP
-#   if defined(_MSC_VER) && !defined(__clang__)
-#       if _MSC_VER >= 1910  // >VS2015: VS2017, VS2019, VS2022
-#           if (!defined(_MSVC_LANG))
-#               error _MSVC not defined
-#           endif
-#           if _MSVC_LANG >= 201705L
-#               define C4_CPP 20
-#               define C4_CPP20
-#           elif _MSVC_LANG == 201703L
-#               define C4_CPP 17
-#               define C4_CPP17
-#           elif _MSVC_LANG >= 201402L
-#               define C4_CPP 14
-#               define C4_CPP14
-#           elif _MSVC_LANG >= 201103L
-#               define C4_CPP 11
-#               define C4_CPP11
-#           else
-#               error C++ lesser than C++11 not supported
-#           endif
-#       else
-#           if _MSC_VER == 1900
-#               define C4_CPP 14  // VS2015 is c++14 https://devblogs.microsoft.com/cppblog/c111417-features-in-vs-2015-rtm/
-#               define C4_CPP14
-#           elif _MSC_VER == 1800 // VS2013
-#               define C4_CPP 11
-#               define C4_CPP11
-#           else
-#               error C++ lesser than C++11 not supported
-#           endif
-#       endif
-#   elif defined(__INTEL_COMPILER) // https://software.intel.com/en-us/node/524490
-#       ifdef __INTEL_CXX20_MODE__ // not sure about this
-#           define C4_CPP 20
-#           define C4_CPP20
-#       elif defined __INTEL_CXX17_MODE__ // not sure about this
-#           define C4_CPP 17
-#           define C4_CPP17
-#       elif defined __INTEL_CXX14_MODE__ // not sure about this
-#           define C4_CPP 14
-#           define C4_CPP14
-#       elif defined __INTEL_CXX11_MODE__
-#           define C4_CPP 11
-#           define C4_CPP11
-#       else
-#           error C++ lesser than C++11 not supported
-#       endif
-#   else
-#       ifndef __cplusplus
-#           error __cplusplus is not defined?
-#       endif
-#       if __cplusplus == 1
-#           error cannot handle __cplusplus==1
-#       elif __cplusplus >= 201709L
-#           define C4_CPP 20
-#           define C4_CPP20
-#       elif __cplusplus >= 201703L
-#           define C4_CPP 17
-#           define C4_CPP17
-#       elif __cplusplus >= 201402L
-#           define C4_CPP 14
-#           define C4_CPP14
-#       elif __cplusplus >= 201103L
-#           define C4_CPP 11
-#           define C4_CPP11
-#       elif __cplusplus >= 199711L
-#           error C++ lesser than C++11 not supported
-#       endif
-#   endif
-#else
-#   ifdef C4_CPP == 20
-#       define C4_CPP20
-#   elif C4_CPP == 17
-#       define C4_CPP17
-#   elif C4_CPP == 14
-#       define C4_CPP14
-#   elif C4_CPP == 11
-#       define C4_CPP11
-#   elif C4_CPP == 98
-#       define C4_CPP98
-#       error C++ lesser than C++11 not supported
-#   else
-#       error C4_CPP must be one of 20, 17, 14, 11, 98
-#   endif
-#endif
-
-#ifdef C4_CPP20
-#   define C4_CPP17
-#   define C4_CPP14
-#   define C4_CPP11
-#elif defined(C4_CPP17)
-#   define C4_CPP14
-#   define C4_CPP11
-#elif defined(C4_CPP14)
-#   define C4_CPP11
-#endif
-
-/** lifted from this answer: http://stackoverflow.com/a/20170989/5875572 */
-#if defined(_MSC_VER) && !defined(__clang__)
-#  if _MSC_VER < 1900
-#    define C4_CONSTEXPR11
-#    define C4_CONSTEXPR14
-#  elif _MSC_VER < 2000
-#    define C4_CONSTEXPR11 constexpr
-#    define C4_CONSTEXPR14
-#  else
-#    define C4_CONSTEXPR11 constexpr
-#    define C4_CONSTEXPR14 constexpr
-#  endif
-#else
-#  if __cplusplus < 201103
-#    define C4_CONSTEXPR11
-#    define C4_CONSTEXPR14
-#  elif __cplusplus == 201103
-#    define C4_CONSTEXPR11 constexpr
-#    define C4_CONSTEXPR14
-#  else
-#    define C4_CONSTEXPR11 constexpr
-#    define C4_CONSTEXPR14 constexpr
-#  endif
-#endif  // _MSC_VER
-
-
-#if C4_CPP < 17
-#define C4_IF_CONSTEXPR
-#define C4_INLINE_CONSTEXPR constexpr
-#else
-#define C4_IF_CONSTEXPR constexpr
-#define C4_INLINE_CONSTEXPR inline constexpr
-#endif
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#  if (defined(_CPPUNWIND) && (_CPPUNWIND == 1))
-#    define C4_EXCEPTIONS
-#  endif
-#else
-#  if defined(__EXCEPTIONS) || defined(__cpp_exceptions)
-#    define C4_EXCEPTIONS
-#  endif
-#endif
-
-#ifdef C4_EXCEPTIONS
-#  define C4_IF_EXCEPTIONS_(exc_code, setjmp_code) exc_code
-#  define C4_IF_EXCEPTIONS(exc_code, setjmp_code) do { exc_code } while(0)
-#else
-#  define C4_IF_EXCEPTIONS_(exc_code, setjmp_code) setjmp_code
-#  define C4_IF_EXCEPTIONS(exc_code, setjmp_code) do { setjmp_code } while(0)
-#endif
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#  if defined(_CPPRTTI)
-#    define C4_RTTI
-#  endif
-#else
-#  if defined(__GXX_RTTI)
-#    define C4_RTTI
-#  endif
-#endif
-
-#ifdef C4_RTTI
-#  define C4_IF_RTTI_(code_rtti, code_no_rtti) code_rtti
-#  define C4_IF_RTTI(code_rtti, code_no_rtti) do { code_rtti } while(0)
-#else
-#  define C4_IF_RTTI_(code_rtti, code_no_rtti) code_no_rtti
-#  define C4_IF_RTTI(code_rtti, code_no_rtti) do { code_no_rtti } while(0)
-#endif
-
-
-//------------------------------------------------------------
-
-#define _C4_BEGIN_NAMESPACE(ns) namespace ns {
-#define _C4_END_NAMESPACE(ns)   }
-
-// MSVC cant handle the C4_FOR_EACH macro... need to fix this
-//#define C4_BEGIN_NAMESPACE(...) C4_FOR_EACH_SEP(_C4_BEGIN_NAMESPACE, , __VA_ARGS__)
-//#define C4_END_NAMESPACE(...) C4_FOR_EACH_SEP(_C4_END_NAMESPACE, , __VA_ARGS__)
-#define C4_BEGIN_NAMESPACE(ns) namespace ns {
-#define C4_END_NAMESPACE(ns) }
-
-#define C4_BEGIN_HIDDEN_NAMESPACE namespace /*hidden*/ {
-#define C4_END_HIDDEN_NAMESPACE } /* namespace hidden */
-
-//------------------------------------------------------------
-
-#ifndef C4_API
-#   if defined(_MSC_VER) && !defined(__clang__)
-#       if defined(C4_EXPORT)
-#           define C4_API __declspec(dllexport)
-#       elif defined(C4_IMPORT)
-#           define C4_API __declspec(dllimport)
-#       else
-#           define C4_API
-#       endif
-#   else
-#       define C4_API
-#   endif
-#endif
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#   define C4_RESTRICT __restrict
-#   define C4_RESTRICT_FN __declspec(restrict)
-#   define C4_NO_INLINE __declspec(noinline)
-#   define C4_ALWAYS_INLINE inline __forceinline
-/** these are not available in VS AFAIK */
-#   define C4_CONST
-#   define C4_PURE
-#   define C4_FLATTEN
-#   define C4_HOT         /** @todo */
-#   define C4_COLD        /** @todo */
-#   define C4_ASSUME(...) __assume(__VA_ARGS__)
-#   define C4_EXPECT(x, y) x /** @todo */
-#   define C4_LIKELY(x)   x
-#   define C4_UNLIKELY(x) x
-#   define C4_UNREACHABLE() _c4_msvc_unreachable()
-#   define C4_ATTR_FORMAT(...) /** */
-#   define C4_NORETURN [[noreturn]]
-#   if _MSC_VER >= 1700 // VS2012
-#       define C4_NODISCARD _Check_return_
-#   else
-#       define C4_NODISCARD
-#   endif
-[[noreturn]] __forceinline void _c4_msvc_unreachable() { __assume(false); } ///< https://stackoverflow.com/questions/60802864/emulating-gccs-builtin-unreachable-in-visual-studio
-#   define C4_UNREACHABLE_AFTER_ERR() /* */
-#else
-    ///< @todo assuming gcc-like compiler. check it is actually so.
-/** for function attributes in GCC,
- * @see https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#Common-Function-Attributes */
-/** for __builtin functions in GCC,
- * @see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */
-#   define C4_RESTRICT __restrict__
-#   define C4_RESTRICT_FN __attribute__((restrict))
-#   define C4_NO_INLINE __attribute__((noinline))
-#   define C4_ALWAYS_INLINE inline __attribute__((always_inline))
-#   define C4_CONST __attribute__((const))
-#   define C4_PURE __attribute__((pure))
-/** force inlining of every callee function */
-#   define C4_FLATTEN __atribute__((flatten))
-/** mark a function as hot, ie as having a visible impact in CPU time
- * thus making it more likely to inline, etc
- * @see http://stackoverflow.com/questions/15028990/semantics-of-gcc-hot-attribute */
-#   define C4_HOT __attribute__((hot))
-/** mark a function as cold, ie as NOT having a visible impact in CPU time
- * @see http://stackoverflow.com/questions/15028990/semantics-of-gcc-hot-attribute */
-#   define C4_COLD __attribute__((cold))
-#   define C4_EXPECT(x, y) __builtin_expect(x, y) ///< @see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
-#   define C4_LIKELY(x)   __builtin_expect(x, 1)
-#   define C4_UNLIKELY(x) __builtin_expect(x, 0)
-#   define C4_UNREACHABLE() __builtin_unreachable()
-#   define C4_ATTR_FORMAT(...) //__attribute__((format (__VA_ARGS__))) ///< @see https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#Common-Function-Attributes
-#   define C4_NORETURN __attribute__((noreturn))
-#   define C4_NODISCARD __attribute__((warn_unused_result))
-#   define C4_UNREACHABLE_AFTER_ERR() C4_UNREACHABLE()
-// C4_ASSUME
-// see https://stackoverflow.com/questions/63493968/reproducing-clangs-builtin-assume-for-gcc
-// preferred option: C++ standard attribute
-#   ifdef __has_cpp_attribute
-#       if __has_cpp_attribute(assume) >= 202207L
-#           define C4_ASSUME(...) [[assume(__VA_ARGS__)]]
-#       endif
-#   endif
-// first fallback: compiler intrinsics/attributes for assumptions
-#   ifndef C4_ASSUME
-#       if defined(__clang__)
-#           define C4_ASSUME(...) __builtin_assume(__VA_ARGS__)
-#       elif defined(__GNUC__)
-#       if __GNUC__ >= 13
-#           define C4_ASSUME(...) __attribute__((__assume__(__VA_ARGS__)))
-#       endif
-#       endif
-#   endif
-// second fallback: possibly evaluating uses of unreachable()
-// Set this to 1 if you want to allow assumptions to possibly evaluate.
-#   ifndef C4_ASSUME_ALLOW_EVAL
-#       define C4_ASSUME_ALLOW_EVAL 0
-#   endif
-#   if !defined(C4_ASSUME) && (C4_ASSUME_ALLOW_EVAL)
-#       define C4_ASSUME(...) do { if (!bool(__VA_ARGS__)) C4_UNREACHABLE(); ) while(0)
-#   endif
-// last fallback: define macro as doing nothing
-#   ifndef C4_ASSUME
-#       define C4_ASSUME(...)
-#   endif
-#endif
-
-
-#if C4_CPP >= 14
-#   define C4_DEPRECATED(msg) [[deprecated(msg)]]
-#else
-#   if defined(_MSC_VER)
-#       define C4_DEPRECATED(msg) __declspec(deprecated(msg))
-#   else // defined(__GNUC__) || defined(__clang__)
-#       define C4_DEPRECATED(msg) __attribute__((deprecated(msg)))
-#   endif
-#endif
-
-
-#ifdef _MSC_VER
-#   define C4_FUNC __FUNCTION__
-#   define C4_PRETTY_FUNC __FUNCSIG__
-#else /// @todo assuming gcc-like compiler. check it is actually so.
-#   define C4_FUNC __FUNCTION__
-#   define C4_PRETTY_FUNC __PRETTY_FUNCTION__
-#endif
-
-/** prevent compiler warnings about a specific var being unused */
-#define C4_UNUSED(var) (void)var
-
-#if C4_CPP >= 17
-#define C4_STATIC_ASSERT(cond) static_assert(cond)
-#else
-#define C4_STATIC_ASSERT(cond) static_assert((cond), #cond)
-#endif
-#define C4_STATIC_ASSERT_MSG(cond, msg) static_assert((cond), #cond ": " msg)
-
-/** @def C4_DONT_OPTIMIZE idea lifted from GoogleBenchmark.
- * @see https://github.com/google/benchmark/blob/master/include/benchmark/benchmark_api.h */
-namespace c4 {
-namespace detail {
-#ifdef __GNUC__
-#   define C4_DONT_OPTIMIZE(var) c4::detail::dont_optimize(var)
-template< class T >
-C4_ALWAYS_INLINE void dont_optimize(T const& value) { asm volatile("" : : "g"(value) : "memory"); } // NOLINT
-#else
-#   define C4_DONT_OPTIMIZE(var) c4::detail::use_char_pointer(reinterpret_cast< const char* >(&var))
-void use_char_pointer(char const volatile*);
-#endif
-} // namespace detail
-} // namespace c4
-
-/** @def C4_KEEP_EMPTY_LOOP prevent an empty loop from being optimized out.
- * @see http://stackoverflow.com/a/7084193/5875572 */
-#if defined(_MSC_VER) && !defined(__clang__)
-#   define C4_KEEP_EMPTY_LOOP { char c; C4_DONT_OPTIMIZE(c); }
-#else
-#   define C4_KEEP_EMPTY_LOOP { asm(""); }
-#endif
-
-/** @def C4_VA_LIST_REUSE_MUST_COPY
- * @todo <jpmag> I strongly suspect that this is actually only in UNIX platforms. revisit this. */
-#ifdef __GNUC__
-#   define C4_VA_LIST_REUSE_MUST_COPY
-#endif
-
-#endif /* _C4_LANGUAGE_HPP_ */
@@ -1,782 +0,0 @@
-#ifndef _C4_MEMORY_UTIL_HPP_
-#define _C4_MEMORY_UTIL_HPP_
-
-#include "c4/config.hpp"
-#include "c4/error.hpp"
-#include "c4/compiler.hpp"
-#include "c4/cpu.hpp"
-#ifdef C4_MSVC
-#include <intrin.h>
-#endif
-#include <string.h>
-
-#if (defined(__GNUC__) && __GNUC__ >= 10) || defined(__has_builtin)
-#define _C4_USE_LSB_INTRINSIC(which) __has_builtin(which)
-#define _C4_USE_MSB_INTRINSIC(which) __has_builtin(which)
-#elif defined(C4_MSVC)
-#define _C4_USE_LSB_INTRINSIC(which) true
-#define _C4_USE_MSB_INTRINSIC(which) true
-#else
-// let's try our luck
-#define _C4_USE_LSB_INTRINSIC(which) true
-#define _C4_USE_MSB_INTRINSIC(which) true
-#endif
-
-
-/** @file memory_util.hpp Some memory utilities. */
-
-// NOLINTBEGIN(google-runtime-int)
-
-namespace c4 {
-
-C4_SUPPRESS_WARNING_GCC_CLANG_WITH_PUSH("-Wold-style-cast")
-
-/** set the given memory to zero */
-C4_ALWAYS_INLINE void mem_zero(void* mem, size_t num_bytes)
-{
-    memset(mem, 0, num_bytes);
-}
-/** set the given memory to zero */
-template<class T>
-C4_ALWAYS_INLINE void mem_zero(T* mem, size_t num_elms)
-{
-    memset(mem, 0, sizeof(T) * num_elms);
-}
-/** set the given memory to zero */
-template<class T>
-C4_ALWAYS_INLINE void mem_zero(T* mem)
-{
-    memset(mem, 0, sizeof(T));
-}
-
-C4_ALWAYS_INLINE C4_CONST bool mem_overlaps(void const* a, void const* b, size_t sza, size_t szb)
-{
-    // thanks @timwynants
-    return (((const char*)b + szb) > a && b < ((const char*)a+sza));
-}
-
-void mem_repeat(void* dest, void const* pattern, size_t pattern_size, size_t num_times);
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-template<class T>
-C4_ALWAYS_INLINE C4_CONST bool is_aligned(T *ptr, uintptr_t alignment=alignof(T))
-{
-    return (uintptr_t(ptr) & (alignment - uintptr_t(1))) == uintptr_t(0);
-}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// least significant bit
-
-/** @name msb Compute the least significant bit
- * @note the input value must be nonzero
- * @note the input type must be unsigned
- */
-/** @{ */
-
-// https://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightLinear
-#define _c4_lsb_fallback                                                \
-    unsigned c = 0;                                                     \
-    v = (v ^ (v - 1)) >> 1; /* Set v's trailing 0s to 1s and zero rest */ \
-    for(; v; ++c)                                                       \
-        v >>= 1;                                                        \
-    return (unsigned) c
-
-// u8
-template<class I>
-C4_CONSTEXPR14
-auto lsb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 1u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_LSB_INTRINSIC(__builtin_ctz)
-        // upcast to use the intrinsic, it's cheaper.
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanForward(&bit, (unsigned long)v);
-                return bit;
-            #else
-                _c4_lsb_fallback;
-            #endif
-        #else
-            return (unsigned)__builtin_ctz((unsigned)v);
-        #endif
-    #else
-        _c4_lsb_fallback;
-    #endif
-}
-
-// u16
-template<class I>
-C4_CONSTEXPR14
-auto lsb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 2u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_LSB_INTRINSIC(__builtin_ctz)
-        // upcast to use the intrinsic, it's cheaper.
-        // Then remember that the upcast makes it to 31bits
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanForward(&bit, (unsigned long)v);
-                return bit;
-            #else
-                _c4_lsb_fallback;
-            #endif
-        #else
-            return (unsigned)__builtin_ctz((unsigned)v);
-        #endif
-    #else
-        _c4_lsb_fallback;
-    #endif
-}
-
-// u32
-template<class I>
-C4_CONSTEXPR14
-auto lsb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 4u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_LSB_INTRINSIC(__builtin_ctz)
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanForward(&bit, v);
-                return bit;
-            #else
-                _c4_lsb_fallback;
-            #endif
-        #else
-            return (unsigned)__builtin_ctz((unsigned)v);
-        #endif
-    #else
-        _c4_lsb_fallback;
-    #endif
-}
-
-// u64 in 64bits
-template<class I>
-C4_CONSTEXPR14
-auto lsb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 8u && sizeof(unsigned long) == 8u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_LSB_INTRINSIC(__builtin_ctzl)
-        #if defined(C4_MSVC)
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanForward64(&bit, v);
-                return bit;
-            #else
-                _c4_lsb_fallback;
-            #endif
-        #else
-            return (unsigned)__builtin_ctzl((unsigned long)v);
-        #endif
-    #else
-        _c4_lsb_fallback;
-    #endif
-}
-
-// u64 in 32bits
-template<class I>
-C4_CONSTEXPR14
-auto lsb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 8u && sizeof(unsigned long long) == 8u && sizeof(unsigned long) != sizeof(unsigned long long), unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_LSB_INTRINSIC(__builtin_ctzll)
-        #if defined(C4_MSVC)
-            #if !defined(C4_CPU_X86) && !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanForward64(&bit, v);
-                return bit;
-            #else
-                _c4_lsb_fallback;
-            #endif
-        #else
-            return (unsigned)__builtin_ctzll((unsigned long long)v);
-        #endif
-    #else
-        _c4_lsb_fallback;
-    #endif
-}
-
-#undef _c4_lsb_fallback
-
-/** @} */
-
-
-namespace detail {
-template<class I, I val, unsigned num_bits, bool finished> struct _lsb11;
-template<class I, I val, unsigned num_bits>
-struct _lsb11<I, val, num_bits, false>
-{
-    enum : unsigned { num = _lsb11<I, (val>>1), num_bits+I(1), (((val>>1)&I(1))!=I(0))>::num };
-};
-template<class I, I val, unsigned num_bits>
-struct _lsb11<I, val, num_bits, true>
-{
-    enum : unsigned { num = num_bits };
-};
-} // namespace detail
-
-
-/** TMP version of lsb(); this needs to be implemented with template
- * meta-programming because C++11 cannot use a constexpr function with
- * local variables
- * @see lsb */
-template<class I, I number>
-struct lsb11
-{
-    static_assert(number != 0, "lsb: number must be nonzero");
-    enum : unsigned { value = detail::_lsb11<I, number, 0, ((number&I(1))!=I(0))>::num};
-};
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// most significant bit
-
-
-/** @name msb Compute the most significant bit
- * @note the input value must be nonzero
- * @note the input type must be unsigned
- */
-/** @{ */
-
-
-#define _c4_msb8_fallback                       \
-    unsigned n = 0;                             \
-    if(v & I(0xf0)) v >>= 4, n |= I(4);         \
-    if(v & I(0x0c)) v >>= 2, n |= I(2);         \
-    if(v & I(0x02)) v >>= 1, n |= I(1);         \
-    return n
-
-#define _c4_msb16_fallback                      \
-    unsigned n = 0;                             \
-    if(v & I(0xff00)) v >>= 8, n |= I(8);       \
-    if(v & I(0x00f0)) v >>= 4, n |= I(4);       \
-    if(v & I(0x000c)) v >>= 2, n |= I(2);       \
-    if(v & I(0x0002)) v >>= 1, n |= I(1);       \
-    return n
-
-#define _c4_msb32_fallback                      \
-    unsigned n = 0;                             \
-    if(v & I(0xffff0000)) v >>= 16, n |= 16;    \
-    if(v & I(0x0000ff00)) v >>= 8, n |= 8;      \
-    if(v & I(0x000000f0)) v >>= 4, n |= 4;      \
-    if(v & I(0x0000000c)) v >>= 2, n |= 2;      \
-    if(v & I(0x00000002)) v >>= 1, n |= 1;      \
-    return n
-
-#define _c4_msb64_fallback                              \
-    unsigned n = 0;                                     \
-    if(v & I(0xffffffff00000000)) v >>= 32, n |= I(32); \
-    if(v & I(0x00000000ffff0000)) v >>= 16, n |= I(16); \
-    if(v & I(0x000000000000ff00)) v >>= 8, n |= I(8);   \
-    if(v & I(0x00000000000000f0)) v >>= 4, n |= I(4);   \
-    if(v & I(0x000000000000000c)) v >>= 2, n |= I(2);   \
-    if(v & I(0x0000000000000002)) v >>= 1, n |= I(1);   \
-    return n
-
-
-// u8
-template<class I>
-C4_CONSTEXPR14
-auto msb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 1u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_MSB_INTRINSIC(__builtin_clz)
-        // upcast to use the intrinsic, it's cheaper.
-        // Then remember that the upcast makes it to 31bits
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanReverse(&bit, (unsigned long)v);
-                return bit;
-            #else
-                _c4_msb8_fallback;
-            #endif
-        #else
-            return 31u - (unsigned)__builtin_clz((unsigned)v);
-        #endif
-    #else
-        _c4_msb8_fallback;
-    #endif
-}
-
-// u16
-template<class I>
-C4_CONSTEXPR14
-auto msb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 2u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_MSB_INTRINSIC(__builtin_clz)
-        // upcast to use the intrinsic, it's cheaper.
-        // Then remember that the upcast makes it to 31bits
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanReverse(&bit, (unsigned long)v);
-                return bit;
-            #else
-                _c4_msb16_fallback;
-            #endif
-        #else
-            return 31u - (unsigned)__builtin_clz((unsigned)v);
-        #endif
-    #else
-        _c4_msb16_fallback;
-    #endif
-}
-
-// u32
-template<class I>
-C4_CONSTEXPR14
-auto msb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 4u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_MSB_INTRINSIC(__builtin_clz)
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanReverse(&bit, v);
-                return bit;
-            #else
-                _c4_msb32_fallback;
-            #endif
-        #else
-            return 31u - (unsigned)__builtin_clz((unsigned)v);
-        #endif
-    #else
-        _c4_msb32_fallback;
-    #endif
-}
-
-// u64 in 64bits
-template<class I>
-C4_CONSTEXPR14
-auto msb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 8u && sizeof(unsigned long) == 8u, unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_MSB_INTRINSIC(__builtin_clzl)
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanReverse64(&bit, v);
-                return bit;
-            #else
-                _c4_msb64_fallback;
-            #endif
-        #else
-            return 63u - (unsigned)__builtin_clzl((unsigned long)v);
-        #endif
-    #else
-        _c4_msb64_fallback;
-    #endif
-}
-
-// u64 in 32bits
-template<class I>
-C4_CONSTEXPR14
-auto msb(I v) noexcept
-    -> typename std::enable_if<sizeof(I) == 8u && sizeof(unsigned long long) == 8u && sizeof(unsigned long) != sizeof(unsigned long long), unsigned>::type
-{
-    C4_STATIC_ASSERT(std::is_unsigned<I>::value);
-    C4_ASSERT(v != 0);
-    #if _C4_USE_MSB_INTRINSIC(__builtin_clzll)
-        #ifdef C4_MSVC
-            #if !defined(C4_CPU_X86) && !defined(C4_CPU_ARM64) && !defined(C4_CPU_ARM)
-                unsigned long bit;
-                _BitScanReverse64(&bit, v);
-                return bit;
-            #else
-                _c4_msb64_fallback;
-            #endif
-        #else
-            return 63u - (unsigned)__builtin_clzll((unsigned long long)v);
-        #endif
-    #else
-        _c4_msb64_fallback;
-    #endif
-}
-
-#undef _c4_msb8_fallback
-#undef _c4_msb16_fallback
-#undef _c4_msb32_fallback
-#undef _c4_msb64_fallback
-
-/** @} */
-
-
-namespace detail {
-template<class I, I val, I num_bits, bool finished> struct _msb11;
-template<class I, I val, I num_bits>
-struct _msb11< I, val, num_bits, false>
-{
-    enum : unsigned { num = _msb11<I, (val>>1), num_bits+I(1), ((val>>1)==I(0))>::num };
-};
-template<class I, I val, I num_bits>
-struct _msb11<I, val, num_bits, true>
-{
-    static_assert(val == 0, "bad implementation");
-    enum : unsigned { num = (unsigned)(num_bits-1) };
-};
-} // namespace detail
-
-
-/** TMP version of msb(); this needs to be implemented with template
- * meta-programming because C++11 cannot use a constexpr function with
- * local variables
- * @see msb */
-template<class I, I number>
-struct msb11
-{
-    enum : unsigned { value = detail::_msb11<I, number, 0, (number==I(0))>::num };
-};
-
-
-
-#undef _C4_USE_LSB_INTRINSIC
-#undef _C4_USE_MSB_INTRINSIC
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-// there is an implicit conversion below; it happens when E or B are
-// narrower than int, and thus any operation will upcast the result to
-// int, and then downcast to assign
-C4_SUPPRESS_WARNING_GCC_CLANG_WITH_PUSH("-Wconversion")
-
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(B base, E exponent) noexcept -> typename std::enable_if<std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    if(exponent >= 0)
-    {
-        for(E e = 0; e < exponent; ++e)
-            r *= base;
-    }
-    else
-    {
-        exponent *= E(-1);
-        for(E e = 0; e < exponent; ++e)
-            r /= base;
-    }
-    return r;
-}
-
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, B base, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(E exponent) noexcept -> typename std::enable_if<std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    if(exponent >= 0)
-    {
-        for(E e = 0; e < exponent; ++e)
-            r *= base;
-    }
-    else
-    {
-        exponent *= E(-1);
-        for(E e = 0; e < exponent; ++e)
-            r /= base;
-    }
-    return r;
-}
-
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, class Base, Base base, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(E exponent) noexcept -> typename std::enable_if<std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    B bbase = B(base);
-    if(exponent >= 0)
-    {
-        for(E e = 0; e < exponent; ++e)
-            r *= bbase;
-    }
-    else
-    {
-        exponent *= E(-1);
-        for(E e = 0; e < exponent; ++e)
-            r /= bbase;
-    }
-    return r;
-}
-
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(B base, E exponent) noexcept -> typename std::enable_if<!std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    for(E e = 0; e < exponent; ++e)
-        r *= base;
-    return r;
-}
-
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, B base, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(E exponent) noexcept -> typename std::enable_if<!std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    for(E e = 0; e < exponent; ++e)
-        r *= base;
-    return r;
-}
-/** integer power; this function is constexpr-14 because of the local
- * variables */
-template<class B, class Base, Base base, class E>
-C4_CONSTEXPR14 C4_CONST auto ipow(E exponent) noexcept -> typename std::enable_if<!std::is_signed<E>::value, B>::type
-{
-    C4_STATIC_ASSERT(std::is_integral<E>::value);
-    B r = B(1);
-    B bbase = B(base);
-    for(E e = 0; e < exponent; ++e)
-        r *= bbase;
-    return r;
-}
-
-C4_SUPPRESS_WARNING_GCC_CLANG_POP
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-/** return a mask with all bits set [first_bit,last_bit[; this function
- * is constexpr-14 because of the local variables */
-template<class I>
-C4_CONSTEXPR14 I contiguous_mask(I first_bit, I last_bit)
-{
-    I r = 0;
-    for(I i = first_bit; i < last_bit; ++i)
-    {
-        r |= (I(1) << i);
-    }
-    return r;
-}
-
-
-namespace detail {
-
-template<class I, I val, I first, I last, bool finished>
-struct _ctgmsk11;
-
-template<class I, I val, I first, I last>
-struct _ctgmsk11< I, val, first, last, true>
-{
-    enum : I { value = _ctgmsk11<I, val|(I(1)<<first), first+I(1), last, (first+1!=last)>::value };
-};
-
-template<class I, I val, I first, I last>
-struct _ctgmsk11< I, val, first, last, false>
-{
-    enum : I { value = val };
-};
-
-} // namespace detail
-
-
-/** TMP version of contiguous_mask(); this needs to be implemented with template
- * meta-programming because C++11 cannot use a constexpr function with
- * local variables
- * @see contiguous_mask */
-template<class I, I first_bit, I last_bit>
-struct contiguous_mask11
-{
-    enum : I { value = detail::_ctgmsk11<I, I(0), first_bit, last_bit, (first_bit!=last_bit)>::value };
-};
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-/** use Empty Base Class Optimization to reduce the size of a pair of
- * potentially empty types*/
-
-namespace detail {
-typedef enum {
-    tpc_same,
-    tpc_same_empty,
-    tpc_both_empty,
-    tpc_first_empty,
-    tpc_second_empty,
-    tpc_general
-} TightPairCase_e;
-
-template<class First, class Second>
-constexpr TightPairCase_e tpc_which_case()
-{
-    return std::is_same<First, Second>::value ?
-               std::is_empty<First>::value ?
-                   tpc_same_empty
-                   :
-                   tpc_same
-               :
-               std::is_empty<First>::value && std::is_empty<Second>::value ?
-                   tpc_both_empty
-                   :
-                   std::is_empty<First>::value ?
-                       tpc_first_empty
-                       :
-                       std::is_empty<Second>::value ?
-                           tpc_second_empty
-                           :
-                           tpc_general
-           ;
-}
-
-template<class First, class Second, TightPairCase_e Case>
-struct tight_pair
-{
-private:
-
-    First m_first;
-    Second m_second;
-
-public:
-
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : m_first(), m_second() {}
-    tight_pair(First const& f, Second const& s) : m_first(f), m_second(s) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First       & first ()       { return m_first; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First  const& first () const { return m_first; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return m_second; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return m_second; }
-};
-
-template<class First, class Second>
-struct tight_pair<First, Second, tpc_same_empty> : public First
-{
-    static_assert(std::is_same<First, Second>::value, "bad implementation");
-
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : First() {}
-    tight_pair(First const& f, Second const& /*s*/) : First(f) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First      & first ()       { return static_cast<First      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First const& first () const { return static_cast<First const&>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return reinterpret_cast<Second      &>(*this); } // NOLINT
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return reinterpret_cast<Second const&>(*this); } // NOLINT
-};
-
-template<class First, class Second>
-struct tight_pair<First, Second, tpc_both_empty> : public First, public Second
-{
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : First(), Second() {}
-    tight_pair(First const& f, Second const& s) : First(f), Second(s) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First      & first ()       { return static_cast<First      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First const& first () const { return static_cast<First const&>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return static_cast<Second      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return static_cast<Second const&>(*this); }
-};
-
-template<class First, class Second>
-struct tight_pair<First, Second, tpc_same> : public First
-{
-    Second m_second;
-
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : First() {}
-    tight_pair(First const& f, Second const& s) : First(f), m_second(s) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First      & first ()       { return static_cast<First      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First const& first () const { return static_cast<First const&>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return m_second; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return m_second; }
-};
-
-template<class First, class Second>
-struct tight_pair<First, Second, tpc_first_empty> : public First
-{
-    Second m_second;
-
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : First(), m_second() {}
-    tight_pair(First const& f, Second const& s) : First(f), m_second(s) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First      & first ()       { return static_cast<First      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First const& first () const { return static_cast<First const&>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return m_second; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return m_second; }
-};
-
-template<class First, class Second>
-struct tight_pair<First, Second, tpc_second_empty> : public Second
-{
-    First m_first;
-
-    using first_type = First;
-    using second_type = Second;
-
-    tight_pair() : Second(), m_first() {}
-    tight_pair(First const& f, Second const& s) : Second(s), m_first(f) {}
-
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First      & first ()       { return m_first; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 First const& first () const { return m_first; }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second      & second()       { return static_cast<Second      &>(*this); }
-    C4_ALWAYS_INLINE C4_CONSTEXPR14 Second const& second() const { return static_cast<Second const&>(*this); }
-};
-
-} // namespace detail
-
-template<class First, class Second>
-using tight_pair = detail::tight_pair<First, Second, detail::tpc_which_case<First,Second>()>;
-
-C4_SUPPRESS_WARNING_GCC_CLANG_POP
-
-} // namespace c4
-
-// NOLINTEND(google-runtime-int)
-
-#endif /* _C4_MEMORY_UTIL_HPP_ */
@@ -1,46 +0,0 @@
-#ifndef _C4_PLATFORM_HPP_
-#define _C4_PLATFORM_HPP_
-
-/** @file platform.hpp Provides platform information macros
- * @ingroup basic_headers */
-
-// see also https://sourceforge.net/p/predef/wiki/OperatingSystems/
-
-#if defined(_WIN64)
-#   define C4_WIN
-#   define C4_WIN64
-#elif defined(_WIN32)
-#   define C4_WIN
-#   define C4_WIN32
-#elif defined(__ANDROID__)
-#   define C4_ANDROID
-#elif defined(__APPLE__)
-#   include "TargetConditionals.h"
-#   if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-#       define C4_IOS
-#   elif TARGET_OS_MAC || TARGET_OS_OSX
-#       define C4_MACOS
-#   else
-#       error "Unknown Apple platform"
-#   endif
-#elif defined(__linux__) || defined(__linux)
-#   define C4_UNIX
-#   define C4_LINUX
-#elif defined(__unix__) || defined(__unix)
-#   define C4_UNIX
-#elif defined(__arm__) || defined(__aarch64__)
-#   define C4_ARM
-#elif defined(__xtensa__) || defined(__XTENSA__)
-#   define C4_XTENSA
-#elif defined(SWIG)
-#   define C4_SWIG
-#else
-#   error "unknown platform"
-#endif
-
-#if defined(__posix) || defined(C4_UNIX) || defined(C4_LINUX)
-#   define C4_POSIX
-#endif
-
-
-#endif /* _C4_PLATFORM_HPP_ */
@@ -1,123 +0,0 @@
-#ifndef _C4_PREPROCESSOR_HPP_
-#define _C4_PREPROCESSOR_HPP_
-
-/** @file preprocessor.hpp Contains basic macros and preprocessor utilities.
- * @ingroup basic_headers */
-
-#ifdef __clang__
-    /* NOTE: using , ## __VA_ARGS__ to deal with zero-args calls to
-     * variadic macros is not portable, but works in clang, gcc, msvc, icc.
-     * clang requires switching off compiler warnings for pedantic mode.
-     * @see http://stackoverflow.com/questions/32047685/variadic-macro-without-arguments */
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments" // warning: token pasting of ',' and __VA_ARGS__ is a GNU extension
-#elif defined(__GNUC__)
-    /* GCC also issues a warning for zero-args calls to variadic macros.
-     * This warning is switched on with -pedantic and apparently there is no
-     * easy way to turn it off as with clang. But marking this as a system
-     * header works.
-     * @see https://gcc.gnu.org/onlinedocs/cpp/System-Headers.html
-     * @see http://stackoverflow.com/questions/35587137/ */
-#   pragma GCC system_header
-#endif
-
-#define C4_WIDEN(str) L"" str
-
-#define C4_COUNTOF(arr) (sizeof(arr)/sizeof((arr)[0]))
-
-#define C4_EXPAND(arg) arg
-
-/** useful in some macro calls with template arguments */
-#define C4_COMMA ,
-/** useful in some macro calls with template arguments
- * @see C4_COMMA */
-#define C4_COMMA_X C4_COMMA
-
-/** expand and quote */
-#define C4_XQUOTE(arg) _C4_XQUOTE(arg)
-#define _C4_XQUOTE(arg) C4_QUOTE(arg)
-#define C4_QUOTE(arg) #arg
-
-/** expand and concatenate */
-#define C4_XCAT(arg1, arg2) _C4_XCAT(arg1, arg2)
-#define _C4_XCAT(arg1, arg2) C4_CAT(arg1, arg2)
-#define C4_CAT(arg1, arg2) arg1##arg2
-
-#define C4_VERSION_CAT(major, minor, patch) ((major)*10000 + (minor)*100 + (patch))
-
-/** A preprocessor foreach. Spectacular trick taken from:
- * http://stackoverflow.com/a/1872506/5875572
- * The first argument is for a macro receiving a single argument,
- * which will be called with every subsequent argument. There is
- * currently a limit of 32 arguments, and at least 1 must be provided.
- *
-Example:
-@code{.cpp}
-struct Example {
-    int a;
-    int b;
-    int c;
-};
-// define a one-arg macro to be called
-#define PRN_STRUCT_OFFSETS(field) PRN_STRUCT_OFFSETS_(Example, field)
-#define PRN_STRUCT_OFFSETS_(structure, field) printf(C4_XQUOTE(structure) ":" C4_XQUOTE(field)" - offset=%zu\n", offsetof(structure, field));
-
-// now call the macro for a, b and c
-C4_FOR_EACH(PRN_STRUCT_OFFSETS, a, b, c);
-@endcode */
-#define C4_FOR_EACH(what, ...) C4_FOR_EACH_SEP(what, ;, __VA_ARGS__)
-
-/** same as C4_FOR_EACH(), but use a custom separator between statements.
- * If a comma is needed as the separator, use the C4_COMMA macro.
- * @see C4_FOR_EACH
- * @see C4_COMMA
- */
-#define C4_FOR_EACH_SEP(what, sep, ...) _C4_FOR_EACH_(_C4_FOR_EACH_NARG(__VA_ARGS__), what, sep, __VA_ARGS__)
-
-/// @cond dev
-
-#define _C4_FOR_EACH_01(what, sep, x) what(x) sep
-#define _C4_FOR_EACH_02(what, sep, x, ...) what(x) sep _C4_FOR_EACH_01(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_03(what, sep, x, ...) what(x) sep _C4_FOR_EACH_02(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_04(what, sep, x, ...) what(x) sep _C4_FOR_EACH_03(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_05(what, sep, x, ...) what(x) sep _C4_FOR_EACH_04(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_06(what, sep, x, ...) what(x) sep _C4_FOR_EACH_05(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_07(what, sep, x, ...) what(x) sep _C4_FOR_EACH_06(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_08(what, sep, x, ...) what(x) sep _C4_FOR_EACH_07(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_09(what, sep, x, ...) what(x) sep _C4_FOR_EACH_08(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_10(what, sep, x, ...) what(x) sep _C4_FOR_EACH_09(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_11(what, sep, x, ...) what(x) sep _C4_FOR_EACH_10(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_12(what, sep, x, ...) what(x) sep _C4_FOR_EACH_11(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_13(what, sep, x, ...) what(x) sep _C4_FOR_EACH_12(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_14(what, sep, x, ...) what(x) sep _C4_FOR_EACH_13(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_15(what, sep, x, ...) what(x) sep _C4_FOR_EACH_14(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_16(what, sep, x, ...) what(x) sep _C4_FOR_EACH_15(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_17(what, sep, x, ...) what(x) sep _C4_FOR_EACH_16(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_18(what, sep, x, ...) what(x) sep _C4_FOR_EACH_17(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_19(what, sep, x, ...) what(x) sep _C4_FOR_EACH_18(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_20(what, sep, x, ...) what(x) sep _C4_FOR_EACH_19(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_21(what, sep, x, ...) what(x) sep _C4_FOR_EACH_20(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_22(what, sep, x, ...) what(x) sep _C4_FOR_EACH_21(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_23(what, sep, x, ...) what(x) sep _C4_FOR_EACH_22(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_24(what, sep, x, ...) what(x) sep _C4_FOR_EACH_23(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_25(what, sep, x, ...) what(x) sep _C4_FOR_EACH_24(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_26(what, sep, x, ...) what(x) sep _C4_FOR_EACH_25(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_27(what, sep, x, ...) what(x) sep _C4_FOR_EACH_26(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_28(what, sep, x, ...) what(x) sep _C4_FOR_EACH_27(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_29(what, sep, x, ...) what(x) sep _C4_FOR_EACH_28(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_30(what, sep, x, ...) what(x) sep _C4_FOR_EACH_29(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_31(what, sep, x, ...) what(x) sep _C4_FOR_EACH_30(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_32(what, sep, x, ...) what(x) sep _C4_FOR_EACH_31(what, sep, __VA_ARGS__)
-#define _C4_FOR_EACH_NARG(...) _C4_FOR_EACH_NARG_(__VA_ARGS__, _C4_FOR_EACH_RSEQ_N())
-#define _C4_FOR_EACH_NARG_(...) _C4_FOR_EACH_ARG_N(__VA_ARGS__)
-#define _C4_FOR_EACH_ARG_N(_01, _02, _03, _04, _05, _06, _07, _08, _09, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, N, ...) N
-#define _C4_FOR_EACH_RSEQ_N() 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 09, 08, 07, 06, 05, 04, 03, 02, 01
-#define _C4_FOR_EACH_(N, what, sep, ...) C4_XCAT(_C4_FOR_EACH_, N)(what, sep, __VA_ARGS__)
-
-/// @endcond
-
-#ifdef __clang__
-#   pragma clang diagnostic pop
-#endif
-
-#endif /* _C4_PREPROCESSOR_HPP_ */
@@ -1,11 +0,0 @@
-#ifndef _C4_STD_STD_HPP_
-#define _C4_STD_STD_HPP_
-
-/** @file std.hpp includes all c4-std interop files */
-
-#include "c4/std/vector.hpp"
-#include "c4/std/string.hpp"
-#include "c4/std/string_view.hpp"
-#include "c4/std/tuple.hpp"
-
-#endif // _C4_STD_STD_HPP_
@@ -1,10 +0,0 @@
-#ifndef _C4_STD_STD_FWD_HPP_
-#define _C4_STD_STD_FWD_HPP_
-
-/** @file std_fwd.hpp includes all c4-std interop fwd files */
-
-#include "c4/std/vector_fwd.hpp"
-#include "c4/std/string_fwd.hpp"
-//#include "c4/std/tuple_fwd.hpp"
-
-#endif // _C4_STD_STD_FWD_HPP_
@@ -1,97 +0,0 @@
-#ifndef _C4_STD_STRING_HPP_
-#define _C4_STD_STRING_HPP_
-
-/** @file string.hpp */
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/substr.hpp"
-#endif
-
-#include <string>
-
-namespace c4 {
-
-//-----------------------------------------------------------------------------
-
-/** get a writeable view to an existing std::string.
- * When the string is empty, the returned view will be pointing
- * at the character with value '\0', but the size will be zero.
- * @see https://en.cppreference.com/w/cpp/string/basic_string/operator_at
- */
-C4_ALWAYS_INLINE c4::substr to_substr(std::string &s) noexcept
-{
-    #if C4_CPP < 11
-    #error this function will have undefined behavior
-    #endif
-    // since c++11 it is legal to call s[s.size()].
-    return c4::substr(&s[0], s.size()); // NOLINT(readability-container-data-pointer)
-}
-
-/** get a readonly view to an existing std::string.
- * When the string is empty, the returned view will be pointing
- * at the character with value '\0', but the size will be zero.
- * @see https://en.cppreference.com/w/cpp/string/basic_string/operator_at
- */
-C4_ALWAYS_INLINE c4::csubstr to_csubstr(std::string const& s) noexcept
-{
-    #if C4_CPP < 11
-    #error this function will have undefined behavior
-    #endif
-    // since c++11 it is legal to call s[s.size()].
-    return c4::csubstr(&s[0], s.size()); // NOLINT(readability-container-data-pointer)
-}
-
-//-----------------------------------------------------------------------------
-
-C4_ALWAYS_INLINE bool operator== (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) == 0; }
-C4_ALWAYS_INLINE bool operator!= (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) != 0; }
-C4_ALWAYS_INLINE bool operator>= (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) >= 0; }
-C4_ALWAYS_INLINE bool operator>  (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) >  0; }
-C4_ALWAYS_INLINE bool operator<= (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) <= 0; }
-C4_ALWAYS_INLINE bool operator<  (c4::csubstr ss, std::string const& s) { return ss.compare(to_csubstr(s)) <  0; }
-
-C4_ALWAYS_INLINE bool operator== (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) == 0; }
-C4_ALWAYS_INLINE bool operator!= (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) != 0; }
-C4_ALWAYS_INLINE bool operator>= (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) <= 0; }
-C4_ALWAYS_INLINE bool operator>  (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) <  0; }
-C4_ALWAYS_INLINE bool operator<= (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) >= 0; }
-C4_ALWAYS_INLINE bool operator<  (std::string const& s, c4::csubstr ss) { return ss.compare(to_csubstr(s)) >  0; }
-
-//-----------------------------------------------------------------------------
-
-/** copy an std::string to a writeable string view */
-inline size_t to_chars(c4::substr buf, std::string const& s)
-{
-    C4_ASSERT(!buf.overlaps(to_csubstr(s)));
-    size_t len = buf.len < s.size() ? buf.len : s.size();
-    // calling memcpy with null strings is undefined behavior
-    // and will wreak havoc in calling code's branches.
-    // see https://github.com/biojppm/rapidyaml/pull/264#issuecomment-1262133637
-    if(len)
-    {
-        C4_ASSERT(s.data() != nullptr);
-        C4_ASSERT(buf.str != nullptr);
-        memcpy(buf.str, s.data(), len);
-    }
-    return s.size(); // return the number of needed chars
-}
-
-/** copy a string view to an existing std::string */
-inline bool from_chars(c4::csubstr buf, std::string * s)
-{
-    s->resize(buf.len);
-    C4_ASSERT(!buf.overlaps(to_csubstr(*s)));
-    // calling memcpy with null strings is undefined behavior
-    // and will wreak havoc in calling code's branches.
-    // see https://github.com/biojppm/rapidyaml/pull/264#issuecomment-1262133637
-    if(buf.len)
-    {
-        C4_ASSERT(buf.str != nullptr);
-        memcpy(&(*s)[0], buf.str, buf.len); // NOLINT(readability-container-data-pointer)
-    }
-    return true;
-}
-
-} // namespace c4
-
-#endif // _C4_STD_STRING_HPP_
@@ -1,59 +0,0 @@
-#ifndef _C4_STD_STRING_FWD_HPP_
-#define _C4_STD_STRING_FWD_HPP_
-
-/** @file string_fwd.hpp */
-
-#ifndef DOXYGEN
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/substr_fwd.hpp"
-#endif
-
-#include <cstddef>
-
-// forward declarations for std::string
-#if defined(__GLIBCXX__) || defined(__GLIBCPP__)
-#include <bits/stringfwd.h>  // use the fwd header in glibcxx
-#elif defined(_LIBCPP_VERSION) || defined(__APPLE_CC__)
-#include <iosfwd>  // use the fwd header in stdlibc++
-#elif defined(_MSC_VER)
-#include "c4/error.hpp"
-//! @todo is there a fwd header in msvc?
-namespace std {
-C4_SUPPRESS_WARNING_MSVC_WITH_PUSH(4643) // Forward declaring 'char_traits' in namespace std is not permitted by the C++ Standard.
-template<typename> struct char_traits;
-template<typename> class allocator;
-template<typename _CharT, typename _Traits, typename _Alloc> class basic_string;
-using string = basic_string<char, char_traits<char>, allocator<char>>;
-C4_SUPPRESS_WARNING_MSVC_POP
-} /* namespace std */
-#else
-#error "unknown standard library"
-#endif
-
-namespace c4 {
-
-c4::substr to_substr(std::string &s) noexcept;
-c4::csubstr to_csubstr(std::string const& s) noexcept;
-
-bool operator== (c4::csubstr ss, std::string const& s);
-bool operator!= (c4::csubstr ss, std::string const& s);
-bool operator>= (c4::csubstr ss, std::string const& s);
-bool operator>  (c4::csubstr ss, std::string const& s);
-bool operator<= (c4::csubstr ss, std::string const& s);
-bool operator<  (c4::csubstr ss, std::string const& s);
-
-bool operator== (std::string const& s, c4::csubstr ss);
-bool operator!= (std::string const& s, c4::csubstr ss);
-bool operator>= (std::string const& s, c4::csubstr ss);
-bool operator>  (std::string const& s, c4::csubstr ss);
-bool operator<= (std::string const& s, c4::csubstr ss);
-bool operator<  (std::string const& s, c4::csubstr ss);
-
-size_t to_chars(c4::substr buf, std::string const& s);
-bool from_chars(c4::csubstr buf, std::string * s);
-
-} // namespace c4
-
-#endif // DOXYGEN
-#endif // _C4_STD_STRING_FWD_HPP_
@@ -1,71 +0,0 @@
-#ifndef _C4_STD_STRING_VIEW_HPP_
-#define _C4_STD_STRING_VIEW_HPP_
-
-/** @file string_view.hpp */
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/language.hpp"
-#endif
-
-#if (C4_CPP >= 17 && defined(__cpp_lib_string_view)) || defined(__DOXYGEN__)
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/substr.hpp"
-#endif
-
-#include <string_view>
-
-
-namespace c4 {
-
-//-----------------------------------------------------------------------------
-
-/** create a csubstr from an existing std::string_view. */
-C4_ALWAYS_INLINE c4::csubstr to_csubstr(std::string_view s) noexcept
-{
-    return c4::csubstr(s.data(), s.size());
-}
-
-
-//-----------------------------------------------------------------------------
-
-C4_ALWAYS_INLINE bool operator== (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) == 0; }
-C4_ALWAYS_INLINE bool operator!= (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) != 0; }
-C4_ALWAYS_INLINE bool operator>= (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) >= 0; }
-C4_ALWAYS_INLINE bool operator>  (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) >  0; }
-C4_ALWAYS_INLINE bool operator<= (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) <= 0; }
-C4_ALWAYS_INLINE bool operator<  (c4::csubstr ss, std::string_view s) { return ss.compare(s.data(), s.size()) <  0; }
-
-C4_ALWAYS_INLINE bool operator== (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) == 0; }
-C4_ALWAYS_INLINE bool operator!= (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) != 0; }
-C4_ALWAYS_INLINE bool operator<= (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) >= 0; }
-C4_ALWAYS_INLINE bool operator<  (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) >  0; }
-C4_ALWAYS_INLINE bool operator>= (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) <= 0; }
-C4_ALWAYS_INLINE bool operator>  (std::string_view s, c4::csubstr ss) { return ss.compare(s.data(), s.size()) <  0; }
-
-
-//-----------------------------------------------------------------------------
-
-/** copy an std::string_view to a writeable substr */
-inline size_t to_chars(c4::substr buf, std::string_view s)
-{
-    C4_ASSERT(!buf.overlaps(to_csubstr(s)));
-    size_t sz = s.size();
-    size_t len = buf.len < sz ? buf.len : sz;
-    // calling memcpy with null strings is undefined behavior
-    // and will wreak havoc in calling code's branches.
-    // see https://github.com/biojppm/rapidyaml/pull/264#issuecomment-1262133637
-    if(len)
-    {
-        C4_ASSERT(s.data() != nullptr);
-        C4_ASSERT(buf.str != nullptr);
-        memcpy(buf.str, s.data(), len);
-    }
-    return sz; // return the number of needed chars
-}
-
-} // namespace c4
-
-#endif // C4_STRING_VIEW_AVAILABLE
-
-#endif // _C4_STD_STRING_VIEW_HPP_
@@ -1,184 +0,0 @@
-#ifndef _C4_STD_TUPLE_HPP_
-#define _C4_STD_TUPLE_HPP_
-
-/** @file tuple.hpp */
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/format.hpp"
-#endif
-
-#include <tuple>
-
-/** this is a work in progress */
-#undef C4_TUPLE_TO_CHARS
-
-namespace c4 {
-
-#ifdef C4_TUPLE_TO_CHARS
-namespace detail {
-
-template< size_t Curr, class... Types >
-struct tuple_helper
-{
-    static size_t do_cat(substr buf, std::tuple< Types... > const& tp)
-    {
-        size_t num = to_chars(buf, std::get<Curr>(tp));
-        buf = buf.len >= num ? buf.sub(num) : substr{};
-        num += tuple_helper< Curr+1, Types... >::do_cat(buf, tp);
-        return num;
-    }
-
-    static size_t do_uncat(csubstr buf, std::tuple< Types... > & tp)
-    {
-        size_t num = from_str_trim(buf, &std::get<Curr>(tp));
-        if(num == csubstr::npos) return csubstr::npos;
-        buf = buf.len >= num ? buf.sub(num) : substr{};
-        num += tuple_helper< Curr+1, Types... >::do_uncat(buf, tp);
-        return num;
-    }
-
-    template< class Sep >
-    static size_t do_catsep_more(substr buf, Sep const& sep, std::tuple< Types... > const& tp)
-    {
-        size_t ret = to_chars(buf, sep), num = ret;
-        buf  = buf.len >= ret ? buf.sub(ret) : substr{};
-        ret  = to_chars(buf, std::get<Curr>(tp));
-        num += ret;
-        buf  = buf.len >= ret ? buf.sub(ret) : substr{};
-        ret  = tuple_helper< Curr+1, Types... >::do_catsep_more(buf, sep, tp);
-        num += ret;
-        return num;
-    }
-
-    template< class Sep >
-    static size_t do_uncatsep_more(csubstr buf, Sep & sep, std::tuple< Types... > & tp)
-    {
-        size_t ret = from_str_trim(buf, &sep), num = ret;
-        if(ret == csubstr::npos) return csubstr::npos;
-        buf  = buf.len >= ret ? buf.sub(ret) : substr{};
-        ret  = from_str_trim(buf, &std::get<Curr>(tp));
-        if(ret == csubstr::npos) return csubstr::npos;
-        num += ret;
-        buf  = buf.len >= ret ? buf.sub(ret) : substr{};
-        ret  = tuple_helper< Curr+1, Types... >::do_uncatsep_more(buf, sep, tp);
-        if(ret == csubstr::npos) return csubstr::npos;
-        num += ret;
-        return num;
-    }
-
-    static size_t do_format(substr buf, csubstr fmt, std::tuple< Types... > const& tp)
-    {
-        auto pos = fmt.find("{}");
-        if(pos != csubstr::npos)
-        {
-            size_t num = to_chars(buf, fmt.sub(0, pos));
-            size_t out = num;
-            buf  = buf.len >= num ? buf.sub(num) : substr{};
-            num  = to_chars(buf, std::get<Curr>(tp));
-            out += num;
-            buf  = buf.len >= num ? buf.sub(num) : substr{};
-            num  = tuple_helper< Curr+1, Types... >::do_format(buf, fmt.sub(pos + 2), tp);
-            out += num;
-            return out;
-        }
-        else
-        {
-            return format(buf, fmt);
-        }
-    }
-
-    static size_t do_unformat(csubstr buf, csubstr fmt, std::tuple< Types... > & tp)
-    {
-        auto pos = fmt.find("{}");
-        if(pos != csubstr::npos)
-        {
-            size_t num = pos;
-            size_t out = num;
-            buf  = buf.len >= num ? buf.sub(num) : substr{};
-            num  = from_str_trim(buf, &std::get<Curr>(tp));
-            out += num;
-            buf  = buf.len >= num ? buf.sub(num) : substr{};
-            num  = tuple_helper< Curr+1, Types... >::do_unformat(buf, fmt.sub(pos + 2), tp);
-            out += num;
-            return out;
-        }
-        else
-        {
-            return tuple_helper< sizeof...(Types), Types... >::do_unformat(buf, fmt, tp);
-        }
-    }
-
-};
-
-/** @todo VS compilation fails for this class */
-template< class... Types >
-struct tuple_helper< sizeof...(Types), Types... >
-{
-    static size_t do_cat(substr /*buf*/, std::tuple<Types...> const& /*tp*/) { return 0; }
-    static size_t do_uncat(csubstr /*buf*/, std::tuple<Types...> & /*tp*/) { return 0; }
-
-    template< class Sep > static size_t do_catsep_more(substr /*buf*/, Sep const& /*sep*/, std::tuple<Types...> const& /*tp*/) { return 0; }
-    template< class Sep > static size_t do_uncatsep_more(csubstr /*buf*/, Sep & /*sep*/, std::tuple<Types...> & /*tp*/) { return 0; }
-
-    static size_t do_format(substr buf, csubstr fmt, std::tuple<Types...> const& /*tp*/)
-    {
-        return to_chars(buf, fmt);
-    }
-
-    static size_t do_unformat(csubstr buf, csubstr fmt, std::tuple<Types...> const& /*tp*/)
-    {
-        return 0;
-    }
-};
-
-} // namespace detail
-
-template< class... Types >
-inline size_t cat(substr buf, std::tuple< Types... > const& tp)
-{
-    return detail::tuple_helper< 0, Types... >::do_cat(buf, tp);
-}
-
-template< class... Types >
-inline size_t uncat(csubstr buf, std::tuple< Types... > & tp)
-{
-    return detail::tuple_helper< 0, Types... >::do_uncat(buf, tp);
-}
-
-template< class Sep, class... Types >
-inline size_t catsep(substr buf, Sep const& sep, std::tuple< Types... > const& tp)
-{
-    size_t num = to_chars(buf, std::cref(std::get<0>(tp)));
-    buf  = buf.len >= num ? buf.sub(num) : substr{};
-    num += detail::tuple_helper< 1, Types... >::do_catsep_more(buf, sep, tp);
-    return num;
-}
-
-template< class Sep, class... Types >
-inline size_t uncatsep(csubstr buf, Sep & sep, std::tuple< Types... > & tp)
-{
-    size_t ret = from_str_trim(buf, &std::get<0>(tp)), num = ret;
-    if(ret == csubstr::npos) return csubstr::npos;
-    buf  = buf.len >= ret ? buf.sub(ret) : substr{};
-    ret  = detail::tuple_helper< 1, Types... >::do_uncatsep_more(buf, sep, tp);
-    if(ret == csubstr::npos) return csubstr::npos;
-    num += ret;
-    return num;
-}
-
-template< class... Types >
-inline size_t format(substr buf, csubstr fmt, std::tuple< Types... > const& tp)
-{
-    return detail::tuple_helper< 0, Types... >::do_format(buf, fmt, tp);
-}
-
-template< class... Types >
-inline size_t unformat(csubstr buf, csubstr fmt, std::tuple< Types... > & tp)
-{
-    return detail::tuple_helper< 0, Types... >::do_unformat(buf, fmt, tp);
-}
-#endif // C4_TUPLE_TO_CHARS
-
-} // namespace c4
-
-#endif /* _C4_STD_TUPLE_HPP_ */
@@ -1,88 +0,0 @@
-#ifndef _C4_STD_VECTOR_HPP_
-#define _C4_STD_VECTOR_HPP_
-
-/** @file vector.hpp provides conversion and comparison facilities
- * from/between std::vector<char> to c4::substr and c4::csubstr.
- * @todo add to_span() and friends
- */
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/substr.hpp"
-#endif
-
-#include <vector>
-
-namespace c4 {
-
-//-----------------------------------------------------------------------------
-
-/** get a substr (writeable string view) of an existing std::vector<char> */
-template<class Alloc>
-c4::substr to_substr(std::vector<char, Alloc> &vec)
-{
-    char *data = vec.empty() ? nullptr : vec.data(); // data() may or may not return a null pointer.
-    return c4::substr(data, vec.size());
-}
-
-/** get a csubstr (read-only string) view of an existing std::vector<char> */
-template<class Alloc>
-c4::csubstr to_csubstr(std::vector<char, Alloc> const& vec)
-{
-    const char *data = vec.empty() ? nullptr : vec.data(); // data() may or may not return a null pointer.
-    return c4::csubstr(data, vec.size());
-}
-
-//-----------------------------------------------------------------------------
-// comparisons between substrings and std::vector<char>
-
-template<class Alloc> C4_ALWAYS_INLINE bool operator!= (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss != to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator== (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss == to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator>= (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss >= to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator>  (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss >  to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator<= (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss <= to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator<  (c4::csubstr ss, std::vector<char, Alloc> const& s) { return ss <  to_csubstr(s); }
-
-template<class Alloc> C4_ALWAYS_INLINE bool operator!= (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss != to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator== (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss == to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator>= (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss <= to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator>  (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss <  to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator<= (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss >= to_csubstr(s); }
-template<class Alloc> C4_ALWAYS_INLINE bool operator<  (std::vector<char, Alloc> const& s, c4::csubstr ss) { return ss >  to_csubstr(s); }
-
-//-----------------------------------------------------------------------------
-
-/** copy a std::vector<char> to a writeable string view */
-template<class Alloc>
-inline size_t to_chars(c4::substr buf, std::vector<char, Alloc> const& s)
-{
-    C4_ASSERT(!buf.overlaps(to_csubstr(s)));
-    size_t len = buf.len < s.size() ? buf.len : s.size();
-    // calling memcpy with null strings is undefined behavior
-    // and will wreak havoc in calling code's branches.
-    // see https://github.com/biojppm/rapidyaml/pull/264#issuecomment-1262133637
-    if(len > 0)
-    {
-        memcpy(buf.str, s.data(), len);
-    }
-    return s.size(); // return the number of needed chars
-}
-
-/** copy a string view to an existing std::vector<char> */
-template<class Alloc>
-inline bool from_chars(c4::csubstr buf, std::vector<char, Alloc> * s)
-{
-    s->resize(buf.len);
-    C4_ASSERT(!buf.overlaps(to_csubstr(*s)));
-    // calling memcpy with null strings is undefined behavior
-    // and will wreak havoc in calling code's branches.
-    // see https://github.com/biojppm/rapidyaml/pull/264#issuecomment-1262133637
-    if(buf.len > 0)
-    {
-        memcpy(&(*s)[0], buf.str, buf.len); // NOLINT(readability-container-data-pointer)
-    }
-    return true;
-}
-
-} // namespace c4
-
-#endif // _C4_STD_VECTOR_HPP_
@@ -1,70 +0,0 @@
-#ifndef _C4_STD_VECTOR_FWD_HPP_
-#define _C4_STD_VECTOR_FWD_HPP_
-
-/** @file vector_fwd.hpp */
-
-#include <cstddef>
-
-// NOLINTBEGIN(cert-dcl58-cpp)
-
-// forward declarations for std::vector
-#if defined(__GLIBCXX__) || defined(__GLIBCPP__) || defined(_MSC_VER)
-#if defined(_MSC_VER)
-__pragma(warning(push))
-__pragma(warning(disable : 4643))
-#endif
-namespace std {
-template<typename> class allocator;
-#ifdef _GLIBCXX_DEBUG
-inline namespace __debug {
-template<typename T, typename Alloc> class vector;
-}
-#else
-template<typename T, typename Alloc> class vector;
-#endif
-} // namespace std
-#if defined(_MSC_VER)
-__pragma(warning(pop))
-#endif
-#elif defined(_LIBCPP_ABI_NAMESPACE)
-namespace std {
-inline namespace _LIBCPP_ABI_NAMESPACE {
-template<typename> class allocator;
-template<typename T, typename Alloc> class vector;
-} // namespace _LIBCPP_ABI_NAMESPACE
-} // namespace std
-#else
-#error "unknown standard library"
-#endif
-
-#ifndef C4CORE_SINGLE_HEADER
-#include "c4/substr_fwd.hpp"
-#endif
-
-namespace c4 {
-
-template<class Alloc> c4::substr to_substr(std::vector<char, Alloc> &vec);
-template<class Alloc> c4::csubstr to_csubstr(std::vector<char, Alloc> const& vec);
-
-template<class Alloc> bool operator!= (c4::csubstr ss, std::vector<char, Alloc> const& s);
-template<class Alloc> bool operator== (c4::csubstr ss, std::vector<char, Alloc> const& s);
-template<class Alloc> bool operator>= (c4::csubstr ss, std::vector<char, Alloc> const& s);
-template<class Alloc> bool operator>  (c4::csubstr ss, std::vector<char, Alloc> const& s);
-template<class Alloc> bool operator<= (c4::csubstr ss, std::vector<char, Alloc> const& s);
-template<class Alloc> bool operator<  (c4::csubstr ss, std::vector<char, Alloc> const& s);
-
-template<class Alloc> bool operator!= (std::vector<char, Alloc> const& s, c4::csubstr ss);
-template<class Alloc> bool operator== (std::vector<char, Alloc> const& s, c4::csubstr ss);
-template<class Alloc> bool operator>= (std::vector<char, Alloc> const& s, c4::csubstr ss);
-template<class Alloc> bool operator>  (std::vector<char, Alloc> const& s, c4::csubstr ss);
-template<class Alloc> bool operator<= (std::vector<char, Alloc> const& s, c4::csubstr ss);
-template<class Alloc> bool operator<  (std::vector<char, Alloc> const& s, c4::csubstr ss);
-
-template<class Alloc> size_t to_chars(c4::substr buf, std::vector<char, Alloc> const& s);
-template<class Alloc> bool from_chars(c4::csubstr buf, std::vector<char, Alloc> * s);
-
-} // namespace c4
-
-// NOLINTEND(cert-dcl58-cpp)
-
-#endif // _C4_STD_VECTOR_FWD_HPP_
@@ -1,16 +0,0 @@
-#ifndef _C4_SUBSTR_FWD_HPP_
-#define _C4_SUBSTR_FWD_HPP_
-
-#include "c4/export.hpp"
-
-namespace c4 {
-
-#ifndef DOXYGEN
-template<class C> struct basic_substring;
-using csubstr = C4CORE_EXPORT basic_substring<const char>;
-using substr = C4CORE_EXPORT basic_substring<char>;
-#endif // !DOXYGEN
-
-} // namespace c4
-
-#endif /* _C4_SUBSTR_FWD_HPP_ */
@@ -1,68 +0,0 @@
-#ifndef _C4_SZCONV_HPP_
-#define _C4_SZCONV_HPP_
-
-/** @file szconv.hpp utilities to deal safely with narrowing conversions */
-
-#include "c4/config.hpp"
-#include "c4/error.hpp"
-
-#include <limits>
-
-namespace c4 {
-
-C4_SUPPRESS_WARNING_GCC_CLANG_WITH_PUSH("-Wold-style-cast")
-
-/** @todo this would be so much easier with calls to numeric_limits::max()... */
-template<class SizeOut, class SizeIn>
-struct is_narrower_size : std::conditional
-<
-   (std::is_signed<SizeOut>::value == std::is_signed<SizeIn>::value)
-   ?
-   (sizeof(SizeOut) < sizeof(SizeIn))
-   :
-   (
-       (sizeof(SizeOut) < sizeof(SizeIn))
-       ||
-       (
-           (sizeof(SizeOut) == sizeof(SizeIn))
-           &&
-           (std::is_signed<SizeOut>::value && std::is_unsigned<SizeIn>::value)
-       )
-   ),
-   std::true_type,
-   std::false_type
->::type
-{
-    static_assert(std::is_integral<SizeIn >::value, "must be integral type");
-    static_assert(std::is_integral<SizeOut>::value, "must be integral type");
-};
-
-
-/** when SizeOut is wider than SizeIn, assignment can occur without reservations */
-template<class SizeOut, class SizeIn>
-C4_ALWAYS_INLINE
-typename std::enable_if< ! is_narrower_size<SizeOut, SizeIn>::value, SizeOut>::type
-szconv(SizeIn sz) noexcept
-{
-    return static_cast<SizeOut>(sz);
-}
-
-/** when SizeOut is narrower than SizeIn, narrowing will occur, so we check
- * for overflow. Note that this check is done only if C4_XASSERT is enabled.
- * @see C4_XASSERT */
-template<class SizeOut, class SizeIn>
-C4_ALWAYS_INLINE
-typename std::enable_if<is_narrower_size<SizeOut, SizeIn>::value, SizeOut>::type
-szconv(SizeIn sz)
-{
-    C4_XASSERT(sz >= 0);
-    C4_XASSERT_MSG((SizeIn)sz <= (SizeIn)std::numeric_limits<SizeOut>::max(), "size conversion overflow: in=%zu", (size_t)sz);
-    SizeOut szo = static_cast<SizeOut>(sz);
-    return szo;
-}
-
-C4_SUPPRESS_WARNING_GCC_CLANG_POP
-
-} // namespace c4
-
-#endif /* _C4_SZCONV_HPP_ */
@@ -1,507 +0,0 @@
-#ifndef _C4_TYPES_HPP_
-#define _C4_TYPES_HPP_
-
-#include <stdint.h>
-#include <stddef.h>
-#include <type_traits>
-
-#if __cplusplus >= 201103L
-#include <utility>  // for integer_sequence and friends
-#endif
-
-#include "c4/preprocessor.hpp"
-#include "c4/language.hpp"
-
-/** @file types.hpp basic types, and utility macros and traits for types.
- * @ingroup basic_headers */
-
-/** @defgroup types Type utilities */
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-
-namespace c4 {
-
-/** @defgroup intrinsic_types Intrinsic types
- * @ingroup types
- * @{ */
-
-using cbyte = const char; /**< a constant byte */
-using  byte =       char; /**< a mutable byte */
-
-using  i8 =   int8_t;
-using i16 =  int16_t;
-using i32 =  int32_t;
-using i64 =  int64_t;
-using  u8 =  uint8_t;
-using u16 = uint16_t;
-using u32 = uint32_t;
-using u64 = uint64_t;
-
-using f32 =  float;
-using f64 = double;
-
-using ssize_t = typename std::make_signed<size_t>::type;
-
-/** @} */
-
-//--------------------------------------------------
-
-/** @defgroup utility_types Utility types
- * @ingroup types
- * @{ */
-
-// some tag types
-
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#if __GNUC__ >= 6
-#pragma GCC diagnostic ignored "-Wunused-const-variable"
-#endif
-#endif
-
-/** a tag type for initializing the containers with variadic arguments a la
- * initializer_list, minus the initializer_list overload problems.
- */
-struct aggregate_t {};
-/** @see aggregate_t */
-constexpr const aggregate_t aggregate{};
-
-/** a tag type for specifying the initial capacity of allocatable contiguous storage */
-struct with_capacity_t {};
-/** @see with_capacity_t */
-constexpr const with_capacity_t with_capacity{};
-
-/** a tag type for disambiguating template parameter packs in variadic template overloads */
-struct varargs_t {};
-/** @see with_capacity_t */
-constexpr const varargs_t varargs{};
-
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-
-//--------------------------------------------------
-
-/** whether a value should be used in place of a const-reference in argument passing. */
-template<class T>
-struct cref_uses_val
-{
-    enum { value = (
-    std::is_scalar<T>::value
-    ||
-    (
-#if C4_CPP >= 20
-        (std::is_trivially_copyable<T>::value && std::is_standard_layout<T>::value)
-#else
-        std::is_pod<T>::value
-#endif
-        &&
-        sizeof(T) <= sizeof(size_t))) };
-};
-/** utility macro to override the default behaviour for c4::fastcref<T>
- @see fastcref */
-#define C4_CREF_USES_VAL(T) \
-template<>                  \
-struct cref_uses_val<T>     \
-{                           \
-    enum { value = true };  \
-};
-
-/** Whether to use pass-by-value or pass-by-const-reference in a function argument
- * or return type. */
-template<class T>
-using fastcref = typename std::conditional<c4::cref_uses_val<T>::value, T, T const&>::type;
-
-//--------------------------------------------------
-
-/** Just what its name says. Useful sometimes as a default empty policy class. */
-struct EmptyStruct // NOLINT
-{
-    template<class... T> EmptyStruct(T && ...){} // NOLINT
-};
-
-/** Just what its name says. Useful sometimes as a default policy class to
- * be inherited from. */
-struct EmptyStructVirtual // NOLINT
-{
-    virtual ~EmptyStructVirtual() = default;
-    template<class... T> EmptyStructVirtual(T && ...){} // NOLINT
-};
-
-
-/** */
-template<class T>
-struct inheritfrom : public T {};
-
-//--------------------------------------------------
-// Utilities to make a class obey size restrictions (eg, min size or size multiple of).
-// DirectX usually makes this restriction with uniform buffers.
-// This is also useful for padding to prevent false-sharing.
-
-/** how many bytes must be added to size such that the result is at least minsize? */
-C4_ALWAYS_INLINE constexpr size_t min_remainder(size_t size, size_t minsize) noexcept
-{
-    return size < minsize ? minsize-size : 0;
-}
-
-/** how many bytes must be added to size such that the result is a multiple of multipleof?  */
-C4_ALWAYS_INLINE constexpr size_t mult_remainder(size_t size, size_t multipleof) noexcept
-{
-    return (((size % multipleof) != 0) ? (multipleof-(size % multipleof)) : 0);
-}
-
-/* force the following class to be tightly packed. */
-#pragma pack(push, 1)
-/** pad a class with more bytes at the end.
- * @see http://stackoverflow.com/questions/21092415/force-c-structure-to-pack-tightly */
-template<class T, size_t BytesToPadAtEnd>
-struct Padded : public T
-{
-    using T::T;
-    using T::operator=;
-    Padded(T const& val) : T(val) {}
-    Padded(T && val) : T(std::forward<T>(val)) {} // NOLINT
-    char ___c4padspace___[BytesToPadAtEnd];
-};
-#pragma pack(pop)
-/** When the padding argument is 0, we cannot declare the char[] array. */
-template<class T>
-struct Padded<T, 0> : public T
-{
-    using T::T;
-    using T::operator=;
-    Padded(T const& val) : T(val) {}
-    Padded(T && val) : T(std::forward<T>(val)) {} // NOLINT
-};
-
-/** make T have a size which is at least Min bytes */
-template<class T, size_t Min>
-using MinSized = Padded<T, min_remainder(sizeof(T), Min)>;
-
-/** make T have a size which is a multiple of Mult bytes */
-template<class T, size_t Mult>
-using MultSized = Padded<T, mult_remainder(sizeof(T), Mult)>;
-
-/** make T have a size which is simultaneously:
- *  -bigger or equal than Min
- *  -a multiple of Mult */
-template<class T, size_t Min, size_t Mult>
-using MinMultSized = MultSized<MinSized<T, Min>, Mult>;
-
-/** make T be suitable for use as a uniform buffer. (at least with DirectX). */
-template<class T>
-using UbufSized = MinMultSized<T, 64, 16>;
-
-
-//-----------------------------------------------------------------------------
-
-#define C4_NO_COPY_CTOR(ty) ty(ty const&) = delete
-#define C4_NO_MOVE_CTOR(ty) ty(ty     &&) = delete
-#define C4_NO_COPY_ASSIGN(ty) ty& operator=(ty const&) = delete
-#define C4_NO_MOVE_ASSIGN(ty) ty& operator=(ty     &&) = delete
-#define C4_DEFAULT_COPY_CTOR(ty) ty(ty const&) noexcept = default
-#define C4_DEFAULT_MOVE_CTOR(ty) ty(ty     &&) noexcept = default
-#define C4_DEFAULT_COPY_ASSIGN(ty) ty& operator=(ty const&) noexcept = default
-#define C4_DEFAULT_MOVE_ASSIGN(ty) ty& operator=(ty     &&) noexcept = default
-
-#define C4_NO_COPY_OR_MOVE_CTOR(ty) \
-    C4_NO_COPY_CTOR(ty); \
-    C4_NO_MOVE_CTOR(ty)
-
-#define C4_NO_COPY_OR_MOVE_ASSIGN(ty) \
-    C4_NO_COPY_ASSIGN(ty); \
-    C4_NO_MOVE_ASSIGN(ty)
-
-#define C4_NO_COPY_OR_MOVE(ty) \
-    C4_NO_COPY_OR_MOVE_CTOR(ty); \
-    C4_NO_COPY_OR_MOVE_ASSIGN(ty)
-
-#define C4_DEFAULT_COPY_AND_MOVE_CTOR(ty) \
-    C4_DEFAULT_COPY_CTOR(ty); \
-    C4_DEFAULT_MOVE_CTOR(ty)
-
-#define C4_DEFAULT_COPY_AND_MOVE_ASSIGN(ty) \
-    C4_DEFAULT_COPY_ASSIGN(ty); \
-    C4_DEFAULT_MOVE_ASSIGN(ty)
-
-#define C4_DEFAULT_COPY_AND_MOVE(ty) \
-    C4_DEFAULT_COPY_AND_MOVE_CTOR(ty); \
-    C4_DEFAULT_COPY_AND_MOVE_ASSIGN(ty)
-
-/** @see https://en.cppreference.com/w/cpp/named_req/TriviallyCopyable */
-#define C4_MUST_BE_TRIVIAL_COPY(ty) \
-    static_assert(std::is_trivially_copyable<ty>::value, #ty " must be trivially copyable")
-
-/** @} */
-
-
-//-----------------------------------------------------------------------------
-
-/** @defgroup traits_types Type traits utilities
- * @ingroup types
- * @{ */
-
-// http://stackoverflow.com/questions/10821380/is-t-an-instance-of-a-template-in-c
-template<template<typename...> class X, typename    T> struct is_instance_of_tpl             : std::false_type {};
-template<template<typename...> class X, typename... Y> struct is_instance_of_tpl<X, X<Y...>> : std::true_type {};
-
-//-----------------------------------------------------------------------------
-
-/** SFINAE. use this macro to enable a template function overload
-based on a compile-time condition.
-@code
-// define an overload for a non-pod type
-template<class T, C4_REQUIRE_T(std::is_pod<T>::value)>
-void foo() { std::cout << "pod type\n"; }
-
-// define an overload for a non-pod type
-template<class T, C4_REQUIRE_T(!std::is_pod<T>::value)>
-void foo() { std::cout << "nonpod type\n"; }
-
-struct non_pod
-{
-    non_pod() : name("asdfkjhasdkjh") {}
-    const char *name;
-};
-
-int main()
-{
-    foo<float>(); // prints "pod type"
-    foo<non_pod>(); // prints "nonpod type"
-}
-@endcode */
-#define C4_REQUIRE_T(cond) typename std::enable_if<cond, bool>::type* = nullptr
-
-/** enable_if for a return type
- * @see C4_REQUIRE_T */
-#define C4_REQUIRE_R(cond, type_) typename std::enable_if<cond, type_>::type
-
-//-----------------------------------------------------------------------------
-/** define a traits class reporting whether a type provides a member typedef */
-#define C4_DEFINE_HAS_TYPEDEF(member_typedef)               \
-template<typename T>                                        \
-struct has_##stype                                          \
-{                                                           \
-private:                                                    \
-                                                            \
-    typedef char                      yes;                  \
-    typedef struct { char array[2]; } no;                   \
-                                                            \
-    template<typename C>                                    \
-    static yes _test(typename C::member_typedef*);          \
-                                                            \
-    template<typename C>                                    \
-    static no  _test(...);                                  \
-                                                            \
-public:                                                     \
-                                                            \
-    enum { value = (sizeof(_test<T>(0)) == sizeof(yes)) };  \
-                                                            \
-}
-
-
-/** @} */
-
-
-//-----------------------------------------------------------------------------
-
-
-/** @defgroup type_declarations Type declaration utilities
- * @ingroup types
- * @{ */
-
-#define _c4_DEFINE_ARRAY_TYPES_WITHOUT_ITERATOR(T, I)           \
-                                                                \
-    using size_type = I;                                        \
-    using ssize_type = typename std::make_signed<I>::type;      \
-    using difference_type = typename std::make_signed<I>::type; \
-                                                                \
-    using value_type = T;                                       \
-    using pointer = T*;                                         \
-    using const_pointer = T const*;                             \
-    using reference = T&;                                       \
-    using const_reference = T const&
-
-#define _c4_DEFINE_TUPLE_ARRAY_TYPES_WITHOUT_ITERATOR(interior_types, I) \
-                                                                        \
-    using size_type = I;                                                \
-    using ssize_type = typename std::make_signed<I>::type;              \
-    using difference_type = typename std::make_signed<I>::type;         \
-                                                                        \
-    template<I n> using value_type = typename std::tuple_element< n, std::tuple<interior_types...>>::type; \
-    template<I n> using pointer = value_type<n>*;                       \
-    template<I n> using const_pointer = value_type<n> const*;           \
-    template<I n> using reference = value_type<n>&;                     \
-    template<I n> using const_reference = value_type<n> const&
-
-
-#define _c4_DEFINE_ARRAY_TYPES(T, I)                                \
-                                                                    \
-    _c4_DEFINE_ARRAY_TYPES_WITHOUT_ITERATOR(T, I);                  \
-                                                                    \
-    using iterator = T*;                                            \
-    using const_iterator = T const*;                                \
-    using reverse_iterator = std::reverse_iterator<T*>;             \
-    using const_reverse_iterator = std::reverse_iterator<T const*>
-
-
-#define _c4_DEFINE_TUPLE_ARRAY_TYPES(interior_types, I)                 \
-                                                                        \
-    _c4_DEFINE_TUPLE_ARRAY_TYPES_WITHOUT_ITERATOR(interior_types, I);   \
-                                                                        \
-    template<I n> using iterator = value_type<n>*;                      \
-    template<I n> using const_iterator = value_type<n> const*;          \
-    template<I n> using reverse_iterator = std::reverse_iterator< value_type<n>*>; \
-    template<I n> using const_reverse_iterator = std::reverse_iterator< value_type<n> const*>
-
-
-
-/** @} */
-
-
-//-----------------------------------------------------------------------------
-
-
-/** @defgroup compatility_utilities Backport implementation of some Modern C++ utilities
- * @ingroup types
- * @{ */
-
-//-----------------------------------------------------------------------------
-// index_sequence and friends are available only for C++14 and later.
-// A C++11 implementation is provided here.
-// This implementation was copied over from clang.
-// see http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687
-
-#if __cplusplus > 201103L
-
-using std::integer_sequence;
-using std::index_sequence;
-using std::make_integer_sequence;
-using std::make_index_sequence;
-using std::index_sequence_for;
-
-#else
-
-/** C++11 implementation of integer sequence
- * @see https://en.cppreference.com/w/cpp/utility/integer_sequence
- * @see taken from clang: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687 */
-template<class _Tp, _Tp... _Ip>
-struct integer_sequence
-{
-    static_assert(std::is_integral<_Tp>::value,
-                  "std::integer_sequence can only be instantiated with an integral type" );
-    using value_type = _Tp;
-    static constexpr size_t size() noexcept { return sizeof...(_Ip); }
-};
-
-/** C++11 implementation of index sequence
- * @see https://en.cppreference.com/w/cpp/utility/integer_sequence
- * @see taken from clang: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687 */
-template<size_t... _Ip>
-using index_sequence = integer_sequence<size_t, _Ip...>;
-
-/** @cond DONT_DOCUMENT_THIS */
-namespace __detail {
-
-template<typename _Tp, size_t ..._Extra>
-struct __repeat;
-
-template<typename _Tp, _Tp ..._Np, size_t ..._Extra>
-struct __repeat<integer_sequence<_Tp, _Np...>, _Extra...>
-{
-    using type = integer_sequence<_Tp,
-                            _Np...,
-                            sizeof...(_Np) + _Np...,
-                            2 * sizeof...(_Np) + _Np...,
-                            3 * sizeof...(_Np) + _Np...,
-                            4 * sizeof...(_Np) + _Np...,
-                            5 * sizeof...(_Np) + _Np...,
-                            6 * sizeof...(_Np) + _Np...,
-                            7 * sizeof...(_Np) + _Np...,
-                            _Extra...>;
-};
-
-template<size_t _Np> struct __parity;
-template<size_t _Np> struct __make : __parity<_Np % 8>::template __pmake<_Np> {};
-
-template<> struct __make<0> { using type = integer_sequence<size_t>; };
-template<> struct __make<1> { using type = integer_sequence<size_t, 0>; };
-template<> struct __make<2> { using type = integer_sequence<size_t, 0, 1>; };
-template<> struct __make<3> { using type = integer_sequence<size_t, 0, 1, 2>; };
-template<> struct __make<4> { using type = integer_sequence<size_t, 0, 1, 2, 3>; };
-template<> struct __make<5> { using type = integer_sequence<size_t, 0, 1, 2, 3, 4>; };
-template<> struct __make<6> { using type = integer_sequence<size_t, 0, 1, 2, 3, 4, 5>; };
-template<> struct __make<7> { using type = integer_sequence<size_t, 0, 1, 2, 3, 4, 5, 6>; };
-
-template<> struct __parity<0> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type> {}; };
-template<> struct __parity<1> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 1> {}; };
-template<> struct __parity<2> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<3> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<4> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<5> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<6> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 7, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-
-template<typename _Tp, typename _Up>
-struct __convert
-{
-    template<typename> struct __result;
-    template<_Tp ..._Np> struct __result<integer_sequence<_Tp, _Np...>>
-    {
-        using type = integer_sequence<_Up, _Np...>;
-    };
-};
-
-template<typename _Tp>
-struct __convert<_Tp, _Tp>
-{
-    template<typename _Up> struct __result
-    {
-         using type = _Up;
-    };
-};
-
-template<typename _Tp, _Tp _Np>
-using __make_integer_sequence_unchecked = typename __detail::__convert<size_t, _Tp>::template __result<typename __detail::__make<_Np>::type>::type;
-
-template<class _Tp, _Tp _Ep>
-struct __make_integer_sequence
-{
-    static_assert(std::is_integral<_Tp>::value,
-                  "std::make_integer_sequence can only be instantiated with an integral type" );
-    static_assert(0 <= _Ep, "std::make_integer_sequence input shall not be negative");
-    typedef __make_integer_sequence_unchecked<_Tp, _Ep> type;
-};
-
-} // namespace __detail
-/** @endcond */
-
-
-/** C++11 implementation of index sequence
- * @see https://en.cppreference.com/w/cpp/utility/integer_sequence
- * @see taken from clang: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687 */
-template<class _Tp, _Tp _Np>
-using make_integer_sequence = typename __detail::__make_integer_sequence<_Tp, _Np>::type;
-
-/** C++11 implementation of index sequence
- * @see https://en.cppreference.com/w/cpp/utility/integer_sequence
- * @see taken from clang: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687 */
-template<size_t _Np>
-using make_index_sequence = make_integer_sequence<size_t, _Np>;
-
-/** C++11 implementation of index sequence
- * @see https://en.cppreference.com/w/cpp/utility/integer_sequence
- * @see taken from clang: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?revision=211563&view=markup#l687 */
-template<class... _Tp>
-using index_sequence_for = make_index_sequence<sizeof...(_Tp)>;
-#endif
-
-/** @} */
-
-
-} // namespace c4
-
-// NOLINTEND(bugprone-macro-parentheses)
-
-#endif /* _C4_TYPES_HPP_ */
@@ -1,73 +0,0 @@
-#ifndef C4_UTF_HPP_
-#define C4_UTF_HPP_
-
-#include "c4/language.hpp"
-#include "c4/substr_fwd.hpp"
-#include <stddef.h>
-#include <stdint.h>
-
-/** @file utf.hpp utilities for UTF and Byte Order Mark */
-
-namespace c4 {
-
-/** @defgroup doc_utf UTF utilities
- * @{ */
-
-
-/** skip the Byte Order Mark, or get the full string if there is Byte Order Mark.
- * @see Implements the Byte Order Marks as described in https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding */
-C4CORE_EXPORT substr skip_bom(substr s);
-/** skip the Byte Order Mark, or get the full string if there is Byte Order Mark
- * @see Implements the Byte Order Marks as described in https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding */
-C4CORE_EXPORT csubstr skip_bom(csubstr s);
-
-
-/** get the Byte Order Mark, or an empty string if there is no Byte Order Mark
- * @see Implements the Byte Order Marks as described in https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding */
-C4CORE_EXPORT substr get_bom(substr s);
-/** get the Byte Order Mark, or an empty string if there is no Byte Order Mark
- * @see Implements the Byte Order Marks as described in https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding */
-C4CORE_EXPORT csubstr get_bom(csubstr s);
-
-
-/** return the position of the first character not belonging to the
- * Byte Order Mark, or 0 if there is no Byte Order Mark.
- * @see Implements the Byte Order Marks as described in https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding */
-C4CORE_EXPORT size_t first_non_bom(csubstr s);
-
-
-/** decode the given @p code_point, writing into the output string in
- * @p out.
- *
- * @param out the output string. must have at least 4 bytes (this is
- * asserted), and must not have a null string.
- *
- * @param code_point: must have length in ]0,8], and must not begin
- * with any of `U+`,`\\x`,`\\u,`\\U`,`0` (asserted)
- *
- * @return the part of @p out that was written, which will always be
- * at most 4 bytes.
- */
-C4CORE_EXPORT substr decode_code_point(substr out, csubstr code_point);
-
-/** decode the given @p code point, writing into the output string @p
- * buf, of size @p buflen
- *
- * @param buf the output string. must have at least 4 bytes (this is
- * asserted), and must not be null
- *
- * @param buflen the length of the output string. must be at least 4
- *
- * @param code: the code point must have length in ]0,8], and must not begin
- * with any of `U+`,`\\x`,`\\u,`\\U`,`0` (asserted)
- *
- * @return the number of written characters, which will always be
- * at most 4 bytes.
- */
-C4CORE_EXPORT size_t decode_code_point(uint8_t *C4_RESTRICT buf, size_t buflen, uint32_t code);
-
-/** @} */
-
-} // namespace c4
-
-#endif // C4_UTF_HPP_
@@ -1,10 +0,0 @@
-#ifndef _C4_WINDOWS_HPP_
-#define _C4_WINDOWS_HPP_
-
-#if defined(_WIN64) || defined(_WIN32)
-#include "c4/windows_push.hpp"
-#include <windows.h>
-#include "c4/windows_pop.hpp"
-#endif
-
-#endif /* _C4_WINDOWS_HPP_ */
--- a/Show More
+++ b/Show More