proof of concept: control crackin'dj with traktor S4

2026-11-09 01:59:49 -10:00 · 2024-09-24 09:53:20 +02:00
1012 changed files with 74633 additions and 223213 deletions
@@ -12,7 +12,7 @@ assignees: ''

 Platform / OS / Hardware: 

-Flycast version: 
+Github hash: 

 Hardware: 

@@ -1,48 +1,39 @@
-name: Android
+name: Android CI

-on:
-  push:
-    branches-ignore:
-      - 'l10n_**'
-  pull_request:
+on: [push, pull_request]

 jobs:
  build:
-    name: Android
    runs-on: ubuntu-latest

-    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
-
    steps:
      - name: Set up build environment
        run: |
          sudo apt-get update
-          sudo apt-get -y install ccache libcurl4-openssl-dev
+          sudo apt-get -y install ccache libcurl4-openssl-dev ninja-build

-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
          submodules: recursive
-
-      - uses: actions/setup-java@v5
+          
+      - uses: actions/setup-java@v4
        with:
          java-version: '17'
          distribution: 'temurin'
          cache: 'gradle'

-      - uses: actions/cache@v6
+      - uses: actions/cache@v4
        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ccache-android-${{ github.sha }}
-          restore-keys: ccache-android-
-
-      - name: Disable release signing
-        run: sed -i 's/signingConfigs.getByName("release")/signingConfigs.getByName("debug")/' shell/android-studio/flycast/build.gradle.kts
-        if: github.repository != 'flyinghead/flycast' || github.event_name != 'push'
+          path: ~/.ccache
+          key: android-ccache-${{ github.sha }}
+          restore-keys: android-ccache-

      - name: Bump version code
-        run: sed -i 's/versionCode = 8/versionCode = ${{ github.run_number }}/' shell/android-studio/flycast/build.gradle.kts
+        uses: chkfung/[email protected]
+        with:
+          gradlePath: shell/android-studio/flycast/build.gradle 
+          versionCode: ${{ github.run_number }}

      - name: Gradle
        working-directory: shell/android-studio
@@ -51,7 +42,7 @@ jobs:
          SENTRY_UPLOAD_URL: ${{ secrets.SENTRY_UPLOAD_URL }}
          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v4
        with:
          name: flycast-release.apk
          path: shell/android-studio/flycast/build/outputs/apk/release/flycast-release.apk
@@ -74,19 +65,33 @@ jobs:
            mv libflycast.so.sym symbols/libflycast.so/$BUILD_ID
          done

-      - name: Setup Rclone
-        uses: AnimMouse/setup-rclone@v1
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v4
        with:
-          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'

      - name: Upload to S3
        run: |
          cp shell/android-studio/flycast/build/outputs/bundle/release/*.aab shell/android-studio/flycast/build/outputs/apk/release/
-          rclone copy shell/android-studio/flycast/build/outputs/apk/release scaleway:flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --exclude '*.json'
-        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'
-
-      - uses: getsentry/action-setup-cli@v1
+          aws s3 sync shell/android-studio/flycast/build/outputs/apk/release s3://flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --exclude='*.json' --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}

+      - name: Setup Sentry CLI
+        uses: mathieu-bour/setup-sentry-cli@v2
+        env:
+          SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
+        with:
+          url: https://sentry.io
+          token: ${{ env.SENTRY_TOKEN }}
+          organization: flycast
+          project: minidump
+          version: 2.21.2
+        if: ${{ env.SENTRY_TOKEN != '' }}
+      
      - name: Upload symbols to Sentry
        run: |
          VERSION=$(git describe --tags --always)
@@ -95,7 +100,5 @@ jobs:
          sentry-cli debug-files upload symbols
        shell: bash
        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-          SENTRY_ORG: flycast
-          SENTRY_PROJECT: minidump
-        if: ${{ env.SENTRY_AUTH_TOKEN != '' && github.event_name == 'push' }}
+          SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
+        if: ${{ env.SENTRY_TOKEN != '' }}
@@ -1,10 +1,6 @@
-name: BSD
+name: BSD CI

-on:
-  push:
-    branches-ignore:
-      - 'l10n_**'
-  pull_request:
+on: [push, pull_request]

 jobs:
  build:
@@ -15,46 +11,38 @@ jobs:
      matrix:
        operating_system: [ freebsd, netbsd, openbsd ]
        architecture: [ arm64, x86-64 ]
-        libretro: [ OFF, ON ]
        include:
          - operating_system: freebsd
-            version: '15.1'
-            pkginstall: sudo pkg upgrade -y && sudo pkg install -y alsa-lib ccache cmake evdev-proto git libao libcdio libevdev libudev-devd libzip lua54 miniupnpc ninja pkgconf pulseaudio sdl2
+            version: '14.1'
+            pkginstall: sudo pkg install -y alsa-lib ccache cmake evdev-proto git libao libevdev libudev-devd libzip lua54 miniupnpc ninja pkgconf pulseaudio sdl2
          - operating_system: netbsd
-            version: '11.0'
-            pkginstall: sudo pkgin update && sudo pkgin -y install alsa-lib ccache clang cmake git libao libcdio libusb1 libzip lua54 miniupnpc ninja-build pkgconf pulseaudio SDL2
+            version: '10.0'
+            pkginstall: sudo pkgin update && sudo pkgin -y install alsa-lib ccache cmake gcc12 git libao libzip lua54 miniupnpc ninja-build pkgconf pulseaudio SDL2 && export PATH=/usr/pkg/gcc12/bin:$PATH
          - operating_system: openbsd
-            version: '8.0'
-            pkginstall: sudo pkg_add -u && sudo pkg_add ccache cmake git libao libcdio libusb1-1.0.30 libzip lua-5.4.8p2 miniupnpc ninja pulseaudio sdl2
+            version: '7.5'
+            pkginstall: sudo pkg_add ccache cmake git libao libzip miniupnpc ninja pkgconf pulseaudio sdl2
        exclude:
          - architecture: arm64

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          submodules: recursive
+          submodules: true

-      - uses: actions/cache@v6
+      - uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}-${{ matrix.libretro }}-${{ github.sha }}
-          restore-keys: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}-${{ matrix.libretro }}-
+          key: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}-${{ github.sha }}
+          restore-keys: ccache-${{ matrix.operating_system }}-${{ matrix.architecture }}-

-      - name: Start VM
-        uses: cross-platform-actions/action@v1
+      - uses: cross-platform-actions/[email protected]
        with:
          operating_system: ${{ matrix.operating_system }}
          architecture: ${{ matrix.architecture }}
          version: ${{ matrix.version }}
          environment_variables: CCACHE_DIR
-
-      - name: Set up build environment
-        run: ${{ matrix.pkginstall }}
-        shell: cpa.sh {0}
-
-      - name: CMake
-        run: |
-          cmake -B build -DUSE_LIBCDIO=ON -DCMAKE_BUILD_TYPE=Release -G Ninja -DLIBRETRO=${{ matrix.libretro }}
-          cmake --build build --config Release
-        shell: cpa.sh {0}
+          run: |
+            ${{ matrix.pkginstall }}
+            cmake -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
+            cmake --build build --config Release
@@ -1,10 +1,6 @@
-name: Linux, macOS, Windows
+name: C/C++ CI

-on:
-  push:
-    branches-ignore:
-      - 'l10n_**'
-  pull_request:
+on: [push, pull_request]

 jobs:
  build:
@@ -21,14 +17,14 @@ jobs:
    strategy:
      matrix:
        config:
-          - { name: i686-pc-windows-msvc, os: windows-2022, shell: cmd, arch: x86, cmakeArgs: -G Ninja, buildType: Release }
-          - { name: apple-darwin, os: macos-latest, shell: sh, cmakeArgs: -G Xcode -DUSE_DISCORD=ON -DMOLTENVK_DYLIB=$MOLTENVK_DYLIB, destDir: osx, buildType: RelWithDebInfo, packagePath: artifact/flycast-apple-darwin.zip }
-          - { name: x86_64-pc-linux-gnu, os: ubuntu-22.04, shell: sh, cmakeArgs: -G Ninja -DUSE_DISCORD=ON -DUSE_LIBCDIO=ON, destDir: linux, buildType: RelWithDebInfo }
-          - { name: arm64-pc-linux-gnu, os: ubuntu-22.04-arm, shell: sh, cmakeArgs: -G Ninja -DUSE_DISCORD=ON -DUSE_LIBCDIO=ON, destDir: linux, buildType: RelWithDebInfo }
-          - { name: x86_64-pc-windows-msvc, os: windows-2022, shell: cmd, arch: x64, cmakeArgs: -G Ninja -DUSE_DISCORD=ON, buildType: Release }
-          - { name: x86_64-w64-mingw32, os: windows-2022, shell: 'msys2 {0}', cmakeArgs: -G Ninja -DUSE_DISCORD=ON -DUSE_LIBCDIO=ON, destDir: win, buildType: RelWithDebInfo, packagePath: artifact/flycast-x86_64-w64-mingw32.zip }
-          - { name: libretro-x86_64-pc-linux-gnu, os: ubuntu-22.04, shell: sh, cmakeArgs: -DLIBRETRO=ON -DUSE_LIBCDIO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -G Ninja, buildType: Release }
-          - { name: libretro-x86_64-w64-mingw32, os: windows-2022, shell: 'msys2 {0}', cmakeArgs: -DLIBRETRO=ON -DUSE_LIBCDIO=ON -G Ninja, buildType: Release }
+          - {name: i686-pc-windows-msvc, os: windows-latest, shell: cmd, arch: x86, cmakeArgs: -G Ninja, buildType: Release}
+          - {name: apple-darwin, os: macos-latest, shell: sh, cmakeArgs: -G Xcode -DUSE_DISCORD=ON, destDir: osx, buildType: RelWithDebInfo}
+          - {name: apple-ios, os: macos-latest, shell: sh, cmakeArgs: -DCMAKE_SYSTEM_NAME=iOS -G Xcode, destDir: ios, buildType: Release}
+          - {name: x86_64-pc-linux-gnu, os: ubuntu-20.04, shell: sh, cmakeArgs: -G Ninja -DUSE_DISCORD=ON, destDir: linux, buildType: RelWithDebInfo}
+          - {name: x86_64-pc-windows-msvc, os: windows-latest, shell: cmd, arch: x64, cmakeArgs: -G Ninja -DUSE_DISCORD=ON, buildType: Release}
+          - {name: x86_64-w64-mingw32, os: windows-latest, shell: 'msys2 {0}', cmakeArgs: -G Ninja -DUSE_DISCORD=ON, destDir: win, buildType: RelWithDebInfo}
+          - {name: libretro-x86_64-pc-linux-gnu, os: ubuntu-latest, shell: sh, cmakeArgs: -DLIBRETRO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -G Ninja, buildType: Release}
+          - {name: libretro-x86_64-w64-mingw32, os: windows-latest, shell: 'msys2 {0}', cmakeArgs: -DLIBRETRO=ON -G Ninja, buildType: Release}

    steps:
      - name: Set up build environment (macOS)
@@ -36,43 +32,33 @@ jobs:
          # Unlink and re-link to prevent errors when github mac runner images install python outside of brew. See https://github.com/actions/setup-python/issues/577
          brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
          brew update || :
-          brew install libao ldid pulseaudio
-
-          moltenvk_tag="v1.4.2"
-          moltenvk_root="$RUNNER_TEMP/MoltenVK-$moltenvk_tag"
-          rm -rf "$moltenvk_root"
-          mkdir -p "$moltenvk_root"
-          aria2c "https://github.com/KhronosGroup/MoltenVK/releases/download/$moltenvk_tag/MoltenVK-macos.tar" -d "$RUNNER_TEMP" -o "MoltenVK-macos-$moltenvk_tag.tar"
-          tar -xf "$RUNNER_TEMP/MoltenVK-macos-$moltenvk_tag.tar" -C "$moltenvk_root"
-          moltenvk_dylib="$(find "$moltenvk_root" -type f -path '*/macOS/*' -name libMoltenVK.dylib | head -n 1)"
-          if [ -z "$moltenvk_dylib" ]; then
-            echo "MoltenVK $moltenvk_tag was downloaded, but macOS libMoltenVK.dylib was not found." >&2
-            exit 1
-          fi
-          echo "MOLTENVK_DYLIB=$moltenvk_dylib" >> $GITHUB_ENV
+          brew install libao ldid ninja pulseaudio
+          brew uninstall --ignore-dependencies zstd
+          VULKAN_VER=1.3.261.1 && aria2c https://sdk.lunarg.com/sdk/download/$VULKAN_VER/mac/vulkansdk-macos-$VULKAN_VER.dmg
+          hdiutil attach ./vulkansdk-macos-*.dmg -mountpoint /Volumes/VulkanSDK
+          sudo /Volumes/VulkanSDK/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install
+          hdiutil detach /Volumes/VulkanSDK
+          echo "VULKAN_SDK=$HOME/VulkanSDK/macOS" >> $GITHUB_ENV
        if: runner.os == 'macOS'

      - name: Set up build environment (Linux)
        run: |
          sudo add-apt-repository ppa:christianrauch/libdecoration
          sudo apt-get update
-          sudo apt-get -y install ccache libao-dev libasound2-dev libevdev-dev libgl1-mesa-dev liblua5.3-dev libminiupnpc-dev libpulse-dev libsdl2-dev libudev-dev libzip-dev libcurl4-openssl-dev libcdio-dev libfuse2 locales
+          sudo apt-get -y install ccache libao-dev libasound2-dev libevdev-dev libgl1-mesa-dev liblua5.3-dev libminiupnpc-dev libpulse-dev libsdl2-dev libudev-dev libzip-dev ninja-build libcurl4-openssl-dev
          sudo apt-get -y install libwayland-dev libdecor-0-dev libaudio-dev libjack-dev libsndio-dev libsamplerate0-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
-          sudo sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
-          sudo locale-gen
        if: runner.os == 'Linux'

      - name: Set up build environment (Windows, MinGW)
        uses: msys2/setup-msys2@v2
        with:
          msystem: MINGW64
-          install: git make
-          pacboy: ccache:p cmake:p libcdio:p lua:p ninja:p SDL2:p toolchain:p
+          install: git make mingw-w64-x86_64-ccache mingw-w64-x86_64-cmake mingw-w64-x86_64-lua mingw-w64-x86_64-ninja mingw-w64-x86_64-SDL2 mingw-w64-x86_64-toolchain
        if: matrix.config.shell == 'msys2 {0}'

      - name: Set up build environment (Windows, Visual Studio)
        run: |
-          choco install ccache directx-sdk
+          choco install ccache directx-sdk ninja
          echo DXSDK_DIR=C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)>> %GITHUB_ENV%
        if: matrix.config.shell == 'cmd'

@@ -81,36 +67,20 @@ jobs:
          arch: ${{ matrix.config.arch }}
        if: matrix.config.shell == 'cmd'

-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
          submodules: recursive

-      - name: Compile universal dependencies (macOS)
-        run: |
-          for formula in ./shell/apple/libpng-flycast.rb; do
-            libname=$(basename "$formula" .rb)
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_DEVELOPER=1 brew install --build-from-source --formula "$formula" || \
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_DEVELOPER=1 brew reinstall --build-from-source --formula "$formula"
-
-            prefix=$(brew --prefix $libname)
-            # Find and verify the static library
-            libfile=$(find "$prefix/lib" -name "*.a" | head -n1)
-            lipo -info "$libfile"
-
-            # Export prefix for subsequent CMake steps
-            if [ -z "$CMAKE_PREFIX_PATH" ]; then
-              CMAKE_PREFIX_PATH="$prefix"
-            else
-              CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$prefix"
-            fi
-          done
-          echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-          # After the last brew download: brew's own curl links brew's zstd
-          brew uninstall --ignore-dependencies zstd
+      - name: Compile a universal OpenMP (macOS)
+        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew reinstall --build-from-source --formula ./shell/apple/libomp.rb
        if: matrix.config.name == 'apple-darwin'

-      - uses: actions/cache@v6
+      - name: Compile OpenMP.xcframework (iOS)
+        run: ./shell/apple/emulator-ios/OpenMP/build_ios_openmp.sh --disableSimulator
+        if: matrix.config.name == 'apple-ios'
+
+      - uses: actions/cache@v4
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ccache-${{ matrix.config.name }}-${{ github.sha }}
@@ -129,7 +99,7 @@ jobs:
          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.buildType }} -DCMAKE_INSTALL_PREFIX=artifact -DENABLE_CTEST=ON ${{ matrix.config.cmakeArgs }}
          cmake --build build --config ${{ matrix.config.buildType }}
          ./build/flycast
-        if: matrix.config.name == 'x86_64-pc-linux-gnu' || matrix.config.name == 'arm64-pc-linux-gnu'
+        if: matrix.config.name == 'x86_64-pc-linux-gnu'

      - name: Dump symbols
        run: |
@@ -144,7 +114,7 @@ jobs:
          ./configure
          make
          sudo make install
-        if: matrix.config.name == 'x86_64-pc-linux-gnu' || matrix.config.name == 'arm64-pc-linux-gnu'
+        if: matrix.config.name == 'x86_64-pc-linux-gnu'

      - name: Dump symbols and make AppImage (linux)
        run: |
@@ -152,43 +122,40 @@ jobs:
          dump_syms artifact/bin/flycast > symbols/flycast.sym 2>/dev/null
          strip artifact/bin/flycast
          shell/linux/make-appimage.sh . artifact/bin appimage
-          ARCH=$(uname -m)
-          mv flycast-${ARCH}.AppImage artifact/bin
+          mv flycast-x86_64.AppImage artifact/bin
          rm artifact/bin/flycast
-        if: matrix.config.name == 'x86_64-pc-linux-gnu' || matrix.config.name == 'arm64-pc-linux-gnu'
+        if: matrix.config.name == 'x86_64-pc-linux-gnu'
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: flycast-${{ matrix.config.name }}
+          path: artifact/bin

      - name: Package app (macos)
        run: |
          cd artifact/bin
-          codesign --verify --deep --strict --all-architectures --verbose=4 Flycast.app
          zip -rm flycast.app.zip Flycast.app
-          cp flycast.app.zip "../../${{ matrix.config.packagePath }}"
        if: matrix.config.name == 'apple-darwin'

      - name: Package app (windows)
        run: |
-          powershell Compress-Archive artifact/bin/flycast.exe artifact/bin/flycast.zip
+          powershell Compress-Archive artifact/bin/flycast.exe artifact/bin/flycast.zip 
          rm artifact/bin/flycast.exe
-          cp artifact/bin/flycast.zip "${{ matrix.config.packagePath }}"
        if: matrix.config.name == 'x86_64-w64-mingw32'

-      - uses: actions/upload-artifact@v7
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v4
        with:
-          name: flycast-${{ matrix.config.name }}
-          archive: ${{ !matrix.config.packagePath }}
-          path: |
-            ${{ matrix.config.packagePath || 'artifact/bin' }}
-            ${{ !matrix.config.packagePath && 'artifact/lib/libretro' || '' }}
-
-      - name: Setup Rclone
-        uses: AnimMouse/setup-rclone@v1
-        with:
-          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''

      - name: Upload to S3
-        run: rclone copy artifact/bin scaleway:flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA
+        run: aws s3 sync artifact/bin s3://flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --follow-symlinks
        shell: bash
-        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}

      - name: Setup Sentry CLI
        uses: mathieu-bour/setup-sentry-cli@v2
@@ -201,7 +168,7 @@ jobs:
          project: minidump
          version: 2.21.2
        if: ${{ env.SENTRY_TOKEN != '' }}
-
+      
      - name: Upload symbols to Sentry (Windows, macOS, Linux)
        run: |
          VERSION=$(git describe --tags --always)
@@ -211,4 +178,5 @@ jobs:
        shell: bash
        env:
          SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-        if: ${{ env.SENTRY_TOKEN != '' && (matrix.config.name == 'x86_64-w64-mingw32' || matrix.config.name == 'apple-darwin' || matrix.config.name == 'x86_64-pc-linux-gnu' || matrix.config.name == 'arm64-pc-linux-gnu') && github.event_name == 'push' }}
+        if: ${{ env.SENTRY_TOKEN != '' && (matrix.config.name == 'x86_64-w64-mingw32' || matrix.config.name == 'apple-darwin' || matrix.config.name == 'x86_64-pc-linux-gnu') }}
+        
@@ -15,18 +15,18 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Setup Java JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          java-version: 18
          distribution: zulu

      - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
        with:
          python-version: '3.10'

      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Upload Source
        shell: bash
@@ -12,18 +12,18 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Setup Java JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          java-version: 18
          distribution: zulu

      - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
        with:
          python-version: '3.10'

      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
@@ -43,7 +43,7 @@ jobs:
          git commit -m "Fetch translations & Recreate libretro_core_options_intl.h"

      - name: GitHub Push
-        uses: ad-m/github-push-action@v1
+        uses: ad-m/github-push-action@v0.8.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          branch: ${{ github.ref }}
@@ -1,43 +1,36 @@
-name: Nintendo Switch
+name: Nintendo Switch CI

-on:
-  push:
-    branches-ignore:
-      - 'l10n_**'
-  pull_request:
+on: [push, pull_request]

 jobs:
  build:
-    name: Switch ${{ matrix.config.name }}
+    name: ${{ matrix.config.name }}
    runs-on: ubuntu-latest
    container: devkitpro/devkita64:latest

-    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
-
    strategy:
      matrix:
        config:
-          - { name: standalone, destDir: switch }
-          - { name: libretro, cmakeArgs: -DLIBRETRO=ON }
+          - {name: standalone, destDir: switch}
+          - {name: libretro, cmakeArgs: -DLIBRETRO=ON}

    steps:
      - name: Set up build environment
        run: |
          sudo apt-get update
-          sudo apt-get -y install ccache gh
+          sudo apt-get -y install awscli ccache

-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          submodules: recursive
+          submodules: true

      - name: Mark git repository as safe
        run: git config --global --add safe.directory $PWD

-      - uses: actions/cache@v6
+      - uses: actions/cache@v4
        with:
-          path: ${{ env.CCACHE_DIR }}
+          path: ~/.ccache
          key: ccache-switch-${{ matrix.config.name }}-${{ github.sha }}
          restore-keys: ccache-switch-${{ matrix.config.name }}-

@@ -46,22 +39,24 @@ jobs:
          $DEVKITPRO/portlibs/switch/bin/aarch64-none-elf-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=artifact -G Ninja ${{ matrix.config.cmakeArgs }}
          cmake --build build --config Release --target install

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v4
        with:
          name: flycast-switch-${{ matrix.config.name }}
-          path: |
-            artifact/bin
-            artifact/lib/libretro
+          path: artifact/bin

      - name: Package app
        run: zip -m artifact/bin/flycast.nro.zip artifact/bin/flycast.nro
        if: hashFiles('artifact/bin/flycast.nro') != ''

-      - name: Setup Rclone
-        uses: AnimMouse/setup-rclone@v1
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v4
        with:
-          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''

      - name: Upload to S3
-        run: rclone copy artifact/bin scaleway:flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA
-        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''
+        run: aws s3 sync artifact/bin s3://flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
@@ -1,29 +1,20 @@
-name: Xbox, UWP
+name: Windows UWP CI

-on:
-  push:
-    branches-ignore:
-      - 'l10n_**'
-  pull_request:
+on: [push, pull_request]

 jobs:
  build:
-    name: UWP
-    runs-on: windows-2022
-
-    strategy:
-      matrix:
-        arch: [ Win32, x64, ARM64 ]
+    runs-on: windows-latest

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          submodules: recursive
+          submodules: true

      - name: CMake
        run: |
-          cmake -B build -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.22000.0
+          cmake -B build -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.22000.0
          cmake --build build --config Release -- /m
        shell: cmd

@@ -32,10 +23,10 @@ jobs:
      - name: Package app
        run: |
          mkdir build\artifact
-          cd build\AppPackages\flycast\flycast_*_Test
+          cd build\AppPackages\flycast\flycast_*_x64_Test
          mkdir tmp
          ren *.msix flycast.msix
-          makeappx unpack /p .\flycast.msix /d tmp
+          makeappx.exe unpack /p .\flycast.msix /d tmp
          copy ..\..\..\Release\*.dll tmp
          makeappx pack /d tmp /p ..\..\..\artifact\flycast.appx

@@ -43,17 +34,21 @@ jobs:
        run: signtool sign /f shell\uwp\sign_cert.pfx /p '${{ secrets.SIGN_CERT_PWD }}' /v /fd SHA256 build\artifact\flycast.appx
        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v4
        with:
-          name: flycast-uwp-${{ matrix.arch }}
+          name: flycast-uwp
          path: build/artifact

-      - name: Setup Rclone
-        uses: AnimMouse/setup-rclone@v1
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v4
        with:
-          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'

      - name: Upload to S3
-        run: rclone copy build/artifact scaleway:flycast-builds/xbox/${GITHUB_REF#refs/}-$GITHUB_SHA
+        run: aws s3 sync build/artifact s3://flycast-builds/xbox/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --follow-symlinks
        shell: bash
-        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.arch == 'x64'
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
@@ -17,6 +17,3 @@ cmake-build-*/
 # Dependencies from .gitmodules
 core/deps/breakpad/
 core/deps/glslang/
-.cache/
-compile_commands.json
-CMakeUserPresets.json
@@ -9,51 +9,39 @@
  variables:
    GIT_SUBMODULE_STRATEGY: recursive
    CORENAME: flycast
-    CORE_ARGS: -DLIBRETRO=ON -DUSE_LIBCDIO=ON
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release

 .core-defs-linux:
  extends: .core-defs
  variables:
-    CORE_ARGS: -DLIBRETRO=ON -DUSE_LIBCDIO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-    CC: /usr/bin/gcc-12
-    CXX: /usr/bin/g++-12
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release

 .core-defs-osx-x64:
  extends: .core-defs
  variables:
-    CORE_ARGS: -DLIBRETRO=ON -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
+    CORE_ARGS: -DLIBRETRO=ON -G Xcode -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64
    EXTRA_PATH: Release

 .core-defs-osx-arm64:
  extends: .core-defs
  variables:
-    CORE_ARGS: -DLIBRETRO=ON -G Xcode
+    CORE_ARGS: -DLIBRETRO=ON -G Xcode -DCMAKE_BUILD_TYPE=Release
    EXTRA_PATH: Release

 .core-defs-ios-arm64:
  extends: .core-defs
  variables:
-    CORE_ARGS: -DLIBRETRO=ON -DUSE_OPENMP=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0
-    IOS_MINVER: 13.0
-    MINVER: 13.0
-
-.core-defs-libnx:
-  extends: .core-defs
-  variables:
-    CORE_ARGS: -DLIBRETRO=ON -DUSE_OPENMP=OFF
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release

 .core-defs-android:
  extends: .core-defs
  script:
-    - echo y | /android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "ndk;${ANDROID_NDK_VERSION}"
-    - cmake -DLIBRETRO=ON -DUSE_OPENMP=OFF -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI -DANDROID_ARM_MODE=arm -DANDROID_WEAK_API_DEFS=ON "$CMAKE_SOURCE_ROOT" -B$BUILD_DIR
+    - cmake $CORE_ARGS -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI -DANDROID_ARM_MODE=arm "$CMAKE_SOURCE_ROOT" -B$BUILD_DIR
    - cmake --build $BUILD_DIR --target ${CORENAME}_libretro --config Release -- -j $NUMPROC
    - mv $BUILD_DIR/${CORENAME}_libretro.so $LIBNAME
    - if [ $STRIP_CORE_LIB -eq 1 ]; then $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip $LIBNAME; fi
  variables:
-    ANDROID_NDK_VERSION: 29.0.14206865
-    API_LEVEL: 21
-    NDK_ROOT: /android-sdk-linux/ndk/$ANDROID_NDK_VERSION
+    API_LEVEL: 18

 # Inclusion templates, required for the build to work
 include:
@@ -85,23 +73,18 @@ include:

  ################################## CONSOLES ################################  
  # Nintendo Switch
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/libnx-static-cmake.yml'
+#  - project: 'libretro-infrastructure/ci-templates'
+#    file: '/libnx-static.yml'

  # tvOS arm64
  - project: 'libretro-infrastructure/ci-templates'
    file: '/tvos-cmake.yml'

- #################################### MISC ##################################
-  # webOS 32-bit (LGTV)
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/webos-cmake.yml'
-
 # Stages for building
 stages:
  - build-prepare
  - build-shared
-  - build-static
+#  - build-static

 ##############################################################################
 #################################### STAGES ##################################
@@ -125,29 +108,18 @@ libretro-build-linux-x64:
  extends:
    - .libretro-linux-cmake-x86_64
    - .core-defs-linux
-  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:backports

 # Linux 32-bit
 libretro-build-linux-i686:
  extends:
    - .libretro-linux-cmake-x86
    - .core-defs-linux
-  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-i386-ubuntu:backports
-
-# Linux 64-bit (ARM)
-libretro-build-linux-aarch64:
-  extends:
-    - .libretro-linux-cmake-aarch64
-    - .core-defs-linux
-

 # MacOS 64-bit
 libretro-build-osx-x64:
  extends:
    - .libretro-osx-cmake-x86
    - .core-defs-osx-x64
-  tags:
-    - mac-apple-silicon

 # MacOS arm 64-bit
 libretro-build-osx-arm64:
@@ -187,43 +159,13 @@ libretro-build-ios-arm64:

 ################################### CONSOLES #################################
 # Nintendo Switch
-libretro-build-libnx-aarch64:
-  extends:
-    - .libretro-libnx-static-cmake-retroarch-master
-    - .core-defs-libnx
-  # The libnx image ships CMake 3.18.4 and this tree asks for 3.22.1, so the
-  # job stops at configure. Put a newer one in front of it - in /tmp, since
-  # the job does not run as a user who can write /opt.
-  before_script:
-    - !reference [.libretro-libnx-static-cmake, before_script]
-    - |
-      CMAKE_VER=3.31.6
-      curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-x86_64.tar.gz" | tar -xz -C /tmp
-      export PATH="/tmp/cmake-${CMAKE_VER}-linux-x86_64/bin:$PATH"
-  # The template's script, with one word changed. It builds --target
-  # ${CORENAME}_libretro, and on Switch that target is flycast's own objects
-  # and nothing else. `combined` is the target CMakeLists.txt defines for
-  # exactly this case: it folds in xxhash, chdr, zip, elf and the resources,
-  # which is what RetroArch links against afterwards.
-  script:
-    - cmake $CORE_ARGS "$CMAKE_SOURCE_ROOT" -B$BUILD_DIR -DCMAKE_BUILD_TYPE=Release -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_libnx -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake -DNSWITCH=ON -DCFLAGS=-DHAVE_LIBNX=1 -DCXXFLAGS=-DHAVE_LIBNX=1
-    - cmake --build $BUILD_DIR --target combined --config Release -- -j $NUMPROC
-    - mv $BUILD_DIR/$EXTRA_PATH/${CORENAME}_libretro_libnx.a retroarch-precompiled/libretro_libnx.a
-    - cd retroarch-precompiled/
-    - make -f Makefile.libnx -j10
-    - mv retroarch_switch.nro ../${CORENAME}_libretro_libnx.nro
-    - mv retroarch_switch.elf ../${CORENAME}_libretro_libnx.elf
-    - cd ../
+#libretro-build-libnx-aarch64:
+#  extends:
+#    - .libretro-libnx-static-retroarch-master
+#    - .core-defs

 # tvOS arm64
 libretro-build-tvos-arm64:
  extends:
    - .libretro-tvos-cmake-arm64
    - .core-defs-ios-arm64
-
-#################################### MISC ##################################
-# webOS 32-bit
-libretro-build-webos-armv7a:
-  extends:
-    - .libretro-webos-armv7a-cmake
-    - .core-defs
@@ -3,7 +3,7 @@
 	url = https://github.com/libsdl-org/SDL.git
 [submodule "core/deps/libchdr"]
 	path = core/deps/libchdr
-	url = https://github.com/flyinghead/libchdr.git
+	url = https://github.com/rtissera/libchdr.git
 	ignore = dirty
 [submodule "core/deps/luabridge"]
 	path = core/deps/luabridge
@@ -41,30 +41,3 @@
 [submodule "core/deps/googletest"]
 	path = core/deps/googletest
 	url = https://github.com/google/googletest.git
-[submodule "core/deps/asio"]
-	path = core/deps/asio
-	url = https://github.com/flyinghead/asio.git
-[submodule "core/deps/xbyak"]
-	path = core/deps/xbyak
-	url = https://github.com/herumi/xbyak.git
-[submodule "core/deps/libjuice"]
-	path = core/deps/libjuice
-	url = https://github.com/flyinghead/libjuice.git
-[submodule "core/deps/websocketpp"]
-	path = core/deps/websocketpp
-	url = https://github.com/zaphoyd/websocketpp.git
-[submodule "core/deps/DreamPicoPort-API"]
-	path = core/deps/DreamPicoPort-API
-	url = https://github.com/OrangeFox86/DreamPicoPort-API.git
-[submodule "core/deps/tinygettext"]
-	path = core/deps/tinygettext
-	url = https://github.com/flyinghead/tinygettext
-[submodule "core/deps/freetype"]
-	path = core/deps/freetype
-	url = https://gitlab.freedesktop.org/freetype/freetype.git
-[submodule "core/deps/gamesdk"]
-	path = core/deps/gamesdk
-	url = https://github.com/flyinghead/gamesdk.git
-[submodule "core/deps/basis_universal"]
-	path = core/deps/basis_universal
-	url = https://github.com/BinomialLLC/basis_universal.git
@@ -1,23 +0,0 @@
-{
-    "version": 2,
-    "configurePresets": [
-        {
-            "name": "clang",
-            "generator": "Ninja",
-            "binaryDir": "build-clang",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-            }
-        },
-        {
-            "name": "gcc",
-            "generator": "Ninja",
-            "binaryDir": "build-gcc",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-            }
-        }
-    ]
-}
@@ -6,94 +6,49 @@
 [![Windows UWP CI](https://github.com/flyinghead/flycast/actions/workflows/uwp.yml/badge.svg)](https://github.com/flyinghead/flycast/actions/workflows/uwp.yml)
 [![BSD CI](https://github.com/flyinghead/flycast/actions/workflows/bsd.yml/badge.svg)](https://github.com/flyinghead/flycast/actions/workflows/bsd.yml)

-<img src="shell/linux/flycast.png" alt="flycast logo" width="150"/>
+![flycast logo](https://github.com/flyinghead/flycast/raw/master/shell/linux/flycast.png)

 **Flycast** is a multi-platform Sega Dreamcast, Naomi, Naomi 2, and Atomiswave emulator derived from [**reicast**](https://github.com/skmp/reicast-emulator).

 Information about configuration and supported features can be found on [**TheArcadeStriker's flycast wiki**](https://github.com/TheArcadeStriker/flycast-wiki/wiki).

-Join us on our [**Discord server**](https://discord.gg/X8YWP8w) for a chat.
-
-## Downloads ![android](https://flyinghead.github.io/flycast-builds/android.jpg) ![windows](https://flyinghead.github.io/flycast-builds/windows.png) ![linux](https://flyinghead.github.io/flycast-builds/ubuntu.png) ![apple](https://flyinghead.github.io/flycast-builds/apple.png) ![switch](https://flyinghead.github.io/flycast-builds/switch.png) ![xbox](https://flyinghead.github.io/flycast-builds/xbox.png)
-
-Get builds for your system from the [**builds page**](https://flyinghead.github.io/flycast-builds/) or [**GitHub Releases**](https://github.com/flyinghead/flycast/releases).
-
- **Latest master builds:** regular builds from the `master` branch with recent fixes and updates.
- **Nightly dev builds:** experimental builds with the latest features and changes.
- **Stable tagged releases:** versioned release builds published on GitHub Releases.
-
-Automated test results are available from the builds page as well.
+Join us on our [**Discord server**](https://discord.gg/X8YWP8w) for a chat. 

 ## Install

 ### Android ![android](https://flyinghead.github.io/flycast-builds/android.jpg)
-
-&emsp;Install Flycast from [**Google Play**](https://play.google.com/store/apps/details?id=com.flycast.emulator).
-
+Install Flycast from [**Google Play**](https://play.google.com/store/apps/details?id=com.flycast.emulator).
 ### Flatpak (Linux ![ubuntu logo](https://flyinghead.github.io/flycast-builds/ubuntu.png))

 1. [Set up Flatpak](https://www.flatpak.org/setup/).

 2. Install Flycast from [Flathub](https://flathub.org/apps/details/org.flycast.Flycast):

-&emsp;`flatpak install -y org.flycast.Flycast`
+`flatpak install -y org.flycast.Flycast`

 3. Run Flycast:

-&emsp;`flatpak run org.flycast.Flycast`
+`flatpak run org.flycast.Flycast`

-### Homebrew (macOS ![apple logo](https://flyinghead.github.io/flycast-builds/apple.png))
+### Homebrew (MacOS ![apple logo](https://flyinghead.github.io/flycast-builds/apple.png))

-1. [Set up Homebrew](https://brew.sh) or run `brew update` if already installed.
+1. [Set up Homebrew](https://brew.sh).

-2. Choose one channel:
+2. Install Flycast via Homebrew:

-| Channel              | Install command                                         |
-| -------------------- | ------------------------------------------------------- |
-| Master (recommended) | `brew install --cask flyinghead/flycast/flycast@master` |
-| Stable               | `brew install --cask flyinghead/flycast/flycast`        |
-| Nightly dev          | `brew install --cask flyinghead/flycast/flycast@dev`    |
-
-3. Run Flycast from your Application folder
-
-&emsp;See the <a href="https://github.com/flyinghead/homebrew-flycast#readme">Flycast tap</a> for updating, uninstalling, and switching channels.
-
-### iOS
-
-&emsp;Due to persistent harassment from an iOS user, support for this platform has been dropped.
+`brew install --cask flycast`

 ### Xbox One/Series ![xbox logo](https://flyinghead.github.io/flycast-builds/xbox.png)

-&emsp;Grab the latest build from [**the builds page**](https://flyinghead.github.io/flycast-builds/), or the [**GitHub Actions**](https://github.com/flyinghead/flycast/actions/workflows/uwp.yml). Then install it using the **Xbox Device Portal**.
+Grab the latest build from [**the builds page**](https://flyinghead.github.io/flycast-builds/), or the [**GitHub Actions**](https://github.com/flyinghead/flycast/actions/workflows/uwp.yml). Then install it using the **Xbox Device Portal**.

-## Build from source
+### Binaries ![android](https://flyinghead.github.io/flycast-builds/android.jpg) ![windows](https://flyinghead.github.io/flycast-builds/windows.png) ![linux](https://flyinghead.github.io/flycast-builds/ubuntu.png) ![apple](https://flyinghead.github.io/flycast-builds/apple.png) ![switch](https://flyinghead.github.io/flycast-builds/switch.png) ![xbox](https://flyinghead.github.io/flycast-builds/xbox.png)

-### macOS
+Get fresh builds for your system [**on the builds page**](https://flyinghead.github.io/flycast-builds/).

-&emsp;Right-click the bootstrap script and choose **Open**:
-
-&emsp;`shell/apple/generate_xcode_project.command`
-
-### Windows
-
-&emsp;Double-click the bootstrap script:
-
-&emsp;`shell\windows\generate_vs_project.bat`
-
-### Linux
-
-#### Dependencies
-
- **C/C++ compiler toolchain** (e.g. `gcc`/`g++`)
- **CMake**
- **make**
- **libcurl** (development headers)
- **libudev** (development headers)
- **SDL2** (development headers)
- **Graphics API**: Vulkan, OpenGL
-
-#### Build
+**New:** Now automated test results are available as well. 

+### Build instructions:
 ```
 $ git clone --recursive https://github.com/flyinghead/flycast.git
 $ cd flycast
@@ -101,7 +56,3 @@ $ mkdir build && cd build
 $ cmake ..
 $ make
 ```
-
-## Packaging status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/flycast.svg)](https://repology.org/project/flycast/versions)
@@ -1,3 +0,0 @@
-target_sources(${PROJECT_NAME} PRIVATE
-        achievements.cpp
-        achievements.h)
@@ -29,7 +29,6 @@
 #include "oslib/oslib.h"
 #include "emulator.h"
 #include "stdclass.h"
-#include "oslib/i18n.h"
 #include <cassert>
 #include <rc_client.h>
 #include <rc_hash.h>
@@ -38,9 +37,8 @@
 #include <atomic>
 #include <utility>
 #include <xxhash.h>
+#include <thread>
 #include <functional>
-#include "util/worker_thread.h"
-#include "util/periodic_thread.h"

 namespace achievements
 {
@@ -63,7 +61,6 @@ public:
 	void deserialize(Deserializer& deser);

 	static Achievements& Instance();
-	void setHostOverride(const std::string& host);

 private:
 	bool createClient();
@@ -77,8 +74,10 @@ private:
 	std::string getOrDownloadImage(const char *url);
 	std::pair<std::string, bool> getCachedImage(const char *url);
 	void diskChange();
-	void asyncTask(std::function<void()>&& f);
-	void stopThreads();
+	void asyncTask(std::function<void()> f);
+	void startThread();
+	void stopThread();
+	void backgroundThread();

 	static void clientLoginWithTokenCallback(int result, const char *error_message, rc_client_t *client, void *userdata);
 	static void clientLoginWithPasswordCallback(int result, const char *error_message, rc_client_t *client, void *userdata);
@@ -106,7 +105,6 @@ private:

 	rc_client_t *rc_client = nullptr;
 	bool loggedOn = false;
-	bool hostOverrideActive = false;
 	std::atomic_bool loadingGame {};
 	bool active = false;
 	bool paused = false;
@@ -114,12 +112,11 @@ private:
 	std::string cachePath;
 	std::unordered_map<u64, std::string> cacheMap;
 	std::mutex cacheMutex;
-	WorkerThread taskThread {"RA-background"};
-
-	PeriodicThread idleThread { "RA-idle", [this]() {
-		if (active)
-			rc_client_idle(rc_client);
-	}};
+	std::vector<std::function<void()>> tasks;
+	std::mutex taskMutex;
+	std::thread taskThread;
+	cResetEvent resetEvent;
+	bool threadRunning = false;
 };

 bool init() {
@@ -158,10 +155,6 @@ bool canPause() {
 	return Achievements::Instance().canPause();
 }

-void setHostOverride(const std::string& host) {
-	Achievements::Instance().setHostOverride(host);
-}
-
 void serialize(Serializer& ser) {
 	Achievements::Instance().serialize(ser);
 }
@@ -183,7 +176,6 @@ Achievements::Achievements()
 	EventManager::listen(Event::Pause, emuEventCallback, this);
 	EventManager::listen(Event::Resume, emuEventCallback, this);
 	EventManager::listen(Event::DiskChange, emuEventCallback, this);
-	idleThread.setPeriod(1000);
 }

 Achievements::~Achievements()
@@ -196,13 +188,44 @@ Achievements::~Achievements()
 	term();
 }

-void Achievements::asyncTask(std::function<void()>&& f) {
-	taskThread.run(std::move(f));
+void Achievements::asyncTask(std::function<void()> f)
+{
+	{
+		std::lock_guard<std::mutex> _(taskMutex);
+		tasks.emplace_back(f);
+	}
+	resetEvent.Set();
 }

-void Achievements::stopThreads() {
-	taskThread.stop();
-	idleThread.stop();
+void Achievements::startThread()
+{
+	threadRunning = true;
+	taskThread = std::thread(&Achievements::backgroundThread, this);
+}
+
+void Achievements::stopThread()
+{
+	threadRunning = false;
+	resetEvent.Set();
+	if (taskThread.joinable())
+		taskThread.join();
+}
+
+void Achievements::backgroundThread()
+{
+	ThreadName _("RA-background");
+	while (threadRunning)
+	{
+		if (!resetEvent.Wait(1000) && active && paused)
+			rc_client_idle(rc_client);
+		std::vector<std::function<void()>> localTasks;
+		{
+			std::lock_guard<std::mutex> _(taskMutex);
+			std::swap(tasks, localTasks);
+		}
+		for (auto& f : localTasks)
+			f();
+	}
 }

 bool Achievements::init()
@@ -220,6 +243,7 @@ bool Achievements::init()
 	//rc_client_set_unofficial_enabled(rc_client, 0);
 	//rc_client_set_spectator_mode_enabled(rc_client, 0);
 	loadCache();
+	startThread();

 	if (!config::AchievementsUserName.get().empty() && !config::AchievementsToken.get().empty())
 	{
@@ -249,45 +273,9 @@ bool Achievements::createClient()

 	rc_client_set_userdata(rc_client, this);

-	if (!config::AchievementsHostUrl.get().empty()) {
-		rc_client_set_host(rc_client, config::AchievementsHostUrl.get().c_str());
-		hostOverrideActive = true;
-	}
-
 	return true;
 }

-void Achievements::setHostOverride(const std::string& host)
-{
-	config::AchievementsHostUrl.set(host);
-	hostOverrideActive = !host.empty();
-	// rc_client_set_host sets the global URL even when rc_client is null
-	rc_client_set_host(rc_client, host.empty() ? nullptr : host.c_str());
-	if (rc_client != nullptr)
-	{
-		if (!host.empty())
-		{
-			rc_client_set_hardcore_enabled(rc_client, 0);
-			if (!loggedOn
-				&& !config::AchievementsUserName.get().empty()
-				&& !config::AchievementsToken.get().empty())
-			{
-				INFO_LOG(COMMON, "RA: Retrying login via proxy host '%s'", host.c_str());
-				rc_client_begin_login_with_token(rc_client,
-					config::AchievementsUserName.get().c_str(),
-					config::AchievementsToken.get().c_str(),
-					clientLoginWithTokenCallback, nullptr);
-			}
-		}
-		else
-		{
-			bool restoredHardcore = config::AchievementsHardcoreMode.get();
-			rc_client_set_hardcore_enabled(rc_client, (int)restoredHardcore);
-			settings.raHardcoreMode = restoredHardcore;
-		}
-	}
-}
-
 void Achievements::loadCache()
 {
 	cachePath = get_writable_data_path("achievements/");
@@ -313,7 +301,7 @@ void Achievements::loadCache()
 }

 static u64 hashUrl(const char *url) {
-	return XXH3_64bits(url, strlen(url));
+	return XXH64(url, strlen(url), 13);
 }

 std::pair<std::string, bool> Achievements::getCachedImage(const char *url)
@@ -326,8 +314,7 @@ std::pair<std::string, bool> Achievements::getCachedImage(const char *url)
 	}
 	else
 	{
-		std::ostringstream stream;
-		stream.imbue(std::locale::classic());
+		std::stringstream stream;
 		stream << std::hex << hash << ".png";
 		return std::make_pair(cachePath + stream.str(), false);
 	}
@@ -347,8 +334,7 @@ std::string Achievements::getOrDownloadImage(const char *url)
 	int rc = http::get(url, content, content_type);
 	if (!http::success(rc))
 		return {};
-	std::ostringstream stream;
-	stream.imbue(std::locale::classic());
+	std::stringstream stream;
 	stream << std::hex << hash << ".png";
 	std::string localPath = cachePath + stream.str();
 	FILE *f = nowide::fopen(localPath.c_str(), "wb");
@@ -371,7 +357,7 @@ void Achievements::term()
 	if (rc_client == nullptr)
 		return;
 	unloadGame();
-	stopThreads();
+	stopThread();
 	rc_client_destroy(rc_client);
 	rc_client = nullptr;
 }
@@ -379,17 +365,16 @@ void Achievements::term()
 void Achievements::authenticationSuccess(const rc_client_user_t *user)
 {
 	NOTICE_LOG(COMMON, "RA Login successful");
-	std::string url(512, '\0');
-	int rc = rc_client_user_get_image_url(user, url.data(), url.size());
-	if (rc == RC_OK)
-	{
-		asyncTask([this, url]()
+	asyncTask([this, user]() {
+		char url[512];
+		int rc = rc_client_user_get_image_url(user, url, sizeof(url));
+		if (rc == RC_OK)
 		{
-			std::string image = getOrDownloadImage(url.c_str());
-			std::string text = strprintf(i18n::T("User %s authenticated"), config::AchievementsUserName.get().c_str());
+			std::string image = getOrDownloadImage(url);
+			std::string text = "User " + config::AchievementsUserName.get() + " authenticated";
 			notifier.notify(Notification::Login, image, text);
-		});
-	}
+		}
+	});
 	loggedOn = true;
 	if (!settings.content.fileName.empty()) // TODO better test?
 		loadGame();
@@ -402,7 +387,7 @@ void Achievements::clientLoginWithTokenCallback(int result, const char *error_me
 	if (result != RC_OK)
 	{
 		WARN_LOG(COMMON, "RA Login failed: %s", error_message);
-		notifier.notify(Notification::Login, "", i18n::Ts("RetroAchievements authentication failed"), error_message);
+		notifier.notify(Notification::Login, "", "RetroAchievements authentication failed", error_message);
 		return;
 	}
 	achievements->authenticationSuccess(rc_client_get_user_info(client));
@@ -437,7 +422,7 @@ void Achievements::clientLoginWithPasswordCallback(int result, const char *error
 	if (!user || !user->token)
 	{
 		WARN_LOG(COMMON, "RA: rc_client_get_user_info() returned NULL");
-		promise->set_exception(std::make_exception_ptr(FlycastException(i18n::Ts("No user token returned"))));
+		promise->set_exception(std::make_exception_ptr(FlycastException("No user token returned")));
 		delete promise;
 		return;
 	}
@@ -589,11 +574,11 @@ void Achievements::clientEventHandler(const rc_client_event_t* event, rc_client_
 // TODO case RC_CLIENT_EVENT_LEADERBOARD_SCOREBOARD:

 	case RC_CLIENT_EVENT_DISCONNECTED:
-		notifyError(i18n::Ts("RetroAchievements disconnected"));
+		notifyError("RetroAchievements disconnected");
 		break;

 	case RC_CLIENT_EVENT_RECONNECTED:
-		notifyError(i18n::Ts("RetroAchievements reconnected"));
+		notifyError("RetroAchievements reconnected");
 		break;

 	default:
@@ -615,69 +600,67 @@ void Achievements::handleUnlockEvent(const rc_client_event_t *event)
 	assert(cheevo != nullptr);

 	INFO_LOG(COMMON, "RA: Achievement %s (%u) for game %s unlocked", cheevo->title, cheevo->id, settings.content.title.c_str());
-	std::string title(cheevo->title);
-	std::string description(cheevo->description);
-	std::string url(512, '\0');
-	int rc = rc_client_achievement_get_image_url(cheevo, cheevo->state, url.data(), url.size());
-	if (rc == RC_OK)
-	{
-		asyncTask([this, url, title, description]() {
-			std::string image = getOrDownloadImage(url.c_str());
-			std::string text = strprintf(i18n::T("Achievement %s unlocked!"), title.c_str());
-			notifier.notify(Notification::Login, image, text, description);
-		});
-	}
+	asyncTask([this, cheevo]() {
+		char url[512];
+		int rc = rc_client_achievement_get_image_url(cheevo, cheevo->state, url, sizeof(url));
+		if (rc == RC_OK)
+		{
+			std::string image = getOrDownloadImage(url);
+			std::string text = "Achievement " + std::string(cheevo->title) + " unlocked!";
+			notifier.notify(Notification::Login, image, text, cheevo->description);
+		}
+	});
 }

 void Achievements::handleAchievementChallengeIndicatorShowEvent(const rc_client_event_t *event)
 {
 	const rc_client_achievement_t* cheevo = event->achievement;
 	INFO_LOG(COMMON, "RA: Challenge: %s", cheevo->title);
-	std::string url(512, '\0');
-	int rc = rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url.data(), url.size());
-	if (rc == RC_OK)
-	{
-		asyncTask([this, url]() {
-			std::string image = getOrDownloadImage(url.c_str());
+	asyncTask([this, cheevo]() {
+		char url[128];
+		int rc = rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url, sizeof(url));
+		if (rc == RC_OK)
+		{
+			std::string image = getOrDownloadImage(url);
 			notifier.showChallenge(image);
-		});
-	}
+		}
+	});
 }

 void Achievements::handleAchievementChallengeIndicatorHideEvent(const rc_client_event_t *event)
 {
 	const rc_client_achievement_t* cheevo = event->achievement;
 	INFO_LOG(COMMON, "RA: Challenge hidden: %s", cheevo->title);
-	std::string url(512, '\0');
-	int rc = rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url.data(), url.size());
-	if (rc == RC_OK)
-	{
-		asyncTask([this, url]() {
-			std::string image = getOrDownloadImage(url.c_str());
+	asyncTask([this, cheevo]() {
+		char url[128];
+		int rc = rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url, sizeof(url));
+		if (rc == RC_OK)
+		{
+			std::string image = getOrDownloadImage(url);
 			notifier.hideChallenge(image);
-		});
-	}
+		}
+	});
 }

 void Achievements::handleLeaderboardStarted(const rc_client_event_t *event)
 {
 	const rc_client_leaderboard_t *leaderboard = event->leaderboard;
 	INFO_LOG(COMMON, "RA: Leaderboard started: %s", leaderboard->title);
-	std::string text = strprintf(i18n::T("Leaderboard %s started"), leaderboard->title);
+	std::string text = "Leaderboard " + std::string(leaderboard->title) + " started";
 	notifier.notify(Notification::Unlocked, "", text, leaderboard->description);
 }
 void Achievements::handleLeaderboardFailed(const rc_client_event_t *event)
 {
 	const rc_client_leaderboard_t *leaderboard = event->leaderboard;
 	INFO_LOG(COMMON, "RA: Leaderboard failed: %s", leaderboard->title);
-	std::string text = strprintf(i18n::T("Leaderboard %s failed"), leaderboard->title);
+	std::string text = "Leaderboard " + std::string(leaderboard->title) + " failed";
 	notifier.notify(Notification::Unlocked, "", text, leaderboard->description);
 }
 void Achievements::handleLeaderboardSubmitted(const rc_client_event_t *event)
 {
 	const rc_client_leaderboard_t *leaderboard = event->leaderboard;
 	INFO_LOG(COMMON, "RA: Leaderboard submitted: %s", leaderboard->title);
-	std::string text = strprintf(i18n::T("Leaderboard %s submitted"), leaderboard->title);
+	std::string text = "Leaderboard " + std::string(leaderboard->title) + " submitted";
 	notifier.notify(Notification::Unlocked, "", text, leaderboard->description);
 }
 void Achievements::handleShowLeaderboardTracker(const rc_client_event_t *event)
@@ -702,19 +685,18 @@ void Achievements::handleUpdateLeaderboardTracker(const rc_client_event_t *event
 void Achievements::handleGameCompleted(const rc_client_event_t *event)
 {
 	const rc_client_game_t* game = rc_client_get_game_info(rc_client);
-	std::string text1 = strprintf(rc_client_get_hardcore_enabled(rc_client) ? i18n::T("Mastered %s") : i18n::T("Completed %s"), game->title);
-	rc_client_user_game_summary_t summary;
-	rc_client_get_user_game_summary(rc_client, &summary);
-	std::string text2 = strprintf(i18n::T("%d achievements, %d points"), summary.num_unlocked_achievements, summary.points_unlocked);
-	std::string text3 = rc_client_get_user_info(rc_client)->display_name;
-	std::string url(512, '\0');
-	if (rc_client_game_get_image_url(game, url.data(), url.size()) != RC_OK)
-		url.clear();
-	asyncTask([this, url, text1, text2, text3]() {
+	asyncTask([this, game]() {
 		std::string image;
-		if (!url.empty())
-			image = getOrDownloadImage(url.c_str());
-		notifier.notify(Notification::Mastery, image, text1, text2, text3);
+		char url[128];
+		if (rc_client_game_get_image_url(game, url, sizeof(url)) == RC_OK)
+			image = getOrDownloadImage(url);
+		std::string text1 = (rc_client_get_hardcore_enabled(rc_client) ? "Mastered " : "Completed ") + std::string(game->title);
+		rc_client_user_game_summary_t summary;
+		rc_client_get_user_game_summary(rc_client, &summary);
+		std::stringstream ss;
+		ss << summary.num_unlocked_achievements << " achievements, " << summary.points_unlocked << " points";
+		std::string text3 = rc_client_get_user_info(rc_client)->display_name;
+		notifier.notify(Notification::Mastery, image, text1, ss.str(), text3);
 	});
 }

@@ -729,15 +711,12 @@ void Achievements::handleHideAchievementProgress(const rc_client_event_t *event)
 void Achievements::handleUpdateAchievementProgress(const rc_client_event_t *event)
 {
 	const rc_client_achievement_t* cheevo = event->achievement;
-	std::string url(512, '\0');
-	if (rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_ACTIVE, url.data(), url.size()) != RC_OK)
-		url.clear();
-	std::string progress(cheevo->measured_progress);
-	asyncTask([this, url, progress]() {
+	asyncTask([this, cheevo]() {
+		char url[128];
 		std::string image;
-		if (!url.empty())
-			image = getOrDownloadImage(url.c_str());
-		notifier.notify(Notification::Progress, image, progress);
+		if (rc_client_achievement_get_image_url(cheevo, RC_CLIENT_ACHIEVEMENT_STATE_ACTIVE, url, sizeof(url)) == RC_OK)
+			image = getOrDownloadImage(url);
+		notifier.notify(Notification::Progress, image, cheevo->measured_progress);
 	});
 }

@@ -792,7 +771,8 @@ std::string Achievements::getGameHash()
 {
 	if (settings.platform.isConsole())
 	{
-		if (!gdr::isLoaded())
+		const u32 diskType = libGDR_GetDiscType();
+		if (diskType == NoDisk || diskType == Open)
 			return {};
 		// Reopen the disk locally to avoid threading issues (CHD)
 		try {
@@ -826,19 +806,15 @@ std::string Achievements::getGameHash()
 	return hash;
 }

-void Achievements::pauseGame()
-{
+void Achievements::pauseGame() {
 	paused = true;
-	if (active)
-		idleThread.start();
 }

 void Achievements::resumeGame()
 {
 	paused = false;
-	if (config::EnableAchievements && !settings.naomi.slave)
+	if (config::EnableAchievements)
 	{
-		idleThread.stop();
 		loadGame();
 		if (settings.raHardcoreMode && !config::AchievementsHardcoreMode)
 		{
@@ -897,9 +873,7 @@ void Achievements::loadGame()
 	if (!gameHash.empty())
 	{
 		// settings.raHardcoreMode is set before enabling cheats and loading the initial savestate
-		// Hardcore is disabled when routing through a custom host (e.g. RAOfflineProxy).
-		bool effectiveHardcore = settings.raHardcoreMode && !hostOverrideActive;
-		rc_client_set_hardcore_enabled(rc_client, effectiveHardcore);
+		rc_client_set_hardcore_enabled(rc_client, settings.raHardcoreMode);
 		rc_client_begin_load_game(rc_client, gameHash.c_str(), [](int result, const char *error_message, rc_client_t *client, void *userdata) {
 				((Achievements *)userdata)->gameLoaded(result, error_message);
 			}, this);
@@ -945,23 +919,21 @@ void Achievements::gameLoaded(int result, const char *errorMessage)
 		settings.raHardcoreMode = false;
 	else
 		settings.raHardcoreMode = (bool)rc_client_get_hardcore_enabled(rc_client);
-	std::string url(512, '\0');
-	if (rc_client_game_get_image_url(info, url.data(), url.size()) != RC_OK)
-		url.clear();
-	std::string text1(info->title);
-	rc_client_user_game_summary_t summary;
-	rc_client_get_user_game_summary(rc_client, &summary);
-	std::string text2;
-	if (summary.num_core_achievements > 0)
-		text2 = strprintf(i18n::T("You have %d of %d achievements unlocked."), summary.num_unlocked_achievements, summary.num_core_achievements);
-	else
-		text2 = i18n::Ts("This game has no achievements.");
-	asyncTask([this, url, text1, text2]() {
+	asyncTask([this, info]() {
 		std::string image;
-		if (!url.empty())
-			image = getOrDownloadImage(url.c_str());
-		std::string text3 = settings.raHardcoreMode ? i18n::T("Hardcore Mode") : "";
-		notifier.notify(Notification::Login, image, text1, text2, text3);
+		char url[512];
+		if (rc_client_game_get_image_url(info, url, sizeof(url)) == RC_OK)
+			image = getOrDownloadImage(url);
+		rc_client_user_game_summary_t summary;
+		rc_client_get_user_game_summary(rc_client, &summary);
+		std::string text;
+		if (summary.num_core_achievements > 0)
+			text = "You have " + std::to_string(summary.num_unlocked_achievements)
+					+ " of " + std::to_string(summary.num_core_achievements) + " achievements unlocked.";
+		else
+			text = "This game has no achievements.";
+		std::string text2 = settings.raHardcoreMode ? "Hardcore Mode" : "";
+		notifier.notify(Notification::Login, image, info->title, text, text2);
 	});
 }

@@ -973,15 +945,15 @@ void Achievements::unloadGame()
 	paused = false;
 	EventManager::unlisten(Event::VBlank, emuEventCallback, this);
 	// wait for all async tasks before unloading the game
-	stopThreads();
+	stopThread();
+	startThread();
 	rc_client_unload_game(rc_client);
 	settings.raHardcoreMode = false;
 }

 void Achievements::diskChange()
 {
-	if (!active || settings.content.path.empty())
-		// Don't unload the game when the lid is open while swapping disks
+	if (!active)
 		return;
 	std::string hash = getGameHash();
 	if (hash == "") {
@@ -991,14 +963,14 @@ void Achievements::diskChange()
 	rc_client_begin_change_media_from_hash(rc_client, hash.c_str(), [](int result, const char *errorMessage, rc_client_t *client, void *userdata) {
 			if (result == RC_HARDCORE_DISABLED) {
 				settings.raHardcoreMode = false;
-				notifier.notify(Notification::Login, "", i18n::Ts("Hardcore mode disabled"), i18n::Ts("Unrecognized media inserted"));
+				notifier.notify(Notification::Login, "", "Hardcore mode disabled", "Unrecognized media inserted");
 			}
 			else if (result != RC_OK)
 			{
 				settings.raHardcoreMode = false;
 				if (errorMessage == nullptr)
 					errorMessage = rc_error_str(result);
-				notifier.notify(Notification::Login, "", i18n::Ts("Media change failed"), errorMessage);
+				notifier.notify(Notification::Login, "", "Media change failed", errorMessage);
 			}
 		}, this);
 }
@@ -54,7 +54,6 @@ bool isActive();
 Game getCurrentGame();
 std::vector<Achievement> getAchievementList();
 bool canPause();
-void setHostOverride(const std::string& host);

 #else

@@ -19,9 +19,9 @@
    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "7zArchive.h"
-#include "lzma/7z.h"
-#include "lzma/7zCrc.h"
-#include "lzma/Alloc.h"
+#include "deps/lzma/7z.h"
+#include "deps/lzma/7zCrc.h"
+#include "deps/lzma/Alloc.h"

 #include <cstring>

@@ -29,40 +29,20 @@

 static bool crc_tables_generated;

-SRes SzArchive::ArchiveStream::Read(const ISeekInStream *p, void *buf, size_t *size)
-{
-	auto file_archive = CONTAINER_FROM_VTBL(p, ArchiveStream, vt);
-	*size = file_archive->file->read(buf, 1, *size);
-	return file_archive->file->error() ? SZ_ERROR_READ : SZ_OK;
-}
-
-SRes SzArchive::ArchiveStream::Seek(const ISeekInStream *p, Int64 *pos, ESzSeek origin)
-{
-	auto file_archive = CONTAINER_FROM_VTBL(p, ArchiveStream, vt);
-	if (file_archive->file->seek(*pos, origin) == 0) {
-		*pos = file_archive->file->tell();
-		return SZ_OK;
-	}
-	else {
-		return SZ_ERROR_FAIL;
-	}
-}
-
-bool SzArchive::Open(hostfs::File *file)
+bool SzArchive::Open(FILE *file)
 {
 	SzArEx_Init(&szarchive);

-	if (archiveStream.file != nullptr)
-		delete archiveStream.file;
-	archiveStream.vt.Read = ArchiveStream::Read;
-	archiveStream.vt.Seek = ArchiveStream::Seek;
-	archiveStream.file = file;
+	File_Close(&archiveStream.file);
+	File_Construct(&archiveStream.file);
+	archiveStream.file.file = file;

+	FileInStream_CreateVTable(&archiveStream);
 	LookToRead2_CreateVTable(&lookStream, 0);
 	lookStream.buf = (Byte *)ISzAlloc_Alloc(&g_Alloc, kInputBufSize);
 	if (lookStream.buf == NULL)
 	{
-		delete archiveStream.file;
+		File_Close(&archiveStream.file);
 		return false;
 	}
 	lookStream.bufSize = kInputBufSize;
@@ -135,7 +115,7 @@ SzArchive::~SzArchive()
 {
 	if (lookStream.buf != NULL)
 	{
-		delete archiveStream.file;
+		File_Close(&archiveStream.file);
 		ISzAlloc_Free(&g_Alloc, lookStream.buf);
 		if (out_buffer != NULL)
 			ISzAlloc_Free(&g_Alloc, out_buffer);
@@ -21,7 +21,8 @@
 #pragma once

 #include "archive.h"
-#include "lzma/7z.h"
+#include "deps/lzma/7z.h"
+#include "deps/lzma/7zFile.h"

 #include <algorithm>
 #include <cstring>
@@ -39,23 +40,14 @@ public:
 	ArchiveFile *OpenFileByCrc(u32 crc) override;

 protected:
-	bool Open(hostfs::File *file) override;
+	bool Open(FILE *file) override;

 private:
-	struct ArchiveStream
-	{
-		static SRes Read(const ISeekInStream *p, void *buf, size_t *size);
-		static SRes Seek(const ISeekInStream *p, Int64 *pos, ESzSeek origin);
-
-		ISeekInStream vt;
-		hostfs::File *file;
-	};
-
 	CSzArEx szarchive;
 	UInt32 block_idx;				/* it can have any value before first call (if outBuffer = 0) */
 	Byte *out_buffer;				/* it must be 0 before first call for each new archive. */
 	size_t out_buffer_size;			/* it can have any value before first call (if outBuffer = 0) */
-	ArchiveStream archiveStream;
+	CFileInStream archiveStream;
 	CLookToRead2 lookStream;

 };
@@ -1,9 +0,0 @@
-target_sources(${PROJECT_NAME} PRIVATE
-        7zArchive.cpp
-        7zArchive.h
-        archive.cpp
-        archive.h
-        rzip.cpp
-        rzip.h
-        ZipArchive.cpp
-        ZipArchive.h)
@@ -20,133 +20,18 @@
 */
 #include "ZipArchive.h"

-#include <array>
-
 ZipArchive::~ZipArchive()
 {
 	zip_close(zip);
 }

-static zip_int64_t ZipSourceCallback(void *userdata, void *data, zip_uint64_t len, zip_source_cmd_t cmd)
-{
-	using Error = std::array<int, 2>;
-	static Error error = {ZIP_ER_OK, 0};
-	auto file = static_cast<hostfs::File*>(userdata);
-
-	switch (cmd)
-	{
-		case ZIP_SOURCE_OPEN:
-			return 0;
-
-		case ZIP_SOURCE_READ:
-		{
-			const auto bytes_read = file->read(data, 1, len);
-
-			if (file->error())
-			{
-				error = {ZIP_ER_INTERNAL, 0};
-				return -1;
-			}
-
-			return bytes_read;
-		}
-
-		case ZIP_SOURCE_CLOSE:
-			return 0;
-
-		case ZIP_SOURCE_STAT:
-		{
-			auto size = file->size();
-
-			if (size == -1)
-			{
-				error = {ZIP_ER_INTERNAL, 0};
-				return -1;
-			}
-
-			auto stat = static_cast<zip_stat_t*>(data);
-			zip_stat_init(stat);
-
-			stat->valid |= ZIP_STAT_SIZE;
-			stat->size = size;
-
-			return sizeof(*stat);
-		}
-
-		case ZIP_SOURCE_ERROR:
-		{
-			auto error_out = static_cast<std::array<int, 2>*>(data);
-			*error_out = error;
-			return sizeof(*error_out);
-		}
-
-		case ZIP_SOURCE_FREE:
-			delete file;
-			return 0;
-
-		case ZIP_SOURCE_SEEK:
-		{
-			zip_error_t error;
-			auto seek_info = ZIP_SOURCE_GET_ARGS(zip_source_args_seek, data, len, &error);
-
-			if (seek_info == nullptr)
-			{
-				error = {ZIP_ER_INTERNAL, 0};
-				return -1;
-			}
-
-			if (file->seek(seek_info->offset, seek_info->whence) != 0)
-			{
-				error = {ZIP_ER_INTERNAL, 0};
-				return -1;
-			}
-
-			return 0;
-		}
-
-		case ZIP_SOURCE_TELL:
-		{
-			const auto position = file->tell();
-
-			if (position == -1)
-			{
-				error = {ZIP_ER_INTERNAL, 0};
-				return -1;
-			}
-
-			return position;
-		}
-
-		case  ZIP_SOURCE_SUPPORTS:
-			return zip_source_make_command_bitmap(
-				ZIP_SOURCE_OPEN,
-				ZIP_SOURCE_READ,
-				ZIP_SOURCE_CLOSE,
-				ZIP_SOURCE_STAT,
-				ZIP_SOURCE_ERROR,
-				ZIP_SOURCE_FREE,
-				ZIP_SOURCE_SEEK,
-				ZIP_SOURCE_TELL,
-				ZIP_SOURCE_SUPPORTS,
-				-1
-			);
-
-		default:
-			break;
-	}
-
-	// Unsupported command.
-	error = {ZIP_ER_OPNOTSUPP, 0};
-	return -1;
-}
-
-bool ZipArchive::Open(hostfs::File *file)
+bool ZipArchive::Open(FILE *file)
 {
 	zip_error_t error;
-	zip_source_t *source = zip_source_function_create(ZipSourceCallback, file, &error);
+	zip_source_t *source = zip_source_filep_create(file, 0, -1, &error);
 	if (source == nullptr)
 	{
-		delete file;
+		std::fclose(file);
 		return false;
 	}
 	zip = zip_open_from_source(source, 0, nullptr);
@@ -31,7 +31,7 @@ public:
 	ArchiveFile* OpenFile(const char* name) override;
 	ArchiveFile* OpenFileByCrc(u32 crc) override;

-	bool Open(hostfs::File *file) override;
+	bool Open(FILE *file) override;
 	bool Open(const void *data, size_t size);

 	ArchiveFile *OpenFirstFile();
@@ -26,7 +26,7 @@

 Archive *OpenArchive(const std::string& path)
 {
-	hostfs::File *file = nullptr;
+	FILE *file = nullptr;
 	hostfs::FileInfo fileInfo;
 	try {
 		fileInfo = hostfs::storage().getFileInfo(path);
@@ -74,7 +74,7 @@ Archive *OpenArchive(const std::string& path)

 bool Archive::Open(const char* path)
 {
-	hostfs::File *file = hostfs::storage().openFile(path, "rb");
+	FILE *file = nowide::fopen(path, "rb");
 	if (file == nullptr)
 		return false;
 	return Open(file);
@@ -21,7 +21,6 @@
 #pragma once

 #include "types.h"
-#include "oslib/storage.h"

 class ArchiveFile
 {
@@ -40,7 +39,7 @@ public:
 	virtual ArchiveFile *OpenFileByCrc(u32 crc) = 0;

 protected:
-	virtual bool Open(hostfs::File *file) = 0;
+	virtual bool Open(FILE *file) = 0;

 private:
 	bool Open(const char *name);
@@ -23,27 +23,27 @@

 const u8 RZipHeader[8] = { '#', 'R', 'Z', 'I', 'P', 'v', 1, '#' };

-bool RZipFile::Open(hostfs::File *file, bool write)
+bool RZipFile::Open(FILE *file, bool write)
 {
 	verify(this->file == nullptr);
 	verify(file != nullptr);
-	startOffset = file->tell();
+	startOffset = std::ftell(file);
 	if (!write)
 	{
 		u8 header[sizeof(RZipHeader)];
-		if (file->read(header, sizeof(header), 1) != 1
+		if (std::fread(header, sizeof(header), 1, file) != 1
 			|| memcmp(header, RZipHeader, sizeof(header))
-			|| file->read(&maxChunkSize, sizeof(maxChunkSize), 1) != 1
-			|| file->read(&size, sizeof(size), 1) != 1)
+			|| std::fread(&maxChunkSize, sizeof(maxChunkSize), 1, file) != 1
+			|| std::fread(&size, sizeof(size), 1, file) != 1)
 		{
-			file->seek(startOffset, SEEK_SET);
+			std::fseek(file, startOffset, SEEK_SET);
 			return false;
 		}
 		// savestates created on 32-bit platforms used to have a 32-bit size
 		if (size >> 32 != 0)
 		{
 			size &= 0xffffffff;
-			file->seek(-4, SEEK_CUR);
+			std::fseek(file, -4, SEEK_CUR);
 		}
 		chunk = new u8[maxChunkSize];
 		chunkIndex = 0;
@@ -52,11 +52,11 @@ bool RZipFile::Open(hostfs::File *file, bool write)
 	else
 	{
 		maxChunkSize = 1_MB;
-		if (file->write(RZipHeader, sizeof(RZipHeader), 1) != 1
-			|| file->write(&maxChunkSize, sizeof(maxChunkSize), 1) != 1
-			|| file->write(&size, sizeof(size), 1) != 1)
+		if (std::fwrite(RZipHeader, sizeof(RZipHeader), 1, file) != 1
+			|| std::fwrite(&maxChunkSize, sizeof(maxChunkSize), 1, file) != 1
+			|| std::fwrite(&size, sizeof(size), 1, file) != 1)
 		{
-			file->seek(startOffset, SEEK_SET);
+			std::fseek(file, startOffset, SEEK_SET);
 			return false;
 		}
 	}
@@ -67,7 +67,7 @@ bool RZipFile::Open(hostfs::File *file, bool write)

 bool RZipFile::Open(const std::string& path, bool write)
 {
-	hostfs::File *f = hostfs::storage().openFile(path.c_str(), write ? "wb" : "rb");
+	FILE *f = nowide::fopen(path.c_str(), write ? "wb" : "rb");
 	if (f == nullptr)
 		return false;
 	if (!Open(f, write)) {
@@ -83,10 +83,10 @@ void RZipFile::Close()
 	{
 		if (write)
 		{
-			file->seek(startOffset + sizeof(RZipHeader) + sizeof(maxChunkSize), SEEK_SET);
-			file->write(&size, sizeof(size), 1);
+			std::fseek(file, startOffset + sizeof(RZipHeader) + sizeof(maxChunkSize), SEEK_SET);
+			std::fwrite(&size, sizeof(size), 1, file);
 		}
-		delete file;
+		std::fclose(file);
 		file = nullptr;
 		if (chunk != nullptr)
 		{
@@ -110,12 +110,12 @@ size_t RZipFile::Read(void *data, size_t length)
 			chunkSize = 0;
 			chunkIndex = 0;
 			u32 zippedSize;
-			if (file->read(&zippedSize, sizeof(zippedSize), 1) != 1)
+			if (std::fread(&zippedSize, sizeof(zippedSize), 1, file) != 1)
 				break;
 			if (zippedSize == 0)
 				continue;
 			u8 *zipped = new u8[zippedSize];
-			if (file->read(zipped, zippedSize, 1) != 1)
+			if (std::fread(zipped, zippedSize, 1, file) != 1)
 			{
 				delete [] zipped;
 				break;
@@ -161,8 +161,8 @@ size_t RZipFile::Write(const void *data, size_t length)
 			break;
 		}
 		u32 sz = (u32)zippedSize;
-		if (file->write(&sz, sizeof(sz), 1) != 1
-			|| file->write(zipped, zippedSize, 1) != 1)
+		if (std::fwrite(&sz, sizeof(sz), 1, file) != 1
+			|| std::fwrite(zipped, zippedSize, 1, file) != 1)
 		{
 			rv = 0;
 			break;
@@ -21,7 +21,6 @@

 #pragma once
 #include "types.h"
-#include "oslib/storage.h"

 class RZipFile
 {
@@ -29,15 +28,15 @@ public:
 	~RZipFile() { Close(); }

 	bool Open(const std::string& path, bool write);
-	bool Open(hostfs::File *file, bool write);
+	bool Open(FILE *file, bool write);
 	void Close();
 	size_t Size() const { return size; }
 	size_t Read(void *data, size_t length);
 	size_t Write(const void *data, size_t length);
-	hostfs::File *rawFile() const { return file; }
+	FILE *rawFile() const { return file; }

 private:
-	hostfs::File *file = nullptr;
+	FILE *file = nullptr;
 	u64 size = 0;
 	u32 maxChunkSize = 0;
 	u8 *chunk = nullptr;
@@ -1,17 +0,0 @@
-target_sources(${PROJECT_NAME} PRIVATE
-        audiostream.h)
-
-if(NOT LIBRETRO)
-    target_sources(${PROJECT_NAME} PRIVATE
-            audiobackend_alsa.cpp
-            audiobackend_coreaudio.cpp
-            audiobackend_directsound.cpp
-            audiobackend_libao.cpp
-            audiobackend_null.cpp
-            audiobackend_oboe.cpp
-            audiobackend_omx.cpp
-            audiobackend_oss.cpp
-            audiobackend_pulseaudio.cpp
-            audiobackend_sdl2.cpp
-            audiostream.cpp)
-endif()
@@ -20,7 +20,7 @@ public:
 	{
 		snd_pcm_hw_params_t *params;

-		std::string device = config::loadStr("alsa", "device");
+		std::string device = cfgLoadStr("alsa", "device", "");

 		int rc = -1;
 		if (!device.empty() && device != "auto") {
@@ -1,5 +1,5 @@
 #include "audiostream.h"
-#include "oslib/i18n.h"
+
 #include <chrono>
 #include <thread>

@@ -9,7 +9,7 @@ class NullAudioBackend : public AudioBackend

 public:
 	NullAudioBackend()
-		: AudioBackend("null", Tnop("No Audio")) {}
+		: AudioBackend("null", "No Audio") {}

 	bool init() override
 	{
@@ -19,20 +19,17 @@ public:

 	u32 push(const void* frame, u32 samples, bool wait) override
 	{
-		if (wait && last_time.time_since_epoch() != the_clock::duration::zero())
+		if (wait)
 		{
-			auto fduration = std::chrono::nanoseconds(1'000'000'000LL * samples / 44100);
-			auto duration = fduration - (the_clock::now() - last_time);
-			if (duration > std::chrono::nanoseconds::zero())
+			if (last_time.time_since_epoch() != the_clock::duration::zero())
+			{
+				auto fduration = std::chrono::nanoseconds(1000000000L * samples / 44100);
+				auto duration = fduration - (the_clock::now() - last_time);
 				std::this_thread::sleep_for(duration);
-			if (duration < -std::chrono::milliseconds(67))
-				// if ~4 frames ahead, reset time (fast forward detection)
-				last_time = the_clock::now();
-			else
 				last_time += fduration;
-		}
-		else {
-			last_time = the_clock::now();
+			}
+			else
+				last_time = the_clock::now();
 		}
 		return 1;
 	}
@@ -48,10 +45,6 @@ public:
 		return samples;
 	}

-	std::string getName() const override {
-		return i18n::Ts(name);
-	}
-
 private:
 	the_clock::time_point last_time;
 };
@@ -19,13 +19,12 @@
 #ifdef USE_OBOE
 #include "audiostream.h"
 #include "cfg/option.h"
-#include "stdclass.h"
-#include "oslib/i18n.h"
 #include <oboe/Oboe.h>
 #include <vector>
 #include <algorithm>
 #include <atomic>
 #include <memory>
+#include "stdclass.h"

 class OboeBackend : AudioBackend
 {
@@ -78,7 +77,7 @@ class OboeBackend : AudioBackend

 public:
 	OboeBackend()
-		: AudioBackend("Oboe", Tnop("Automatic AAudio / OpenSL selection")), audioCallback(this), errorCallback(this) {}
+		: AudioBackend("Oboe", "Automatic AAudio / OpenSL selection"), audioCallback(this), errorCallback(this) {}

 	bool init() override
 	{
@@ -196,11 +195,6 @@ public:
 		}
 		return std::max(0, result.value());
 	}
-
-
-	std::string getName() const override {
-		return i18n::Ts(name);
-	}
 };
 static OboeBackend oboeBackend;

@@ -10,87 +10,29 @@ class OSSAudioBackend : public AudioBackend
 	int audioFD = -1;
 	int recordFD = -1;

-	static int openDevice(int flags)
-	{
-		const char* path = "/dev/dsp";
-		int fd = open(path, flags);
-
-		if (fd < 0)
-			ERROR_LOG(AUDIO, "OSS: open(%s) failed: %s", path, strerror(errno));
-
-		return fd;
-	}
-
-	static bool setRate(int fd, int rate)
-	{
-		int tmp = rate;
-
-		if (ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0)
-		{
-			ERROR_LOG(AUDIO, "OSS: ioctl(SNDCTL_DSP_SPEED) failed: %s", strerror(errno));
-			return false;
-		}
-
-		if (tmp != rate)
-		{
-			ERROR_LOG(AUDIO, "OSS: sample rate unsupported: %d => %d", rate, tmp);
-			return false;
-		}
-
-		return true;
-	}
-
-	static bool setChannels(int fd, int channels)
-	{
-		int tmp = channels;
-
-		if (ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0)
-		{
-			ERROR_LOG(AUDIO, "OSS: ioctl(SNDCTL_DSP_CHANNELS) failed: %s", strerror(errno));
-			return false;
-		}
-
-		if (tmp != channels)
-		{
-			ERROR_LOG(AUDIO, "OSS: channels unsupported: %d => %d", channels, tmp);
-			return false;
-		}
-
-		return true;
-	}
-
-	static bool setFormat(int fd, int format)
-	{
-		int tmp = format;
-
-		if (ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0)
-		{
-			ERROR_LOG(AUDIO, "OSS: ioctl(SNDCTL_DSP_SETFMT) failed: %s", strerror(errno));
-			return false;
-		}
-
-		if (tmp != format)
-		{
-			ERROR_LOG(AUDIO, "OSS: sample format unsupported: %#.8x => %#.8x", format, tmp);
-			return false;
-		}
-
-		return true;
-	}
-
 public:
 	OSSAudioBackend()
 		: AudioBackend("oss", "Open Sound System") {}

 	bool init() override
 	{
-		audioFD = openDevice(O_WRONLY);
-
-		if (audioFD < 0 || !setRate(audioFD, 44100) || !setChannels(audioFD, 2) || !setFormat(audioFD, AFMT_S16_LE))
+		audioFD = open("/dev/dsp", O_WRONLY);
+		if (audioFD < 0)
 		{
-			term();
+			WARN_LOG(AUDIO, "Couldn't open /dev/dsp.");
 			return false;
 		}
+		INFO_LOG(AUDIO, "sound enabled, dsp opened for write");
+		int tmp=44100;
+		int err_ret;
+		err_ret=ioctl(audioFD,SNDCTL_DSP_SPEED,&tmp);
+		INFO_LOG(AUDIO, "set Frequency to %i, return %i (rate=%i)", 44100, err_ret, tmp);
+		int channels=2;
+		err_ret=ioctl(audioFD, SNDCTL_DSP_CHANNELS, &channels);
+		INFO_LOG(AUDIO, "set dsp to stereo (%i => %i)", channels, err_ret);
+		int format=AFMT_S16_LE;
+		err_ret=ioctl(audioFD, SNDCTL_DSP_SETFMT, &format);
+		INFO_LOG(AUDIO, "set dsp to %s audio (%i/%i => %i)", "16bits signed", AFMT_S16_LE, format, err_ret);

 		return true;
 	}
@@ -112,11 +54,34 @@ public:

 	bool initRecord(u32 sampling_freq) override
 	{
-		recordFD = openDevice(O_RDONLY);
-
-		if (recordFD < 0 || !setRate(recordFD, sampling_freq) || !setChannels(recordFD, 1) || !setFormat(recordFD, AFMT_S16_NE /* Native 16 bits */ ))
+		recordFD = open("/dev/dsp", O_RDONLY);
+		if (recordFD < 0)
 		{
-			termRecord();
+			INFO_LOG(AUDIO, "OSS: can't open default audio capture device");
+			return false;
+		}
+		int tmp = AFMT_S16_NE;	// Native 16 bits
+		if (ioctl(recordFD, SNDCTL_DSP_SETFMT, &tmp) == -1 || tmp != AFMT_S16_NE)
+		{
+			INFO_LOG(AUDIO, "OSS: can't set sample format");
+			close(recordFD);
+			recordFD = -1;
+			return false;
+		}
+		tmp = 1;
+		if (ioctl(recordFD, SNDCTL_DSP_CHANNELS, &tmp) == -1)
+		{
+			INFO_LOG(AUDIO, "OSS: can't set channel count");
+			close(recordFD);
+			recordFD = -1;
+			return false;
+		}
+		tmp = sampling_freq;
+		if (ioctl(recordFD, SNDCTL_DSP_SPEED, &tmp) == -1)
+		{
+			INFO_LOG(AUDIO, "OSS: can't set sample rate");
+			close(recordFD);
+			recordFD = -1;
 			return false;
 		}

@@ -66,7 +66,7 @@ class SDLAudioBackend : AudioBackend

 public:
 	SDLAudioBackend()
-		: AudioBackend("sdl2", "Simple DirectMedia Layer 2") {}
+		: AudioBackend("sdl2", "Simple DirectMedia Layer 2 Audio") {}

 	bool init() override
 	{
@@ -1,8 +1,5 @@
 #include "audiostream.h"
 #include "cfg/option.h"
-#include "emulator.h"
-
-static void registerForEvents();

 struct SoundFrame { s16 l; s16 r; };

@@ -35,7 +32,7 @@ AudioBackend *AudioBackend::getBackend(const std::string& slug)
 			autoBackend = sdlBackend;
 		if (autoBackend == nullptr)
 			autoBackend = backends->front();
-		INFO_LOG(AUDIO, "Auto-selected audio backend \"%s\" (%s).", autoBackend->slug.c_str(), autoBackend->getName().c_str());
+		INFO_LOG(AUDIO, "Auto-selected audio backend \"%s\" (%s).", autoBackend->slug.c_str(), autoBackend->name.c_str());

 		return autoBackend;
 	}
@@ -63,7 +60,6 @@ void WriteSample(s16 r, s16 l)

 void InitAudio()
 {
-	registerForEvents();
 	TermAudio();

 	std::string slug = config::AudioBackend;
@@ -75,7 +71,7 @@ void InitAudio()
 	}
 	if (currentBackend != nullptr)
 	{
-		INFO_LOG(AUDIO, "Initializing audio backend \"%s\" (%s)...", currentBackend->slug.c_str(), currentBackend->getName().c_str());
+		INFO_LOG(AUDIO, "Initializing audio backend \"%s\" (%s)...", currentBackend->slug.c_str(), currentBackend->name.c_str());
 		if (!currentBackend->init())
 		{
 			currentBackend = nullptr;
@@ -114,7 +110,7 @@ void TermAudio()
 	StopAudioRecording();
 	audio_recording_started = rec_started;
 	currentBackend->term();
-	INFO_LOG(AUDIO, "Terminating audio backend \"%s\" (%s)...", currentBackend->slug.c_str(), currentBackend->getName().c_str());
+	INFO_LOG(AUDIO, "Terminating audio backend \"%s\" (%s)...", currentBackend->slug.c_str(), currentBackend->name.c_str());
 	currentBackend = nullptr;
 }

@@ -142,19 +138,3 @@ void StopAudioRecording()
 		currentBackend->termRecord();
 	audio_recording_started = false;
 }
-
-static void registerForEvents()
-{
-	static bool done;
-	if (done)
-		return;
-	done = true;
-	// Empty the audio buffer when loading a state or terminating the game
-	const auto& callback = [](Event, void *) {
-		writePtr = 0;
-	};
-	EventManager::listen(Event::Terminate, callback);
-	EventManager::listen(Event::LoadState, callback);
-}
-
-
@@ -35,7 +35,7 @@ public:
 	virtual void termRecord() {}

 	std::string slug;
-	virtual std::string getName() const { return name; }
+	std::string name;

 	static size_t getCount() { return backends == nullptr ? 0 : backends->size(); }
 	static AudioBackend *getBackend(size_t index) { return backends == nullptr ? nullptr : (*backends)[index]; }
@@ -46,7 +46,6 @@ protected:
 		: slug(slug), name(name) {
 		registerAudioBackend(this);
 	}
-	std::string name;

 private:
 	static void registerAudioBackend(AudioBackend *backend)
@@ -73,10 +72,8 @@ constexpr u32 SAMPLE_COUNT = 512;	// AudioBackend::push() is always called with
 class RingBuffer
 {
 	std::vector<u8> buffer;
-	// The producer and the audio callback each update one cursor: keep them on
-	// separate cache lines.
-	alignas(64) std::atomic_int readCursor { 0 };
-	alignas(64) std::atomic_int writeCursor { 0 };
+	std::atomic_int readCursor { 0 };
+	std::atomic_int writeCursor { 0 };

 	u32 readSize() {
 		return (u32)((writeCursor - readCursor + buffer.size()) % buffer.size());
@@ -15,8 +15,12 @@
 //HOST_CPU
 #define CPU_X86      0x20000001
 #define CPU_ARM      0x20000002
-#define CPU_ARM64    0x20000003
+#define CPU_MIPS     0x20000003
 #define CPU_X64      0x20000004
+#define CPU_GENERIC  0x20000005 //used for pnacl, emscripten, etc
+#define CPU_PPC      0x20000006
+#define CPU_PPC64    0x20000007
+#define CPU_ARM64    0x20000008

 //FEAT_SHREC, FEAT_AREC, FEAT_DSPREC
 #define DYNAREC_NONE	0x40000001
@@ -32,19 +36,10 @@
 	#define HOST_CPU CPU_ARM
 #elif defined(__aarch64__) || defined(_M_ARM64)
 	#define HOST_CPU CPU_ARM64
+#elif defined(__mips__)
+	#define HOST_CPU CPU_MIPS
 #else
-	#error Unsupported architecture
-#endif
-
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#if TARGET_OS_SIMULATOR
-// iOS simulator
-#define TARGET_NO_REC
-#endif
-#if defined(TARGET_MAC) && HOST_CPU == CPU_ARM64
-#define TARGET_ARM_MAC
-#endif
+	#define HOST_CPU CPU_GENERIC
 #endif

 #if defined(TARGET_NO_REC)
@@ -98,14 +93,14 @@

 #ifdef _WIN32
 #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#define TARGET_UWP 1
+#define TARGET_UWP
 #endif
 #ifdef HAVE_D3D11
 #define USE_DX11
 #endif
 #endif

-#if !defined(LIBRETRO)
+#if !defined(LIBRETRO) && !defined(TARGET_NO_EXCEPTIONS)
 #define USE_GGPO
 #endif

@@ -1,12 +0,0 @@
-target_sources(${PROJECT_NAME} PRIVATE
-        option.h)
-
-if(NOT LIBRETRO)
-    target_sources(${PROJECT_NAME} PRIVATE
-            cfg.cpp
-            cfg.h
-            cl.cpp
-            ini.cpp
-            ini.h
-            option.cpp)
-endif()
@@ -1,33 +1,37 @@
 #include "cfg.h"
 #include "ini.h"
 #include "stdclass.h"
+
 #include <cerrno>

-namespace config
-{
-
 static std::string cfgPath;
-static bool autoSaving = true;
-static IniFile cfgdb;
+static bool save_config = true;
+static bool autoSave = true;

-static void saveFile()
+static emucfg::ConfigFile cfgdb;
+
+static void saveConfigFile()
 {
-	hostfs::File* cfgfile = hostfs::storage().openFile(cfgPath.c_str(), "wt");
-	if (!cfgfile) {
+	FILE* cfgfile = nowide::fopen(cfgPath.c_str(), "wt");
+	if (!cfgfile)
+	{
 		WARN_LOG(COMMON, "Error: Unable to open file '%s' for saving", cfgPath.c_str());
 	}
-	else {
+	else
+	{
 		cfgdb.save(cfgfile);
-		delete cfgfile;
+		std::fclose(cfgfile);
 	}
 }
+void cfgSaveStr(const std::string& section, const std::string& key, const std::string& value)
+{
+	cfgdb.set(section, key, value);

-static void autoSave() {
-	if (autoSaving)
-		saveFile();
+	if (save_config && autoSave)
+		saveConfigFile();
 }

-bool open()
+bool cfgOpen()
 {
 	if (get_writable_config_path("").empty())
 		// Config dir not set (android onboarding)
@@ -37,10 +41,10 @@ bool open()
 	std::string config_path_read = get_readonly_config_path(filename);
 	cfgPath = get_writable_config_path(filename);

-	hostfs::File* cfgfile = hostfs::storage().openFile(config_path_read.c_str(), "rt");
-	if (cfgfile != nullptr) {
-		cfgdb.load(cfgfile);
-		delete cfgfile;
+	FILE* cfgfile = nowide::fopen(config_path_read.c_str(), "r");
+	if(cfgfile != NULL) {
+		cfgdb.parse(cfgfile);
+		std::fclose(cfgfile);
 	}
 	else
 	{
@@ -51,85 +55,78 @@ bool open()
 		{
 			// Config file didn't exist
 			INFO_LOG(COMMON, "Creating new empty config file at '%s'", cfgPath.c_str());
-			saveFile();
+			saveConfigFile();
+		}
+		else
+		{
+			// There was some other error (may be a permissions problem or something like that)
+			save_config = false;
 		}
 	}

 	return true;
 }

-void saveStr(const std::string& section, const std::string& key, const std::string& value) {
-	cfgdb.set(section, key, value);
-	autoSave();
+std::string cfgLoadStr(const std::string& section, const std::string& key, const std::string& def)
+{
+	return cfgdb.get(section, key, def);
 }

-std::string loadStr(const std::string& section, const std::string& key, const std::string& def) {
-	return cfgdb.getString(section, key, def);
+void  cfgSaveInt(const std::string& section, const std::string& key, s32 value)
+{
+	cfgSaveStr(section, key, std::to_string(value));
 }

-void saveInt(const std::string& section, const std::string& key, int value) {
-	cfgdb.set(section, key, value);
-	autoSave();
+s32 cfgLoadInt(const std::string& section, const std::string& key, s32 def)
+{
+	return cfgdb.get_int(section, key, def);
 }

-int loadInt(const std::string& section, const std::string& key, int def) {
-	return cfgdb.getInt(section, key, def);
+int64_t cfgLoadInt64(const std::string& section, const std::string& key, int64_t def) {
+	return cfgdb.get_int64(section, key, def);
+}
+void cfgSaveInt64(const std::string& section, const std::string& key, int64_t value) {
+	cfgdb.set_int64(section, key, value);
 }

-int64_t loadInt64(const std::string& section, const std::string& key, int64_t def) {
-	return cfgdb.getInt64(section, key, def);
-}
-void saveInt64(const std::string& section, const std::string& key, int64_t value) {
-	cfgdb.set(section, key, value);
-	autoSave();
+void  cfgSaveBool(const std::string& section, const std::string& key, bool value)
+{
+	cfgSaveStr(section, key, value ? "yes" : "no");
 }

-void saveBool(const std::string& section, const std::string& key, bool value) {
-	cfgdb.set(section, key, value);
-	autoSave();
+bool  cfgLoadBool(const std::string& section, const std::string& key, bool def)
+{
+	return cfgdb.get_bool(section, key, def);
 }

-bool loadBool(const std::string& section, const std::string& key, bool def) {
-	return cfgdb.getBool(section, key, def);
-}
-
-void setTransient(const std::string& section, const std::string& key, const std::string& value) {
+void cfgSetVirtual(const std::string& section, const std::string& key, const std::string& value)
+{
 	cfgdb.set(section, key, value, true);
 }

-bool isTransient(const std::string& section, const std::string& key) {
-	return cfgdb.isTransient(section, key);
-}
-
-bool hasSection(const std::string& section) {
-	return cfgdb.hasSection(section);
-}
-
-void deleteSection(const std::string& section) {
-	cfgdb.deleteSection(section);
-}
-
-void deleteEntry(const std::string& section, const std::string& key) {
-	cfgdb.deleteEntry(section, key);
-}
-
-void setAutoSave(bool autoSaving)
+bool cfgIsVirtual(const std::string& section, const std::string& key)
 {
-	config::autoSaving = autoSaving;
-	if (autoSaving)
-		saveFile();
+	return cfgdb.is_virtual(section, key);
 }

-void saveFloat(const std::string& section, const std::string& key, float value) {
-	cfgdb.set(section, key, value);
-	autoSave();
-}
-float loadFloat(const std::string& section, const std::string& key, float def) {
-	return cfgdb.getFloat(section, key, def);
+bool cfgHasSection(const std::string& section)
+{
+	return cfgdb.has_section(section);
 }

-std::vector<std::string> getEntries(const std::string& section) {
-	return cfgdb.getEntryNames(section);
+void cfgDeleteSection(const std::string& section)
+{
+	cfgdb.delete_section(section);
 }

-}	// namespace config
+void cfgDeleteEntry(const std::string& section, const std::string& key)
+{
+	cfgdb.delete_entry(section, key);
+}
+
+void cfgSetAutoSave(bool autoSave)
+{
+	::autoSave = autoSave;
+	if (autoSave)
+		saveConfigFile();
+}
@@ -1,31 +1,22 @@
 #pragma once
-#include <cstdint>
-#include <string>
-#include <vector>

-namespace config
-{
+#include "types.h"

-bool open();
-int loadInt(const std::string& section, const std::string& key, int def = 0);
-void saveInt(const std::string& section, const std::string& key, int value);
-int64_t loadInt64(const std::string& section, const std::string& key, int64_t def = 0);
-void saveInt64(const std::string& section, const std::string& key, int64_t value);
-std::string loadStr(const std::string& section, const std::string& key, const std::string& def = {});
-void saveStr(const std::string& section, const std::string& key, const std::string& value);
-bool loadBool(const std::string& section, const std::string& key, bool def = false);
-void saveBool(const std::string& section, const std::string& key, bool value);
-float loadFloat(const std::string& section, const std::string& key, float def = 0.f);
-void saveFloat(const std::string& section, const std::string& key, float value);
-void setTransient(const std::string& section, const std::string& key, const std::string& value);
-bool isTransient(const std::string& section, const std::string& key);
+bool cfgOpen();
+s32 cfgLoadInt(const std::string& section, const std::string& key, s32 def);
+void cfgSaveInt(const std::string& section, const std::string& key, s32 value);
+int64_t cfgLoadInt64(const std::string& section, const std::string& key, int64_t def);
+void cfgSaveInt64(const std::string& section, const std::string& key, int64_t value);
+std::string cfgLoadStr(const std::string& section, const std::string& key, const std::string& def);
+void cfgSaveStr(const std::string& section, const std::string& key, const std::string& value);
+void cfgSaveBool(const std::string& section, const std::string& key, bool value);
+bool cfgLoadBool(const std::string& section, const std::string& key, bool def);
+void cfgSetVirtual(const std::string& section, const std::string& key, const std::string& value);
+bool cfgIsVirtual(const std::string& section, const std::string& key);

-void parseCommandLine(int argc, const char * const argv[]);
+void ParseCommandLine(int argc, char *argv[]);

-void setAutoSave(bool autoSave);
-bool hasSection(const std::string& section);
-void deleteSection(const std::string& section);
-void deleteEntry(const std::string& section, const std::string& key);
-
-std::vector<std::string> getEntries(const std::string& section);
-}
+void cfgSetAutoSave(bool autoSave);
+bool cfgHasSection(const std::string& section);
+void cfgDeleteSection(const std::string& section);
+void cfgDeleteEntry(const std::string& section, const std::string& key);
@@ -1,226 +1,143 @@
 /*
-	Copyright 2025 flyinghead
-
-	This file is part of Flycast.
-
-    Flycast 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 of the License, or
-    (at your option) any later version.
-
-    Flycast 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 Flycast.  If not, see <https://www.gnu.org/licenses/>.
+	Command line parsing
 */
-#include "cfg/cfg.h"
-#include "stdclass.h"
+
 #include <cstdio>
 #include <cstring>

-namespace config
-{
+#include "cfg/cfg.h"
+#include "stdclass.h"

-static void usage(const char *exe)
+static int setconfig(char *arg[], int cl)
 {
-	fprintf(stderr, "Usage: %s [option]... [<rom path>]\n", exe);
-	fprintf(stderr, "Options:\n");
-	fprintf(stderr, "-config section:key=value,...  set a transient config value.\n");
-	fprintf(stderr, "                               Transient config values won't be saved to emu.cfg.\n");
-	fprintf(stderr, "-help                          display this help\n");
-}
+	int rv=0;

-static void parseConfigOption(const std::string& str)
-{
-	char inQuote = '\0';
-	std::string section, key, value;
-	int step = 0; // section, key, value
-	for (char c : str)
+	if (cl < 1)
 	{
-		if (inQuote != '\0' && c == inQuote)
+		WARN_LOG(COMMON, "-config : invalid number of parameters, format is section:key=value,section:key=value,...");
+		return rv;
+	}
+
+	std::string value(arg[1]);
+	for(;;)
+	{		
+		auto seppos = value.find(':');
+		if (seppos == std::string::npos)
 		{
-			inQuote = false;
-			step = 0;
-			setTransient(section, key, value);
-			DEBUG_LOG(COMMON, "-config [%s] %s = %s", section.c_str(), key.c_str(), value.c_str());
-			section.clear();
-			key.clear();
-			value.clear();
+			WARN_LOG(COMMON, "-config : invalid parameter %s, format is section:key=value,section:key=value,...", value.c_str());
+			break;
+		}
+		auto eqpos = value.find('=', seppos);
+		if (eqpos == std::string::npos)
+		{
+			WARN_LOG(COMMON, "-config : invalid parameter %s, format is section:key=value,section:key=value,...", value.c_str());
+			break;
+		}
+
+		auto commapos = value.find(',', eqpos);
+
+		std::string sect = trim_ws(value.substr(0, seppos));
+		std::string key = trim_ws(value.substr(seppos + 1, eqpos - seppos - 1));
+		auto endofcurrent = (commapos == std::string::npos) ? value.size() : commapos;
+		std::string next = (commapos == std::string::npos) ? "" : trim_ws(value.substr(endofcurrent + 1, value.size() - endofcurrent));
+		value = trim_ws(value.substr(eqpos + 1, endofcurrent - eqpos - 1));
+
+		if (sect.empty() || key.empty())
+		{
+			WARN_LOG(COMMON, "-config : invalid parameter, format is section:key=value,section:key=value,...");
+			break;
+		}
+
+		INFO_LOG(COMMON, "Virtual cfg %s:%s=%s", sect.c_str(), key.c_str(), value.c_str());
+
+		cfgSetVirtual(sect, key, value);
+
+		if (commapos == std::string::npos)
+			rv++;
+
+		if (commapos != std::string::npos)
+		{
+			value = next;
 			continue;
 		}
-		switch (c)
+		else if (cl>=3 && strcmp(arg[2],",")==0)
 		{
-		case ':':
-			switch (step)
-			{
-			case 0:
-				section = trim_trailing_ws(section);
-				if (section.empty()) {
-					WARN_LOG(COMMON, "Invalid -config option '%s'. Format is: -config section:key=value,...", str.c_str());
-					return;
-				}
-				step = 1;
-				break;
-			case 1:
-				key += c;
-				break;
-			case 2:
-				value += c;
-				break;
-			}
-			break;
-		case '=':
-			switch (step)
-			{
-			case 0:
-				WARN_LOG(COMMON, "Invalid -config option '%s'. Format is: -config section:key=value,...", str.c_str());
-				return;
-			case 1:
-				key = trim_trailing_ws(key);
-				if (key.empty()) {
-					WARN_LOG(COMMON, "Invalid -config option '%s'. Format is: -config section:key=value,...", str.c_str());
-					return;
-				}
-				step = 2;
-				break;
-			case 2:
-				value += c;
-				break;
-			}
-			break;
-		case '\'':
-		case '"':
-			switch (step)
-			{
-			case 0:
-				section += c;
-				break;
-			case 1:
-				key += c;
-				break;
-			case 2:
-				if (inQuote == '\0') {
-					inQuote = c;
-					value.clear();
-				}
-				else
-					value += c;
-				break;
-			}
-			break;
-		case ',':
-			switch (step)
-			{
-			case 0:
-				// ignore consecutive commas
-				break;
-			case 1:
-				key += c;
-				break;
-			case 2:
-				if (inQuote != '\0') {
-					value += c;
-				}
-				else
-				{
-					step = 0;
-					setTransient(section, key, value);
-					DEBUG_LOG(COMMON, "-config [%s] %s = %s", section.c_str(), key.c_str(), value.c_str());
-					section.clear();
-					key.clear();
-					value.clear();
-				}
-				break;
-			}
-			break;
-		case ' ':
-			switch (step)
-			{
-			case 0:
-				// Ignore leading spaces. Inner spaces are kept (game ids such as "INITIAL D Ver.2")
-				// and trailing ones are trimmed at the ':' and '=' separators
-				if (!section.empty())
-					section += c;
-				break;
-			case 1:
-				if (!key.empty())
-					key += c;
-				break;
-			case 2:
-				value += c;
-				break;
-			}
-			break;
-		default:
-			switch (step)
-			{
-			case 0:
-				section += c;
-				break;
-			case 1:
-				key += c;
-				break;
-			case 2:
-				value += c;
-				break;
-			}
+			cl-=2;
+			arg+=2;
+			rv++;
+			continue;
 		}
+		else
+			break;
 	}
-	if (step == 2) {
-		setTransient(section, key, value);
-		DEBUG_LOG(COMMON, "-config [%s] %s = %s", section.c_str(), key.c_str(), value.c_str());
-	}
+	return rv;
 }

-void parseCommandLine(int argc, const char * const argv[])
+static int showhelp()
+{
+	printf("Usage: flycast [OPTION]... [CONTENT]\n\n");
+	printf("Options:\n");
+	printf("-config	section:key=value     add a virtual config value;\n");
+	printf("                              virtual config values won't be saved to the .cfg file\n");
+	printf("                              unless a different value is written to them\n");
+	printf("-help                         display this help\n");
+
+	exit(0);
+	return 0;
+}
+
+void ParseCommandLine(int argc,char* argv[])
 {
 	settings.content.path.clear();
-	const char *exe = argv[0];
-	for (int i = 1; i < argc; i++)
+	int cl=argc-2;
+	char** arg=argv+1;
+	while(cl>=0)
 	{
-		if (!strcmp(argv[i], "-help") || !strcmp(argv[i], "--help")) {
-			usage(exe);
-			exit(0);
-		}
-		if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "--config"))
+		if (stricmp(*arg,"-help")==0 || stricmp(*arg,"--help")==0)
 		{
-			if (i < argc - 1)
-				parseConfigOption(argv[++i]);
-			continue;
+			showhelp();
 		}
-		// macOS
-		if (!strncmp(argv[i], "-NSDocumentRevisions", 20)) {
-			i++;
-			continue;
-		}
-		if (argv[i][0] == '-') {
-			WARN_LOG(COMMON, "Ignoring unknown command line option '%s'", argv[i]);
-			continue;
-		}
-		std::string extension = get_file_extension(argv[i]);
-		if (extension == "cdi" || extension == "chd"
-				|| extension == "gdi"|| extension == "cue")
+		else if (stricmp(*arg,"-config")==0 || stricmp(*arg,"--config")==0)
 		{
-			INFO_LOG(COMMON, "Using '%s' as CD image", argv[i]);
-			settings.content.path = argv[i];
+			int as=setconfig(arg,cl);
+			cl-=as;
+			arg+=as;
 		}
-		else if (extension == "elf")
+#if defined(__APPLE__)
+		else if (!strncmp(*arg, "-NSDocumentRevisions", 20))
 		{
-			INFO_LOG(COMMON, "Using '%s' as reios elf file", argv[i]);
-			setTransient("config", "bios.UseReios", "yes");
-			settings.content.path = argv[i];
+			arg++;
+			cl--;
 		}
-		else {
-			INFO_LOG(COMMON, "Using '%s' as rom", argv[i]);
-			settings.content.path = argv[i];
+#endif
+		else if ((*arg)[0] == '-')
+		{
+			WARN_LOG(COMMON, "Ignoring unknown command line option '%s'", *arg);
 		}
-		if (i < argc - 1)
-			WARN_LOG(COMMON, "Rest of command line ignored: '%s'...", argv[i + 1]);
-		break;
+		else
+		{
+			char* extension = strrchr(*arg, '.');
+
+			if (extension
+				&& (stricmp(extension, ".cdi") == 0 || stricmp(extension, ".chd") == 0
+					|| stricmp(extension, ".gdi") == 0 || stricmp(extension, ".cue") == 0))
+			{
+				INFO_LOG(COMMON, "Using '%s' as cd image", *arg);
+				settings.content.path = *arg;
+			}
+			else if (extension && stricmp(extension, ".elf") == 0)
+			{
+				INFO_LOG(COMMON, "Using '%s' as reios elf file", *arg);
+				cfgSetVirtual("config", "bios.UseReios", "yes");
+				settings.content.path = *arg;
+			}
+			else
+			{
+				INFO_LOG(COMMON, "Using '%s' as rom", *arg);
+				settings.content.path = *arg;
+			}
+		}
+		arg++;
+		cl--;
 	}
 }
-
-}	// namespace config
@@ -1,333 +1,298 @@
-/*
-	Copyright 2025 flyinghead
-
-	This file is part of Flycast.
-
-    Flycast 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 of the License, or
-    (at your option) any later version.
-
-    Flycast 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 Flycast.  If not, see <https://www.gnu.org/licenses/>.
-*/
 #include "ini.h"
 #include "types.h"
+#include <sstream>
 #include "stdclass.h"

-#include <cctype>
+namespace emucfg {

-namespace config {
+/* ConfigEntry */

-const IniFile::Entry *IniFile::getEntry(const std::string& sectionName, const std::string& name) const
+const std::string& ConfigEntry::get_string() const
 {
-	auto it = sections.find(sectionName);
-	if (it == sections.end())
-		return nullptr;
-	const Section& section = it->second;
-	auto it2 = section.entries.find(name);
-	if (it2 == section.entries.end())
-		return nullptr;
-	return &it2->second;
+	return this->value;
 }

-const std::string *IniFile::getRaw(const std::string& section, const std::string& name) const
+int ConfigEntry::get_int()
 {
-	const Entry *entry = getEntry(section, name);
-	if (entry == nullptr)
-		return nullptr;
-	if (entry->transient)
-		return &entry->transientValue;
+	if (strstr(this->value.c_str(), "0x") != NULL)
+	{
+		return (int)strtoul(this->value.c_str(), NULL, 16);
+	}
 	else
-		return &entry->value;
+	{
+		return atoi(this->value.c_str());
+	}
 }

-const std::string& IniFile::getString(const std::string& section, const std::string& entry, const std::string& defaultValue) const
+int64_t ConfigEntry::get_int64()
 {
-	const std::string *pValue = getRaw(section, entry);
-	if (pValue == nullptr)
-		return defaultValue;
-	else
-		return *pValue;
+	int base = 10;
+	if (strstr(this->value.c_str(), "0x") != nullptr)
+		base = 16;
+	return (int64_t)strtoll(this->value.c_str(), nullptr, base);
 }

-bool IniFile::getBool(const std::string& section, const std::string& entry, bool defaultValue) const
+bool ConfigEntry::get_bool()
 {
-	const std::string *pValue = getRaw(section, entry);
-	if (pValue == nullptr)
-		return defaultValue;
-	if (!stricmp("yes", pValue->c_str())
-			|| !stricmp("true", pValue->c_str())
-			|| !stricmp("on", pValue->c_str())
-			|| !stricmp("1", pValue->c_str()))
+	if (stricmp(this->value.c_str(), "yes") == 0 ||
+		  stricmp(this->value.c_str(), "true") == 0 ||
+		  stricmp(this->value.c_str(), "on") == 0 ||
+		  stricmp(this->value.c_str(), "1") == 0)
+	{
 		return true;
+	}
 	else
+	{
 		return false;
+	}
 }

-static bool hasHexPrefix(const std::string& s)
+/* ConfigSection */
+
+bool ConfigSection::has_entry(const std::string& name)
 {
-	size_t pos = 0;
-	while (pos + 1 < s.length() && std::isspace(static_cast<unsigned char>(s[pos])))
-		pos++;
-	if (pos + 1 >= s.length())
-		return false;
-	return (s[pos] == '0' && (s[pos + 1] == 'x' || s[pos + 1] == 'X'));
+	return (this->entries.count(name) == 1);
 }

-int IniFile::getInt(const std::string& section, const std::string& entry, int defaultValue) const
+ConfigEntry* ConfigSection::get_entry(const std::string& name)
 {
-	const std::string *pValue = getRaw(section, entry);
-	if (pValue == nullptr)
-		return defaultValue;
-	std::istringstream ss(*pValue);
-	ss.imbue(std::locale::classic());
-	if (hasHexPrefix(*pValue))
-		ss.setf(std::ios_base::hex, std::ios_base::basefield);
+	if(this->has_entry(name))
+	{
+		return &this->entries[name];
+	}
+	return NULL;
+}
+
+void ConfigSection::set(const std::string& name, const std::string& value)
+{
+	ConfigEntry new_entry = { value };
+	this->entries[name] = new_entry;
+}
+
+void ConfigSection::delete_entry(const std::string& name)
+{
+	this->entries.erase(name);
+}
+
+/* ConfigFile */
+
+ConfigSection* ConfigFile::add_section(const std::string& name, bool is_virtual)
+{
+	ConfigSection new_section;
+	if (is_virtual)
+	{
+		this->virtual_sections.insert(std::make_pair(name, new_section));
+		return &this->virtual_sections[name];
+	}
+	this->sections.insert(std::make_pair(name, new_section));
+	return &this->sections[name];
+}
+
+bool ConfigFile::has_section(const std::string& name)
+{
+	return (this->virtual_sections.count(name) == 1 || this->sections.count(name) == 1);
+}
+
+bool ConfigFile::has_entry(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection* section = this->get_section(section_name, true);
+	if ((section != NULL) && section->has_entry(entry_name))
+	{
+		return true;
+	}
+	section = this->get_section(section_name, false);
+	return ((section != NULL) && section->has_entry(entry_name));
+}
+
+ConfigSection* ConfigFile::get_section(const std::string& name, bool is_virtual)
+{
+	if(is_virtual)
+	{
+		if (this->virtual_sections.count(name) == 1)
+		{
+			return &this->virtual_sections[name];
+		}
+	}
 	else
-		ss.setf(std::ios_base::dec, std::ios_base::basefield);
-	unsigned value = static_cast<unsigned>(defaultValue);
-	ss >> value;
-	if (ss)
-		return static_cast<int>(value);
-	// Compatibility for options migrated from Option<bool> to Option<int>.
-	std::string token = *pValue;
-	string_tolower(token);
-	if (token == "yes" || token == "true" || token == "on")
-		return 1;
-	if (token == "no" || token == "false" || token == "off")
-		return 0;
-	return defaultValue;
+	{
+		if (this->sections.count(name) == 1)
+		{
+			return &this->sections[name];
+		}
+	}
+	return NULL;
 }

-int64_t IniFile::getInt64(const std::string& section, const std::string& entry, int64_t defaultValue) const
+ConfigEntry* ConfigFile::get_entry(const std::string& section_name, const std::string& entry_name)
 {
-	const std::string *pValue = getRaw(section, entry);
-	if (pValue == nullptr)
-		return defaultValue;
-	std::istringstream ss(*pValue);
-	ss.imbue(std::locale::classic());
-	if (hasHexPrefix(*pValue))
-		ss.setf(std::ios_base::hex, std::ios_base::basefield);
+	ConfigSection* section = this->get_section(section_name, true);
+	if(section != NULL && section->has_entry(entry_name))
+	{
+		return section->get_entry(entry_name);
+	}
+
+		section = this->get_section(section_name, false);
+	if(section != NULL)
+	{
+		return section->get_entry(entry_name);
+	}
+	return NULL;
+
+}
+
+std::string ConfigFile::get(const std::string& section_name, const std::string& entry_name, const std::string& default_value)
+{
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
 	else
-		ss.setf(std::ios_base::dec, std::ios_base::basefield);
-	int64_t value = defaultValue;
-	ss >> value;
-	return value;
-}
-
-float IniFile::getFloat(const std::string& section, const std::string& entry, float defaultValue) const
-{
-	const std::string *pValue = getRaw(section, entry);
-	if (pValue == nullptr || pValue->empty())
-		return defaultValue;
-	std::istringstream ss(*pValue);
-	ss.imbue(std::locale::classic());
-	float value = defaultValue;
-	ss >> value;
-	return value;
-}
-
-void IniFile::setRaw(const std::string& sectionName, const std::string& entryName, const std::string& value, bool transient)
-{
-	Section& section = sections[sectionName];
-	Entry& entry = section.entries[entryName];
-	if (entry.name.empty())
-		entry.name = entryName;
-	if (transient) {
-		entry.transientValue = value;
-		entry.transient = true;
-	}
-	else {
-		entry.value = value;
-	}
-}
-
-static std::string handleEscapeSeq(const std::string& s)
-{
-	std::string ret;
-	ret.reserve(s.length());
-	for (size_t i = 0; i < s.length(); i++)
 	{
-		char c = s[i];
-		if (c == '\\' && i < s.length() - 1)
-		{
-			switch (s[++i])
-			{
-			case 'n':
-				ret += '\n';
-				break;
-			case 't':
-				ret += '\t';
-				break;
-			case 'r':
-				ret += '\r';
-				break;
-			case 'f':
-				ret += '\f';
-				break;
-			case '\\':
-				ret += '\\';
-				break;
-			default:
-				WARN_LOG(COMMON, "Unrecognized escape sequence [\\%c] in [%s]", s[i], s.c_str());
-				ret += '\\';
-				--i;
-				break;
-			}
-		}
-		else {
-			ret += c;
-		}
+		return entry->get_string();
 	}
-	return ret;
 }

-void IniFile::load(const std::string& data, bool cEscape)
+int ConfigFile::get_int(const std::string& section_name, const std::string& entry_name, int default_value)
 {
-	std::istringstream fss(data);
-	int cline = 1;
-	std::string curSection;
-	for (std::string line; std::getline(fss, line); cline++)
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
 	{
-		size_t pos = 0;
-		while (pos < line.length() && std::isspace((int8_t)line[pos]))
-			pos++;
-		if (pos == line.length() || line[pos] == ';')
-			// Ignore empty lines and comments
-			continue;
-		if (line[pos] == '[')
-		{
-			// Section
-			size_t end = line.find(']', ++pos);
-			if (end == line.npos) {
-				WARN_LOG(COMMON, "Missing ']' character - ignoring line %d: %s", cline, line.c_str());
-				continue;
-			}
-			curSection = line.substr(pos, end - pos);
-			if (cEscape)
-				curSection = handleEscapeSeq(curSection);
-		}
-		else
-		{
-			// Entry
-			pos = line.find('=', pos);
-			if (pos == line.npos) {
-				WARN_LOG(COMMON, "Malformed entry - ignoring line %d: %s", cline, line.c_str());
-				continue;
-			}
-			std::string entry = trim_ws(line.substr(0, pos), " \t");
-			if (entry.empty()) {
-				WARN_LOG(COMMON, "Invalid empty entry name - ignoring line %d: %s", cline, line.c_str());
-				continue;
-			}
-			std::string value = line.substr(pos + 1);
-			// Space characters before and after the equal sign are for readability, and not part of the entry name or value
-			if (!value.empty() && value[0] == ' ')
-				value = value.substr(1);
-			if (!value.empty() && value[0] == '"')
-			{
-				// quoted value
-				size_t end = value.rfind('"');
-				if (end == value.npos || end == 0)
-					end = value.length();
-				value = value.substr(1, end - 1);
-			}
-			if (cEscape) {
-				entry = handleEscapeSeq(entry);
-				value = handleEscapeSeq(value);
-			}
-			set(curSection, entry, value);
-		}
+		return default_value;
 	}
-}
-
-void IniFile::load(hostfs::File *file, bool cEscape)
-{
-	std::string data;
-	for (;;)
-	{
-		char buffer[4096];
-		int n = file->read(buffer, 1, sizeof(buffer));
-		if (n <= 0)
-			break;
-		data += std::string(buffer, buffer + n);
-	}
-	load(data, cEscape);
-}
-
-void IniFile::save(std::string& data) const
-{
-	std::ostringstream ss;
-	for (const auto& [sectionName, section] : sections)
-	{
-		bool sectionSaved = sectionName.empty();
-		for (const auto& [name, entry] : section.entries)
-		{
-			if (entry.transient && entry.value.empty())
-				// Don't save transient-only values
-				continue;
-			if (!sectionSaved) {
-				ss << '[' << sectionName << ']' << std::endl;
-				sectionSaved = true;
-			}
-			ss << name << " = " << entry.value << std::endl;
-		}
-		ss << std::endl;
-	}
-	data = ss.str();
-}
-
-void IniFile::save(hostfs::File *file) const
-{
-	std::string data;
-	save(data);
-	file->write(data.c_str(), 1, data.length());
-}
-
-bool IniFile::hasSection(const std::string& section) const {
-	return sections.count(section) != 0;
-}
-bool IniFile::hasEntry(const std::string& section, const std::string& name) const {
-	return getEntry(section, name) != nullptr;
-}
-bool IniFile::isTransient(const std::string& section, const std::string& name) const
-{
-	const Entry *entry = getEntry(section, name);
-	if (entry == nullptr)
-		return false;
 	else
-		return entry->transient;
+	{
+		return entry->get_int();
+	}
 }

-void IniFile::deleteSection(const std::string& section) {
-	sections.erase(section);
-}
-void IniFile::deleteEntry(const std::string& sectionName, const std::string& entry)
+int64_t ConfigFile::get_int64(const std::string& section_name, const std::string& entry_name, int64_t default_value)
 {
-	auto it = sections.find(sectionName);
-	if (it == sections.end())
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
+	else
+	{
+		return entry->get_int64();
+	}
+}
+
+bool ConfigFile::get_bool(const std::string& section_name, const std::string& entry_name, bool default_value)
+{
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
+	else
+	{
+		return entry->get_bool();
+	}
+}
+
+void ConfigFile::set(const std::string& section_name, const std::string& entry_name, const std::string& value, bool is_virtual)
+{
+	ConfigSection* section = this->get_section(section_name, is_virtual);
+	if(section == NULL)
+	{
+		section = this->add_section(section_name, is_virtual);
+	}
+	section->set(entry_name, value);
+}
+
+void ConfigFile::set_int(const std::string& section_name, const std::string& entry_name, int value, bool is_virtual)
+{
+	std::stringstream str_value;
+	str_value << value;
+	this->set(section_name, entry_name, str_value.str(), is_virtual);
+}
+
+void ConfigFile::set_int64(const std::string& section_name, const std::string& entry_name, int64_t value, bool is_virtual)
+{
+	std::stringstream str_value;
+	str_value << value;
+	this->set(section_name, entry_name, str_value.str(), is_virtual);
+}
+
+void ConfigFile::set_bool(const std::string& section_name, const std::string& entry_name, bool value, bool is_virtual)
+{
+	std::string str_value = (value ? "yes" : "no");
+	this->set(section_name, entry_name, str_value, is_virtual);
+}
+
+void ConfigFile::parse(FILE* file)
+{
+	if (file == nullptr)
 		return;
-	Section& section = it->second;
-	section.entries.erase(entry);
-}

-std::vector<std::string> IniFile::getEntryNames(const std::string& sectionName) const
-{
-	std::vector<std::string> v;
-	auto it = sections.find(sectionName);
-	if (it != sections.end())
+	char line[512];
+	std::string section;
+	int cline = 0;
+	while (true)
 	{
-		const Section& section = it->second;
-		for (const auto& [name, entry] : section.entries)
-			v.push_back(name);
+		if (std::fgets(line, sizeof(line), file) == nullptr)
+			break;
+		cline++;
+		std::string s(line);
+		s = trim_ws(s, " \r\n");
+		if (s.empty())
+			continue;
+		if (s.length() >= 3 && s[0] == '[' && s[s.length() - 1] == ']')
+		{
+			section = s.substr(1, s.length() - 2);
+			continue;
+		}
+		auto eqpos = s.find('=');
+		if (eqpos == std::string::npos)
+		{
+			WARN_LOG(COMMON, "Malformed entry on config - ignoring line %d: %s", cline, s.c_str());
+			continue;
+		}
+		std::string property = trim_ws(s.substr(0, eqpos));
+		std::string value = trim_ws(s.substr(eqpos + 1));
+		if (value.length() >= 2 && value[0] == '"' && value[value.length() - 1] == '"')
+			value = value.substr(1, value.length() - 2);
+		set(section, property, value);
 	}
-	return v;
 }

-} // namespace config
+void ConfigFile::save(FILE* file)
+{
+	for (const auto& [section_name, section] : this->sections)
+	{
+		if (!section_name.empty())
+			std::fprintf(file, "[%s]\n", section_name.c_str());
+
+		for (const auto& [entry_name, entry] : section.entries)
+		{
+			std::fprintf(file, "%s = %s\n", entry_name.c_str(), entry.get_string().c_str());
+		}
+		if (!section_name.empty())
+			std::fputc('\n', file);
+	}
+}
+
+void ConfigFile::delete_section(const std::string& section_name) {
+	sections.erase(section_name);
+	virtual_sections.erase(section_name);
+}
+
+void ConfigFile::delete_entry(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection *section = get_section(section_name, false);
+	if (section != NULL)
+		section->delete_entry(entry_name);
+}
+
+bool ConfigFile::is_virtual(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection *section = get_section(section_name, true);
+	if (section == nullptr)
+		return false;
+	return section->has_entry(entry_name);
+}
+
+} // namespace emucfg
+
@@ -1,105 +1,59 @@
-/*
-	Copyright 2025 flyinghead
-
-	This file is part of Flycast.
-
-    Flycast 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 of the License, or
-    (at your option) any later version.
-
-    Flycast 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 Flycast.  If not, see <https://www.gnu.org/licenses/>.
-*/
 #pragma once
-#include "oslib/storage.h"
+
 #include <cstdio>
 #include <map>
 #include <string>
-#include <vector>
-#include <locale>
-#include <sstream>
+#include <cstdint>

-namespace config {
+namespace emucfg {

-class IniFile
-{
-public:
-	void load(hostfs::File *file, bool cEscape = false);
-	void load(const std::string& data, bool cEscape = false);
-	void save(hostfs::File *file) const;
-	void save(std::string& data) const;
-	bool hasSection(const std::string& section) const;
-	bool hasEntry(const std::string& section, const std::string& name) const;
-	bool isTransient(const std::string& section, const std::string& name) const;
-	void deleteSection(const std::string& section);
-	void deleteEntry(const std::string& section, const std::string& name);
-
-	template<typename T>
-	void set(const std::string& section, const std::string& entry, T value, bool transient = false) {
-		setRaw(section, entry, std::to_string(value), transient);
-	}
-
-	const std::string& getString(const std::string& section, const std::string& entry, const std::string& defaultValue = {}) const;
-	const std::string& get(const std::string& section, const std::string& entry, const std::string& defaultValue = {}) const {
-		return getString(section, entry, defaultValue);
-	}
-	bool getBool(const std::string& section, const std::string& entry, bool defaultValue = false) const;
-	int getInt(const std::string& section, const std::string& entry, int defaultValue = 0) const;
-	int64_t getInt64(const std::string& section, const std::string& entry, int64_t defaultValue = 0ll) const;
-	float getFloat(const std::string& section, const std::string& entry, float defaultValue = 0.f) const;
-
-	std::vector<std::string> getEntryNames(const std::string& section) const;
-
-private:
-	struct Entry
-	{
-		std::string name;
-		std::string value;
-		std::string transientValue;
-		bool transient = false;
-	};
-	struct Section
-	{
-		std::string name;
-		std::map<std::string, Entry> entries;
-	};
-	const Entry *getEntry(const std::string& section, const std::string& entry) const;
-	const std::string *getRaw(const std::string& section, const std::string& name) const;
-	void setRaw(const std::string& section, const std::string& name, const std::string& value, bool transient);
-
-	std::map<std::string, Section> sections;
+struct ConfigEntry {
+	std::string value;
+	const std::string& get_string() const;
+	int get_int();
+	bool get_bool();
+	int64_t get_int64();
 };

-template<>
-inline void IniFile::set(const std::string& section, const std::string& entry, const std::string& value, bool transient) {
-	setRaw(section, entry, value, transient);
-}
-template<>
-inline void IniFile::set(const std::string& section, const std::string& entry, std::string value, bool transient) {
-	setRaw(section, entry, value, transient);
-}
-template<>
-inline void IniFile::set(const std::string& section, const std::string& entry, const char *value, bool transient) {
-	setRaw(section, entry, value, transient);
-}
-template<>
-inline void IniFile::set(const std::string& section, const std::string& entry, bool value, bool transient) {
-	setRaw(section, entry, value ? "yes" : "no", transient);
-}
-template<>
-inline void IniFile::set(const std::string& section, const std::string& entry, float value, bool transient)
-{
-	std::ostringstream ss;
-	ss.imbue(std::locale::classic());
-	ss.precision(7);
-	ss << value;
-	setRaw(section, entry, ss.str(), transient);
-}
+struct ConfigSection {
+	std::map<std::string, ConfigEntry> entries;
+	bool has_entry(const std::string& name);
+	void set(const std::string& name, const std::string& value);
+	void delete_entry(const std::string& name);
+	ConfigEntry* get_entry(const std::string& name);
+};
+
+struct ConfigFile {
+	private:
+		std::map<std::string, ConfigSection> sections;
+		std::map<std::string, ConfigSection> virtual_sections;
+		ConfigSection* add_section(const std::string& name, bool is_virtual);
+		ConfigSection* get_section(const std::string& name, bool is_virtual);
+		ConfigEntry* get_entry(const std::string& section_name, const std::string& entry_name);
+
+
+	public:
+		bool has_section(const std::string& name);
+		bool has_entry(const std::string& section_name, const std::string& entry_name);
+		bool is_virtual(const std::string& section_name, const std::string& entry_name);
+
+		void parse(FILE* file);
+		void save(FILE* file);
+
+		/* getting values */
+		std::string get(const std::string& section_name, const std::string& entry_name, const std::string& default_value = "");
+		int get_int(const std::string& section_name, const std::string& entry_name, int default_value = 0);
+		int64_t get_int64(const std::string& section_name, const std::string& entry_name, int64_t default_value = 0);
+		bool get_bool(const std::string& section_name, const std::string& entry_name, bool default_value = false);
+		/* setting values */
+		void set(const std::string& section_name, const std::string& entry_name, const std::string& value, bool is_virtual = false);
+		void set_int(const std::string& section_name, const std::string& entry_name, int value, bool is_virtual = false);
+		void set_int64(const std::string& section_name, const std::string& entry_name, int64_t value, bool is_virtual = false);
+		void set_bool(const std::string& section_name, const std::string& entry_name, bool value, bool is_virtual = false);
+
+		void delete_section(const std::string& section_name);
+		void delete_entry(const std::string& section_name, const std::string& entry_name);
+};
+
+} // namespace emucfg

-} // namespace config
@@ -17,7 +17,7 @@
    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "option.h"
-#include "network/net_handshake.h"
+#include "network/naomi_network.h"
 #include "debug/gdb_server.h"

 namespace config {
@@ -33,7 +33,6 @@ Option<int> Cable("Dreamcast.Cable", 3);			// TV Composite
 Option<int> Region("Dreamcast.Region", 1);			// USA
 Option<int> Broadcast("Dreamcast.Broadcast", 0);	// NTSC
 Option<int> Language("Dreamcast.Language", 1);		// English
-OptionString UILanguage("UILanguage", "");
 Option<bool> AutoLoadState("Dreamcast.AutoLoadState");
 Option<bool> AutoSaveState("Dreamcast.AutoSaveState");
 Option<int, false> SavestateSlot("Dreamcast.SavestateSlot");
@@ -41,7 +40,6 @@ Option<bool> ForceFreePlay("ForceFreePlay", true);
 Option<bool, false> FetchBoxart("FetchBoxart", true);
 Option<bool, false> BoxartDisplayMode("BoxartDisplayMode", true);
 Option<int, false> UIScaling("UIScaling", 100);
-Option<int, false> UITheme("UITheme", 0);

 // Sound

@@ -73,16 +71,12 @@ Option<bool> ShowFPS("rend.ShowFPS");
 Option<bool> RenderToTextureBuffer("rend.RenderToTextureBuffer");
 Option<bool> TranslucentPolygonDepthMask("rend.TranslucentPolygonDepthMask");
 Option<bool> ModifierVolumes("rend.ModifierVolumes", true);
-Option<int> TextureUpscale("rend.TextureUpscale2", 1);
+Option<int> TextureUpscale("rend.TextureUpscale", 1);
 Option<int> MaxFilteredTextureSize("rend.MaxFilteredTextureSize", 256);
 Option<float> ExtraDepthScale("rend.ExtraDepthScale", 1.f);
 Option<bool> CustomTextures("rend.CustomTextures");
-Option<int> PreloadCustomTextures("rend.PreloadCustomTextures", 0);
 Option<bool> DumpTextures("rend.DumpTextures");
-Option<bool> DumpUniqueTextures("rend.DumpUniqueTextures");
-Option<bool> DumpReplacedTextures("rend.DumpReplacedTextures");
 Option<int> ScreenStretching("rend.ScreenStretching", 100);
-Option<bool> StretchToFill("rend.StretchToFill");
 Option<bool> Fog("rend.Fog", true);
 Option<bool> FloatVMUs("rend.FloatVMUs");
 Option<bool> Rotate90("rend.Rotate90");
@@ -104,8 +98,6 @@ Option<int> SkipFrame("ta.skip");
 Option<int> MaxThreads("pvr.MaxThreads", 3);
 Option<int> AutoSkipFrame("pvr.AutoSkipFrame", 0);
 Option<int> RenderResolution("rend.Resolution", 480);
-Option<bool> IntegerScale("rend.IntegerScale", false);
-Option<bool> LinearInterpolation("rend.LinearInterpolation", true);
 Option<bool> VSync("rend.vsync", true);
 Option<int64_t> PixelBufferSize("rend.PixelBufferSize", 512_MB);
 Option<int> AnisotropicFiltering("rend.AnisotropicFiltering", 1);
@@ -113,29 +105,10 @@ Option<int> TextureFiltering("rend.TextureFiltering", 0); // Default
 Option<bool> ThreadedRendering("rend.ThreadedRendering", true);
 Option<bool> DupeFrames("rend.DupeFrames", false);
 Option<int> PerPixelLayers("rend.PerPixelLayers", 32);
-#ifdef TARGET_UWP
-Option<bool> NativeDepthInterpolation("rend.NativeDepthInterpolation", true);
-#else
 Option<bool> NativeDepthInterpolation("rend.NativeDepthInterpolation", false);
-#endif
 Option<bool> EmulateFramebuffer("rend.EmulateFramebuffer", false);
 Option<bool> FixUpscaleBleedingEdge("rend.FixUpscaleBleedingEdge", true);
 Option<bool> CustomGpuDriver("rend.CustomGpuDriver", false);
-Option<bool> FramePacing("rend.FramePacing", true);
-
-CustomTexturePreloadMode customTexturePreloadMode()
-{
-	const auto mode = static_cast<CustomTexturePreloadMode>(PreloadCustomTextures.get());
-	switch (mode)
-	{
-	case CustomTexturePreloadMode::Off:
-	case CustomTexturePreloadMode::SystemMemory:
-	case CustomTexturePreloadMode::VideoMemory:
-		return mode;
-	default:
-		return CustomTexturePreloadMode::Off;
-	}
-}
 #ifdef VIDEO_ROUTING
 Option<bool, false> VideoRouting("rend.VideoRouting", false);
 Option<bool, false> VideoRoutingScale("rend.VideoRoutingScale", false);
@@ -156,22 +129,9 @@ Option<bool> RamMod32MB("Dreamcast.RamMod32MB", false);
 Option<bool> OpenGlChecks("OpenGlChecks", false, "validate");

 Option<std::vector<std::string>, false> ContentPath("Dreamcast.ContentPath");
-Option<std::vector<std::string>, false> BiosPath("Dreamcast.BiosPath");
-Option<std::string, false> VMUPath("Dreamcast.VMUPath");
-Option<std::vector<std::string>, false> SavestatePath("Dreamcast.SavestatePath");
-Option<std::string, false> SavePath("Dreamcast.SavePath");
-Option<std::vector<std::string>, false> TexturePath("Dreamcast.TexturePath");
-Option<std::string, false> TextureDumpPath("Dreamcast.TextureDumpPath");
-Option<std::string, false> BoxartPath("Dreamcast.BoxartPath");
-Option<std::vector<std::string>, false> MappingsPath("Dreamcast.MappingsPath");
-Option<std::vector<std::string>, false> CheatPath("Dreamcast.CheatPath");
 Option<bool, false> HideLegacyNaomiRoms("Dreamcast.HideLegacyNaomiRoms", true);
 Option<bool, false> UploadCrashLogs("UploadCrashLogs", true);
 Option<bool, false> DiscordPresence("DiscordPresence", true);
-#if defined(__ANDROID__) && !defined(LIBRETRO)
-Option<bool, false> UseSafFilePicker("UseSafFilePicker", true);
-#endif
-OptionString LogServer("LogServer", "", "log");

 // Profiler
 Option<bool> ProfilerEnabled("Profiler.Enabled");
@@ -183,10 +143,9 @@ Option<float> ProfilerFrameWarningTime("Profiler.FrameWarningTime", 1.0f / 55.0f

 Option<bool> NetworkEnable("Enable", false, "network");
 Option<bool> ActAsServer("ActAsServer", false, "network");
-Option<bool> NaomiSatellite("NaomiSatellite", false, "network");
-OptionString DNS("DNS", "dns.flyca.st", "network");
+OptionString DNS("DNS", "46.101.91.123", "network");
 OptionString NetworkServer("server", "", "network");
-Option<int> LocalPort("LocalPort", defaultNaomiServerPort(), "network");
+Option<int> LocalPort("LocalPort", NaomiNetwork::SERVER_PORT, "network");
 Option<bool> EmulateBBA("EmulateBBA", false, "network");
 Option<bool> EnableUPnP("EnableUPnP", true, "network");
 Option<bool> GGPOEnable("GGPO", false, "network");
@@ -199,8 +158,6 @@ Option<int> GGPOChatTimeout("GGPOChatTimeout", 10, "network");
 Option<bool> NetworkOutput("NetworkOutput", false, "network");
 Option<int> MultiboardSlaves("MultiboardSlaves", 1, "network");
 Option<bool> BattleCableEnable("BattleCable", false, "network");
-Option<bool> UseDCNet("DCNet", true, "network");
-OptionString ISPUsername("ISPUsername", "flycast1", "network");

 #ifdef USE_OMX
 Option<int> OmxAudioLatency("audio_latency", 100, "omx");
@@ -211,7 +168,6 @@ Option<bool> OmxAudioHdmi("audio_hdmi", true, "omx");

 Option<int> MouseSensitivity("MouseSensitivity", 100, "input");
 Option<int> VirtualGamepadVibration("VirtualGamepadVibration", 20, "input");
-Option<int> VirtualGamepadTransparency("VirtualGamepadTransparency", 37, "input");

 std::array<Option<MapleDeviceType>, 4> MapleMainDevices {
 	Option<MapleDeviceType>("device1", MDT_SegaController, "input"),
@@ -219,38 +175,23 @@ std::array<Option<MapleDeviceType>, 4> MapleMainDevices {
 	Option<MapleDeviceType>("device3", MDT_None, "input"),
 	Option<MapleDeviceType>("device4", MDT_None, "input"),
 };
-std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {{
-	{{Option<MapleDeviceType>("device1.1", MDT_SegaVMU, "input"),
-	Option<MapleDeviceType>("device1.2", MDT_SegaVMU, "input")}},
+std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {
+	Option<MapleDeviceType>("device1.1", MDT_SegaVMU, "input"),
+	Option<MapleDeviceType>("device1.2", MDT_SegaVMU, "input"),

-	{{Option<MapleDeviceType>("device2.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device2.2", MDT_None, "input")}},
+	Option<MapleDeviceType>("device2.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device2.2", MDT_None, "input"),

-	{{Option<MapleDeviceType>("device3.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device3.2", MDT_None, "input")}},
+	Option<MapleDeviceType>("device3.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device3.2", MDT_None, "input"),

-	{{Option<MapleDeviceType>("device4.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device4.2", MDT_None, "input")}},
-}};
-
-std::array<std::array<Option<int>, 2>, 4> NetworkExpansionDevices{{
-	{{Option<int>("device1.1.net", 0, "input"),
-	Option<int>("device1.2.net", 0, "input")}},
-
-	{{Option<int>("device2.1.net", 0, "input"),
-	Option<int>("device2.2.net", 0, "input")}},
-
-	{{Option<int>("device3.1.net", 0, "input"),
-	Option<int>("device3.2.net", 0, "input")}},
-
-	{{Option<int>("device4.1.net", 0, "input"),
-	Option<int>("device4.2.net", 0, "input")}},
-}};
-Option<bool> PerGameVmu("PerGameVmu", true, "config");
+	Option<MapleDeviceType>("device4.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device4.2", MDT_None, "input"),
+};
+Option<bool> PerGameVmu("PerGameVmu", false, "config");
 #ifdef _WIN32
 Option<bool, false> UseRawInput("RawInput", false, "input");
 #endif
-Option<bool> UsePhysicalVmuMemory("UsePhysicalVmuMemory", false);

 #ifdef USE_LUA
 Option<std::string, false> LuaFileName("LuaFileName", "flycast.lua");
@@ -259,10 +200,8 @@ Option<std::string, false> LuaFileName("LuaFileName", "flycast.lua");
 // RetroAchievements

 Option<bool> EnableAchievements("Enabled", false, "achievements");
-Option<bool> ShowAchievementPopups("Show", true, "achievements");
 Option<bool> AchievementsHardcoreMode("HardcoreMode", false, "achievements");
 OptionString AchievementsUserName("UserName", "", "achievements");
 OptionString AchievementsToken("Token", "", "achievements");
-OptionString AchievementsHostUrl("HostUrl", "", "achievements");

 } // namespace config
@@ -17,16 +17,16 @@
    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
+#include <string>
+#include <vector>
+#include <array>
+#include <cmath>
+#include <type_traits>
 #include "cfg.h"
 #include "hw/maple/maple_cfg.h"
 #ifdef LIBRETRO
 #include <libretro.h>
 #endif
-#include <array>
-#include <cmath>
-#include <string>
-#include <type_traits>
-#include <vector>

 namespace config {

@@ -56,7 +56,7 @@ public:
 		{
 			if (gameId.empty())
 				return;
-			if (!hasSection(gameId))
+			if (!cfgHasSection(gameId))
 				return;
 			perGameConfig = true;
 		}
@@ -65,10 +65,10 @@ public:
 	}

 	void save() {
-		setAutoSave(false);
+		cfgSetAutoSave(false);
 		for (const auto& o : options)
 			o->save();
-		setAutoSave(true);
+		cfgSetAutoSave(true);
 	}

 	void setGameId(const std::string& gameId) {
@@ -82,7 +82,7 @@ public:
 		this->perGameConfig = perGameConfig;
 		if (!perGameConfig) {
 			if (!gameId.empty())
-				deleteSection(gameId);
+				cfgDeleteSection(gameId);
 			reset();
 		}
 	}
@@ -122,7 +122,7 @@ public:
 		else
 		{
 			set(doLoad(section, name));
-			if (isTransient(section, name))
+			if (cfgIsVirtual(section, name))
 				override(value);
 		}
 	}
@@ -141,7 +141,7 @@ public:
 			if (value == doLoad(section, name))
 			{
 				// delete existing per-game option if any
-				deleteEntry(settings.gameId, section + "." + name);
+				cfgDeleteEntry(settings.gameId, section + "." + name);
 				return;
 			}
 		}
@@ -173,14 +173,14 @@ protected:
 	std::enable_if_t<std::is_same_v<U, bool>, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		return loadBool(section, name, value);
+		return cfgLoadBool(section, name, value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same<U, int64_t>::value, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		return loadInt64(section, name, value);
+		return cfgLoadInt64(section, name, value);
 	}

 	template <typename U = T>
@@ -188,28 +188,32 @@ protected:
 			&& !std::is_same_v<U, bool> && !std::is_same_v<U, int64_t>, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		return (T)loadInt(section, name, (int)value);
+		return (T)cfgLoadInt(section, name, (int)value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same_v<U, std::string>, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		return loadStr(section, name, value);
+		return cfgLoadStr(section, name, value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same_v<float, U>, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		return loadFloat(section, name, value);
+		std::string strValue = cfgLoadStr(section, name, "");
+		if (strValue.empty())
+			return value;
+		else
+			return (float)atof(strValue.c_str());
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same_v<std::vector<std::string>, U>, T>
 	doLoad(const std::string& section, const std::string& name) const
 	{
-		std::string paths = loadStr(section, name);
+		std::string paths = cfgLoadStr(section, name, "");
 		if (paths.empty())
 			return value;
 		std::string::size_type start = 0;
@@ -268,14 +272,14 @@ protected:
 	std::enable_if_t<std::is_same_v<U, bool>>
 	doSave(const std::string& section, const std::string& name) const
 	{
-		saveBool(section, name, value);
+		cfgSaveBool(section, name, value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same<U, int64_t>::value>
 	doSave(const std::string& section, const std::string& name) const
 	{
-		saveInt64(section, name, value);
+		cfgSaveInt64(section, name, value);
 	}

 	template <typename U = T>
@@ -283,21 +287,23 @@ protected:
 		&& !std::is_same_v<U, bool> && !std::is_same_v<U, int64_t>>
 	doSave(const std::string& section, const std::string& name) const
 	{
-		saveInt(section, name, (int)value);
+		cfgSaveInt(section, name, (int)value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same_v<U, std::string>>
 	doSave(const std::string& section, const std::string& name) const
 	{
-		saveStr(section, name, value);
+		cfgSaveStr(section, name, value);
 	}

 	template <typename U = T>
 	std::enable_if_t<std::is_same_v<float, U>>
 	doSave(const std::string& section, const std::string& name) const
 	{
-		saveFloat(section, name, value);
+		char buf[64];
+		snprintf(buf, sizeof(buf), "%f", value);
+		cfgSaveStr(section, name, buf);
 	}

 	template <typename U = T>
@@ -332,7 +338,7 @@ protected:
 			else
 				s += v;
 		}
-		saveStr(section, name, s);
+		cfgSaveStr(section, name, s);
 	}

 	std::string section;
@@ -360,7 +366,6 @@ extern Option<int> Cable;		// 0 -> VGA, 1 -> VGA, 2 -> RGB, 3 -> TV Composite
 extern Option<int> Region;		// 0 -> JP, 1 -> USA, 2 -> EU, 3 -> default
 extern Option<int> Broadcast;	// 0 -> NTSC, 1 -> PAL, 2 -> PAL/M, 3 -> PAL/N, 4 -> default
 extern Option<int> Language;	// 0 -> JP, 1 -> EN, 2 -> DE, 3 -> FR, 4 -> SP, 5 -> IT, 6 -> default
-extern OptionString UILanguage;
 extern Option<bool> AutoLoadState;
 extern Option<bool> AutoSaveState;
 extern Option<int, false> SavestateSlot;
@@ -368,7 +373,6 @@ extern Option<bool> ForceFreePlay;
 extern Option<bool, false> FetchBoxart;
 extern Option<bool, false> BoxartDisplayMode;
 extern Option<int, false> UIScaling;
-extern Option<int, false> UITheme;          // 0 -> Dark, 1 -> Light, 2 -> Dreamcast, 3 -> High Contrast, 4 -> Nintendo, 5 -> Aqua Chill

 // Sound

@@ -447,19 +451,8 @@ extern Option<int> PerPixelLayers;
 #endif
 extern Option<float> ExtraDepthScale;
 extern Option<bool> CustomTextures;
-enum class CustomTexturePreloadMode : int
-{
-	Off = 0,
-	SystemMemory = 1,
-	VideoMemory = 2,
-};
-extern Option<int> PreloadCustomTextures;
-CustomTexturePreloadMode customTexturePreloadMode();
 extern Option<bool> DumpTextures;
-extern Option<bool> DumpUniqueTextures;
-extern Option<bool> DumpReplacedTextures;
 extern Option<int> ScreenStretching;	// in percent. 150 means stretch from 4/3 to 6/3
-extern Option<bool> StretchToFill;
 extern Option<bool> Fog;
 extern Option<bool> FloatVMUs;
 extern Option<bool> Rotate90;
@@ -472,8 +465,6 @@ extern Option<int> SkipFrame;
 extern Option<int> MaxThreads;
 extern Option<int> AutoSkipFrame;		// 0: none, 1: some, 2: more
 extern Option<int> RenderResolution;
-extern Option<bool> IntegerScale;
-extern Option<bool> LinearInterpolation;
 extern Option<bool> VSync;
 extern Option<int64_t> PixelBufferSize;
 extern Option<int> AnisotropicFiltering;
@@ -484,7 +475,6 @@ extern Option<bool> NativeDepthInterpolation;
 extern Option<bool> EmulateFramebuffer;
 extern Option<bool> FixUpscaleBleedingEdge;
 extern Option<bool> CustomGpuDriver;
-extern Option<bool> FramePacing;
 #ifdef VIDEO_ROUTING
 extern Option<bool, false> VideoRouting;
 extern Option<bool, false> VideoRoutingScale;
@@ -505,22 +495,9 @@ extern Option<bool> RamMod32MB;
 extern Option<bool> OpenGlChecks;

 extern Option<std::vector<std::string>, false> ContentPath;
-extern Option<std::vector<std::string>, false> BiosPath;
-extern Option<std::string, false> VMUPath;
-extern Option<std::vector<std::string>, false> SavestatePath;
-extern Option<std::string, false> SavePath;
-extern Option<std::vector<std::string>, false> TexturePath;
-extern Option<std::string, false> TextureDumpPath;
-extern Option<std::string, false> BoxartPath;
-extern Option<std::vector<std::string>, false> MappingsPath;
-extern Option<std::vector<std::string>, false> CheatPath;
 extern Option<bool, false> HideLegacyNaomiRoms;
 extern Option<bool, false> UploadCrashLogs;
 extern Option<bool, false> DiscordPresence;
-#if defined(__ANDROID__) && !defined(LIBRETRO)
-extern Option<bool, false> UseSafFilePicker;
-#endif
-extern OptionString LogServer;

 // Profiling
 extern Option<bool> ProfilerEnabled;
@@ -532,7 +509,6 @@ extern Option<float> ProfilerFrameWarningTime;

 extern Option<bool> NetworkEnable;
 extern Option<bool> ActAsServer;
-extern Option<bool> NaomiSatellite;
 extern OptionString DNS;
 extern OptionString NetworkServer;
 extern Option<int> LocalPort;
@@ -548,8 +524,6 @@ extern Option<int> GGPOChatTimeout;
 extern Option<bool> NetworkOutput;
 extern Option<int> MultiboardSlaves;
 extern Option<bool> BattleCableEnable;
-extern Option<bool> UseDCNet;
-extern OptionString ISPUsername;

 #ifdef USE_OMX
 extern Option<int> OmxAudioLatency;
@@ -560,17 +534,14 @@ extern Option<bool> OmxAudioHdmi;

 extern Option<int> MouseSensitivity;
 extern Option<int> VirtualGamepadVibration;
-extern Option<int> VirtualGamepadTransparency;
 extern std::array<Option<MapleDeviceType>, 4> MapleMainDevices;
 extern std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices;
-extern std::array<std::array<Option<int>, 2>, 4> NetworkExpansionDevices;
 extern Option<bool> PerGameVmu;
 #ifdef _WIN32
 extern Option<bool, false> UseRawInput;
 #else
 constexpr bool UseRawInput = false;
 #endif
-extern Option<bool> UsePhysicalVmuMemory;

 #ifdef USE_LUA
 extern Option<std::string, false> LuaFileName;
@@ -579,10 +550,8 @@ extern Option<std::string, false> LuaFileName;
 // RetroAchievements

 extern Option<bool> EnableAchievements;
-extern Option<bool> ShowAchievementPopups;
 extern Option<bool> AchievementsHardcoreMode;
 extern OptionString AchievementsUserName;
 extern OptionString AchievementsToken;
-extern OptionString AchievementsHostUrl;

 } // namespace config
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <utility>
-
-#include <libchdr/chd.h>
-
-#include "oslib/storage.h"
-
-namespace CHD
-{
-	namespace Callbacks
-	{
-		// Moved out here to avoid being duplicated by the template.
-		inline uint64_t fsize(struct chd_core_file *core_file)
-		{
-			auto file = static_cast<hostfs::File*>(core_file->argp);
-			return file->size();
-		}
-
-		inline size_t fread(void* buffer, size_t size, size_t count, struct chd_core_file *core_file)
-		{
-			auto file = static_cast<hostfs::File*>(core_file->argp);
-			return file->read(buffer, size, count);
-		}
-
-		inline int fclose(struct chd_core_file *core_file)
-		{
-			auto file = static_cast<hostfs::File*>(core_file->argp);
-			delete file;
-			delete core_file;
-			return 0;
-		}
-
-		inline int fseek(struct chd_core_file *core_file, int64_t offset, int whence)
-		{
-			auto file = static_cast<hostfs::File*>(core_file->argp);
-			return file->seek(offset, whence);
-		}
-	}
-}
-
-template<typename... Ts>
-inline auto chd_open_file(hostfs::File *file, Ts &&...args)
-{
-	auto core_file = new struct chd_core_file();
-
-	core_file->argp = file;
-	core_file->fsize = CHD::Callbacks::fsize;
-	core_file->fread = CHD::Callbacks::fread;
-	core_file->fclose = CHD::Callbacks::fclose;
-	core_file->fseek = CHD::Callbacks::fseek;
-
-	return chd_open_core_file(core_file, std::forward<Ts>(args)...);
-}
@@ -28,12 +28,6 @@
 #include "cfg/option.h"
 #include "emulator.h"
 #include "oslib/storage.h"
-#include "oslib/i18n.h"
-
-#include <string>
-#include <vector>
-
-using namespace i18n;

 const WidescreenCheat CheatManager::widescreen_cheats[] =
 {
@@ -82,15 +76,14 @@ const WidescreenCheat CheatManager::widescreen_cheats[] =
 		{ "MK-51136",   nullptr,    { 0x2BDDD0 }, { 0x43700000 } },		// Crazy Taxi 2 (USA)
 //		{ "HDR-0159",   nullptr,    { 0x2FBBD0 }, { 0x43700000 } },		// Crazy Taxi 2 (JP) not working
 		{ "T13004N",    nullptr,    { 0x016D94 }, { 0x44234E73 } },		// Cyber Troopers - Virtual On - Oratorio Tangram (USA)
-		{ "HDR-0040",   nullptr,    { 0x016D94 }, { 0x44234E73 } },		// Cyber Troopers - Virtual On - Oratorio Tangram (JP)
 		// D2 (USA)
 		{ "MK-51036",   nullptr,    { 0x4B5CF4, 0x4B5CC4, 0x3E92A0, 0x3E92A8, 0x3E92C0, 0x3E92C8 },
 				{ 0x3F400000, 0x43F00000, 0, 0, 0, 0 } },
 		// D2 (JP)
 		{ "T30006M",    nullptr,    { 0x4CF42C, 0x4CF45C, 0x3E1A36, 0x3E1A34, 0x3E1A3C, 0x3E1A54, 0x3E1A5C },
 				{ 0x43F00000, 0x3F400000, 0x08010000, 0, 0, 0, 0 } },
-		{ "MK-5103750", nullptr,    { 0x1FE270 }, { 0x43700000 }, { 0x43a00000 } },		// Daytona USA (PAL)
-		{ "MK-51037",   nullptr,    { 0x1FC6D0 }, { 0x43700000 }, { 0x43a00000 } },		// Daytona USA (USA)
+		{ "MK-5103750", nullptr,    { 0x1FE270 }, { 0x43700000 } },		// Daytona USA (PAL)
+		{ "MK-51037",   nullptr,    { 0x1FC6D0 }, { 0x43700000 } },		// Daytona USA (USA)
 		{ "T9501N-50",  nullptr,    { 0x9821D4 }, { 0x3F400000 } },		// Deadly Skies (PAL)
 		{ "T8116D  50", nullptr,    { 0x2E5530 }, { 0x43700000 } },		// Dead or Alive 2 (PAL)
 		{ "T3601N",     nullptr,    { 0x2F0670 }, { 0x43700000 } },		// Dead or Alive 2 (USA)
@@ -172,11 +165,10 @@ const WidescreenCheat CheatManager::widescreen_cheats[] =
 				{ 0x43F00000, 0x3F400000, 0x3F800000 } },					// Napple Tale: Arsia in Daydream (JP)
 //crash		{ "MK-51178",   nullptr,    { 0x23AF00, 0x23B160, 0x144D40, 0x2105B4, 0x705B40 },
 //				{ 0xBFAAAAAB, 0xBFAAAAAB, 0xBFAAAAAB, 0xBFAAAAAB, 0x44558000 } },	// NBA 2K2
-//		{ "T9504M",     nullptr,    { 0xCDE848, 0xCDE844 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (USA)
-//		{ "T-9502D-50", nullptr,    { 0xBDE9B0, 0xBDE9C4 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (PAL)
+		{ "T9504M",     nullptr,    { 0xCDE848, 0xCDE844 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (USA)
+		{ "T-9502D-50", nullptr,    { 0xBDE9B0, 0xBDE9C4 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (PAL)
 		{ "MK-5110250", nullptr,    { 0x87B5A4 }, { 0x43700000 } },		// Outtrigger (PAL)
 		{ "HDR-0118",   nullptr,    { 0x83E284 }, { 0x43700000 } },		// Outtrigger (JP)
-		{ "MK-51102",   nullptr,    { 0x83E284 }, { 0x43700000 } },     // Outtrigger (US)
 		{ "T15103D 50", nullptr,    { 0x1EEE78 }, { 0x3F400000 } },		// PenPen (PAL)
 		{ "T17001M",    nullptr,    { 0x1C3828 }, { 0x3F400000 } },		// PenPen TriIcelon (JP)
 		{ "MK-5110050", nullptr,    { 0x548E04, 0x0923C0 }, { 0x43E80000, 0x3F966666 } },	// Phantasy Star Online (PAL) TODO
@@ -243,10 +235,10 @@ const WidescreenCheat CheatManager::widescreen_cheats[] =
 		{ "MK-5105950", nullptr,    { 0x231EF8, 0x1EF370 }, { 0x43800000, 0x7C1EF400 } },	// Shenmue (PAL) code 1 reduces clipping
 		{ "MK-51059",   nullptr,    { 0x230250 }, { 0x43800000 }, { 0x43a00000 } },		// Shenmue (USA) Clipping
 		{ "HDR-0016",   nullptr,    { 0x22E8A0, 0x1EBE70 }, { 0x43800000, 0x7C1EBF00 } },	// Shenmue (JP) code 1 reduces clipping
-		{ "MK-5118450", nullptr,    { 0x31186C }, { 0x43800000 }, { 0x43a00000 } },		// Shenmue II (PAL) 01160FF4 0000E100 for black bars in cutscenes
+		{ "MK-5118450", nullptr,    { 0x31186C }, { 0x43800000 } },		// Shenmue II (PAL) 01160FF4 0000E100 for black bars in cutscenes
 		// Shenmue II (PAL) Alternative code without clipping or black bars. Might be demanding on real hardware.
 		// 02311880 C3A00000, 0227E198 35AA359E, 01160FF4 0000E100
-		{ "HDR-0164",   nullptr,    { 0x30D67C }, { 0x43700000 }, { 0x43a00000 } },		// Shenmue II (JP) Clipping
+		{ "HDR-0164",   nullptr,    { 0x30D67C }, { 0x43700000 } },		// Shenmue II (JP) Clipping
 		{ "T9505D",     nullptr,    { 0xD1FB14, 0x096A4C }, { 0x3F400000, 0x3FAAAAAB } },	// Silent Scope (PAL) Choose 60Hz in game options
 		{ "MK-51052",   "  E     ", { 0x502A84 }, { 0x3F400000 } },		// Skies of Arcadia (PAL)
 		{ "MK-51052",   " U      ", { 0x599158 }, { 0x3F400000 } },		// Skies of Arcadia (USA)
@@ -396,24 +388,24 @@ void CheatManager::loadCheatFile(const std::string& filename)
 		return;
 	}

-	hostfs::File* cheatfile = hostfs::storage().openFile(filename, "r");
+	FILE* cheatfile = hostfs::storage().openFile(filename, "r");
 	if (cheatfile == nullptr)
 	{
 		WARN_LOG(COMMON, "Cannot open cheat file '%s'", filename.c_str());
 		return;
 	}
-	config::IniFile cfg;
-	cfg.load(cheatfile);
-	delete cheatfile;
+	emucfg::ConfigFile cfg;
+	cfg.parse(cheatfile);
+	fclose(cheatfile);

-	int count = cfg.getInt("", "cheats", 0);
+	int count = cfg.get_int("", "cheats", 0);
 	cheats.clear();
 	for (int i = 0; count == 0 || i < count; i++)
 	{
 		std::string prefix = "cheat" + std::to_string(i) + "_";
 		Cheat cheat{};
-		cheat.description = cfg.getString("", prefix + "desc", "Cheat " + std::to_string(i + 1));
-		cheat.address = cfg.getInt("", prefix + "address", -1);
+		cheat.description = cfg.get("", prefix + "desc", "Cheat " + std::to_string(i + 1));
+		cheat.address = cfg.get_int("", prefix + "address", -1);
 		if (count == 0 && cheat.address == (u32)-1)
 			break;
 		if (cheat.address >= RAM_SIZE)
@@ -421,27 +413,27 @@ void CheatManager::loadCheatFile(const std::string& filename)
 			WARN_LOG(COMMON, "Invalid address %x", cheat.address);
 			continue;
 		}
-		cheat.type = (Cheat::Type)cfg.getInt("", prefix + "cheat_type", (int)Cheat::Type::disabled);
-		cheat.size = 1 << cfg.getInt("", prefix + "memory_search_size", 0);
-		cheat.value = cfg.getInt("", prefix + "value", cheat.value);
-		cheat.repeatCount = cfg.getInt("", prefix + "repeat_count", cheat.repeatCount);
-		cheat.repeatValueIncrement = cfg.getInt("", prefix + "repeat_add_to_value", cheat.repeatValueIncrement);
-		cheat.repeatAddressIncrement = cfg.getInt("", prefix + "repeat_add_to_address", cheat.repeatAddressIncrement);
-		cheat.enabled = cfg.getBool("", prefix + "enable", false);
-		cheat.destAddress = cfg.getInt("", prefix + "dest_address", 0);
+		cheat.type = (Cheat::Type)cfg.get_int("", prefix + "cheat_type", (int)Cheat::Type::disabled);
+		cheat.size = 1 << cfg.get_int("", prefix + "memory_search_size", 0);
+		cheat.value = cfg.get_int("", prefix + "value", cheat.value);
+		cheat.repeatCount = cfg.get_int("", prefix + "repeat_count", cheat.repeatCount);
+		cheat.repeatValueIncrement = cfg.get_int("", prefix + "repeat_add_to_value", cheat.repeatValueIncrement);
+		cheat.repeatAddressIncrement = cfg.get_int("", prefix + "repeat_add_to_address", cheat.repeatAddressIncrement);
+		cheat.enabled = cfg.get_bool("", prefix + "enable", false);
+		cheat.destAddress = cfg.get_int("", prefix + "dest_address", 0);
 		if (cheat.destAddress >= RAM_SIZE)
 		{
 			WARN_LOG(COMMON, "Invalid address %x", cheat.destAddress);
 			continue;
 		}
-		cheat.valueMask = cfg.getInt("", prefix + "address_bit_position", 0);
+		cheat.valueMask = cfg.get_int("", prefix + "address_bit_position", 0);
 		if (cheat.type != Cheat::Type::disabled)
 			cheats.push_back(cheat);
 	}
 	setActive(!cheats.empty());
 	INFO_LOG(COMMON, "%d cheats loaded", (int)cheats.size());
 	if (!cheats.empty())
-		config::saveStr("cheats", gameId, filename);
+		cfgSaveStr("cheats", gameId, filename);
 #endif
 }

@@ -453,42 +445,13 @@ void CheatManager::reset(const std::string& gameId)
 		cheats.clear();
 		setActive(false);
 		this->gameId = gameId;
-
 #ifndef LIBRETRO
-		if (!settings.raHardcoreMode && !gameId.empty())
+		if (!settings.raHardcoreMode)
 		{
-			std::string cheatFile = config::loadStr("cheats", gameId);
+			std::string cheatFile = cfgLoadStr("cheats", gameId, "");
 			if (!cheatFile.empty())
 				loadCheatFile(cheatFile);
-			else
-			{
-				// Try to auto-locate a cheat file in user-defined CheatPath
-				std::string romName = settings.content.fileName;
-				const char* exts[] = { ".cht", ".txt" };
-				for (const auto& base : config::CheatPath.get())
-				{
-					if (base.empty())
-						continue;
-					for (const char* ext : exts)
-					{
-						try
-						{
-							std::string candidate = hostfs::storage().getSubPath(base, romName + ext);
-							if (hostfs::storage().exists(candidate))
-							{
-								loadCheatFile(candidate);
-								config::saveStr("cheats", gameId, candidate);
-								goto found_cheats;
-							}
-						}
-						catch (const hostfs::StorageException&)
-						{
-						}
-					}
-				}
-			}
 		}
-found_cheats:
 #endif
 		size_t cheatCount = cheats.size();
 		if (gameId == "Fixed BOOT strapper")	// Extreme Hunting 2
@@ -509,95 +472,15 @@ found_cheats:
 		else if (gameId == "T8120D  50") {	// Dave Mirra BMX (EU)
 			cheats.emplace_back(Cheat::Type::setValue, "fix main loop time", true, 32, 0x003011cc, 0x42200000, true); // 40.0 ms
 		}
+		else if (gameId == "MK-0100") {		// F355 US
+			cheats.emplace_back(Cheat::Type::setValue, "increase datapump timeout", true, 16, 0x00131668, 1000, true);
+		}
+		else if (gameId == "T8118D  50") {	// F355 EU
+			cheats.emplace_back(Cheat::Type::setValue, "increase datapump timeout", true, 16, 0x00135588, 1000, true);
+		}
 		else if (gameId == "SAMURAI SPIRITS 6" || gameId == "T0002M") {
 			cheats.emplace_back(Cheat::Type::setValue, "fix depth", true, 16, 0x0003e602, 0x0009, true); // nop (shift by 8 bits instead of 10)
 		}
-		else if (gameId == "T-8107N") {	// Fur Fighters (US)
-			// force logging on to use more cycles
-			cheats.emplace_back(Cheat::Type::setValue, "enable logging", true, 32, 0x00314248, 1, true);
-		}
-		else if (gameId == "T-8113D-50") {	// Fur Fighters (EU)
-			// force logging on to use more cycles
-			cheats.emplace_back(Cheat::Type::setValue, "enable logging", true, 32, 0x00314228, 1, true);
-		}
-		// Dricas auth bypass
-		else if (gameId == "T6807M")		// Aero Dancing i
-		{
-			// modem
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0004b7a0, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x0004b7a0, 0xe000000b, true);		// rts, _mov #0, r0
-			// BBA
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bba bypass auth ifeq", true, 32, 0x0004af5c, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bba bypass dricas auth", true, 32, 0x0004af5c, 0xe000000b, true);
-			// IP check
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "ip check ifeq", true, 32, 0x00020860, 0x4f222fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "ip check ok", true, 32, 0x00020860, 0xe000000b, true);
-		}
-		else if (gameId == "T6809M")		// Aero Dancing i - Jikai Saku Made Matemasen
-		{
-			// modem
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0004b940, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x0004b940, 0xe000000b, true);
-			// BBA
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bba bypass auth ifeq", true, 32, 0x0004f848, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bba bypass dricas auth", true, 32, 0x0004f848, 0xe000000b, true);
-			// IP check
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "ip check ifeq", true, 32, 0x00020980, 0x4f222fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "ip check ok", true, 32, 0x00020980, 0xe000000b, true);
-		}
-		else if (gameId == "T6805M") {		// Aero Dancing F - Todoroki Tsubasa no Hatsu Hikou
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0003ed10, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x0003ed10, 0xe000000b, true);
-		}
-		else if (gameId == "HDR-0106") {	// Daytona USA (JP)
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0003ad30, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x0003ad30, 0xe000000b, true);
-		}
-		else if (gameId == "HDR-0073") {	// Sega Tetris
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x000a56f8, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x000a56f8, 0xe000000b, true);
-		}
-		else if (gameId == "T44501M") {		// Golf Shiyou Yo 2
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0013f150, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x0013f150, 0xe000000b, true);
-		}
-		else if (gameId == "T43903M") {		// Culdcept II
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x00800524, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x00800524, 0xe000000b, true);
-		}
-		else if (gameId == "HDR-0118") {	// Outtrigger (JP)
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x00139f54, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth", true, 32, 0x00139f54, 0xe000000b, true);
-		}
-		else if (gameId == "HDR-0100")		// F355 (JP)
-		{
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0ba980, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth",  true, 32, 0x0ba980, 0xe000000b, true);
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth check ifeq", true, 32, 0x0a2d3c, 0xed048900, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth check",  true, 32, 0x0a2d3c, 0xed048b00, true); // BT -> BF
-		}
-		else if (gameId == "MK-51140") {	// Ooga Booga
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "disable net check ifeq", true, 16, 0x00085d2c, 0x3630, true);
-			cheats.emplace_back(Cheat::Type::setValue, "disable net sync check",    true, 16, 0x00085d2c, 0x3330, true);
-		}
-		else if (gameId == "HDR-0006") {	// Nettou Golf
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "bypass auth ifeq", true, 32, 0x0d5fbc, 0x2fd62fe6, true);
-			cheats.emplace_back(Cheat::Type::setValue, "bypass dricas auth",  true, 32, 0x0d5fbc, 0xe000000b, true);
-		}
-		else if (gameId == "SEGA STRIKE FIGHTER IN JPN-SLAVE")
-		{
-			// hack the slave sync procedure
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "easy sync ifeq", true, 32, 0x08b66c, 0x40600000, true);
-			cheats.emplace_back(Cheat::Type::setValue,    "easy sync",      true, 32, 0x08b66c, 0x4cbebc20, true); // 3.5 -> 100000000
-		}
-		else if (gameId == "AIRLINE PILOTS IN JAPAN-SLAVE")
-		{
-			// hack the slave sync procedure
-			cheats.emplace_back(Cheat::Type::runNextIfEq, "easy sync ifeq", true, 32, 0x052ee0, 0x40200000, true);
-			cheats.emplace_back(Cheat::Type::setValue,    "easy sync",      true, 32, 0x052ee0, 0x4cbebc20, true); // 2.5 -> 100000000
-		}
-
-
 		if (cheats.size() > cheatCount)
 			setActive(true);
 	}
@@ -777,54 +660,18 @@ static std::vector<u32> parseCodes(const std::string& s)
 			}
 		}
 		else if (!curCode.empty())
-			throw FlycastException(Ts("Invalid cheat code"));
+			throw FlycastException("Invalid cheat code");
 	}
 	if (!curCode.empty())
 	{
 		if (curCode.length() != 8)
-			throw FlycastException(Ts("Invalid cheat code"));
+			throw FlycastException("Invalid cheat code");
 		codes.push_back(strtoul(curCode.c_str(), nullptr, 16));
 	}

 	return codes;
 }

-// Decrypt (some) Action Replay/Gameshark/Codebreaker/Xploder encrypted codes
-// Master codes change the encryption method and thus are not supported (07xxxxxx)
-// Taken from DCcrypt
-constexpr u32 Seeds[16] = {
-	0xA53A8888,
-	0xA1427921, 0xAC9528B1, 0xC5892354, 0x49671B12,
-	0xACC56121, 0xACB5381E, 0x765436E1, 0x9F2C3E54,
-	0x1133E312, 0xAC5E7894, 0xE9F208B1, 0x4E87DCFE,
-	0x43174312, 0x1D7A6C99, 0x874224A2
-};
-
-static u32 decryptCode(u32 v)
-{
-	constexpr u32 something = 6;
-
-	if ((v & 0xf0000000) == 0)
-		return v;
-	u32 seed = Seeds[v >> 28];
-	if (something & 4)
-		v = (((v << 1) & 0x0FFFFFFE) | ((v >> 27) & 1));
-	if (something & 2) {
-		v = (((v << 1) & 0x0FFFFFFE) | ((v >> 27) & 1));
-		v = (((v << 8) & 0x0FFFFF00) | ((v >> 20) & 0xFF));
-	}
-	if (something & 1)
-		seed >>= 4;
-	u32 ret = (seed & 0x0FFFFFFF) ^ v;
-	//if ((ret & 0x0FF00000) != 0x07100000)
-	//	something = (ret & 0x0f) + 6;
-	return ret;
-}
-
-static u32 decryptArg(u32 v) {
-	return (((v + 0x543700D0) >> 29) | ((v + 0x543700D0) * 8)) ^ Seeds[0];
-}
-
 void CheatManager::addGameSharkCheat(const std::string& name, const std::string& s)
 {
 	std::vector<u32> codes = parseCodes(s);
@@ -840,22 +687,6 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 			Cheat cheat{};
 			cheat.description = name;
 			u32 code = (codes[i] & 0xff000000) >> 24;
-			if (code & 0xf0)
-			{
-				// encrypted code
-				codes[i] = decryptCode(codes[i]);
-				code = (codes[i] & 0xff000000) >> 24;
-				if (code == 4 && i + 2 < codes.size()) {
-					// following args are also encrypted
-					codes[i + 1] = decryptArg(codes[i + 1]);
-					codes[i + 2] = decryptArg(codes[i + 2]);
-				}
-				else if (code == 0xd && i + 2 < codes.size()) {
-					// following arg is also encrypted
-					codes[i + 1] = decryptArg(codes[i + 1]);
-				}
-				// TODO Which ops have encrypted args (3, 5, E, F)? Couldn't find any
-			}
 			switch (code)
 			{
 			case 0:
@@ -864,7 +695,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 				{
 					// 8/16/32-bit write
 					if (i + 1 >= codes.size())
-						throw FlycastException(Ts("Missing value"));
+						throw FlycastException("Missing value");
 					cheat.type = Cheat::Type::setValue;
 					cheat.size = code == 0 ? 8 : code == 1 ? 16 : 32;
 					cheat.address = codes[i] & 0x00ffffff;
@@ -882,7 +713,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 							// Group write
 							int count = codes[i] & 0xffff;
 							if (i + count + 1 >= codes.size())
-								throw FlycastException(Ts("Missing values"));
+								throw FlycastException("Missing values");
 							cheat.type = Cheat::Type::setValue;
 							cheat.size = 32;
 							cheat.address = codes[++i] & 0x00ffffff;
@@ -903,7 +734,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						{
 							// 8-bit inc/decrement
 							if (i + 1 >= codes.size())
-								throw FlycastException(Ts("Missing value"));
+								throw FlycastException("Missing value");
 							cheat.type = subcode == 1 ? Cheat::Type::increase : Cheat::Type::decrease;
 							cheat.size = 8;
 							cheat.value = codes[i] & 0xff;
@@ -916,7 +747,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						{
 							// 16-bit inc/decrement
 							if (i + 1 >= codes.size())
-								throw FlycastException(Ts("Missing value"));
+								throw FlycastException("Missing value");
 							cheat.type = subcode == 3 ? Cheat::Type::increase : Cheat::Type::decrease;
 							cheat.size = 16;
 							cheat.value = codes[i] & 0xffff;
@@ -929,7 +760,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						{
 							// 32-bit inc/decrement
 							if (i + 2 >= codes.size())
-								throw FlycastException(Ts("Missing address or value"));
+								throw FlycastException("Missing address or value");
 							cheat.type = subcode == 5 ? Cheat::Type::increase : Cheat::Type::decrease;
 							cheat.size = 32;
 							cheat.address = codes[++i] & 0x00ffffff;
@@ -938,7 +769,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						}
 						break;
 					default:
-						throw FlycastException(Ts("Unsupported cheat type"));
+						throw FlycastException("Unsupported cheat type");
 					}
 				}
 				break;
@@ -946,7 +777,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 				{
 					// 32-bit repeat write
 					if (i + 2 >= codes.size())
-						throw FlycastException(Ts("Missing count or value"));
+						throw FlycastException("Missing count or value");
 					cheat.type = Cheat::Type::setValue;
 					cheat.size = 32;
 					cheat.address = codes[i] & 0x00ffffff;
@@ -960,7 +791,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 				{
 					// copy bytes
 					if (i + 2 >= codes.size())
-						throw FlycastException(Ts("Missing count or destination address"));
+						throw FlycastException("Missing count or destination address");
 					cheat.type = Cheat::Type::copy;
 					cheat.size = 8;
 					cheat.address = codes[i] & 0x00ffffff;
@@ -969,22 +800,14 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 					cheats.push_back(cheat);
 				}
 				break;
-
-			case 7:
-				// change decryption type: 071000XX (example: 07100005)
-				throw FlycastException(Ts("Master codes aren't supported"));
-
-			// TODO 0xb delay applying codes: 0b0xxxxx
-			//     Delay putting on codes for xxxxx cycles. Default 1000 (0x3e7)
-			// TODO 0xc global enable test: 0cxxxxxx vvvvvvvv
-			//     If the value at address 8Cxxxxxx is equal to vvvvvvvv, execute ALL codes;
-			//     otherwise no codes are executed. Useful for waiting until game has loaded.
-
+			// TODO 7 change decryption type
+			// TODO 0xb delay applying codes
+			// TODO 0xc global enable test
 			case 0xd:
 				{
 					// enable next code if eq/neq/lt/gt
 					if (i + 1 >= codes.size())
-						throw FlycastException(Ts("Missing count or destination address"));
+						throw FlycastException("Missing count or destination address");
 					cheat.size = 16;
 					cheat.address = codes[i] & 0x00ffffff;
 					switch (codes[++i] >> 16)
@@ -1002,7 +825,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						cheat.type = Cheat::Type::runNextIfGt;
 						break;
 					default:
-						throw FlycastException(Ts("Unsupported conditional code"));
+						throw FlycastException("Unsupported conditional code");
 					}
 					cheat.value = codes[i] & 0xffff;
 					cheats.push_back(cheat);
@@ -1012,7 +835,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 				{
 					// multiline enable codes if eq/neq/lt/gt
 					if (i + 1 >= codes.size())
-						throw FlycastException(Ts("Missing test address"));
+						throw FlycastException("Missing test address");
 					cheat.size = 16;
 					cheat.value = codes[i] & 0xffff;
 					conditionLimit = i + 1 + ((codes[i] >> 16) & 0xff);
@@ -1031,26 +854,22 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 						cheat.type = Cheat::Type::runNextIfGt;
 						break;
 					default:
-						throw FlycastException(Ts("Unsupported conditional code"));
+						throw FlycastException("Unsupported conditional code");
 					}
 					cheat.address = codes[i] & 0x00ffffff;
 					conditionCheat = cheat;
 				}
 				break;
-
-			// TODO 0xF: 0F-XXXXXX 0000YYYY
-			//    16-Bit Write Once Immediately. (Activator code)
-
 			default:
-				throw FlycastException(Ts("Unsupported cheat type"));
+				throw FlycastException("Unsupported cheat type");
 			}
 		}
 #ifndef LIBRETRO
-		std::string path = config::loadStr("cheats", gameId);
+		std::string path = cfgLoadStr("cheats", gameId, "");
 		if (path == "")
 		{
 			path = get_game_save_prefix() + ".cht";
-			config::saveStr("cheats", gameId, path);
+			cfgSaveStr("cheats", gameId, path);
 		}
 		saveCheatFile(path);
 #endif
@@ -1064,7 +883,7 @@ void CheatManager::addGameSharkCheat(const std::string& name, const std::string&
 void CheatManager::saveCheatFile(const std::string& filename)
 {
 #ifndef LIBRETRO
-	config::IniFile cfg;
+	emucfg::ConfigFile cfg;

 	int i = 0;
 	for (const Cheat& cheat : cheats)
@@ -1072,15 +891,15 @@ void CheatManager::saveCheatFile(const std::string& filename)
 		if (cheat.builtIn)
 			continue;
 		std::string prefix = "cheat" + std::to_string(i) + "_";
-		cfg.set("", prefix + "address", cheat.address);
-		cfg.set("", prefix + "address_bit_position", cheat.valueMask);
-		cfg.set("", prefix + "big_endian", false);
-		cfg.set("", prefix + "cheat_type", (int)cheat.type);
+		cfg.set_int("", prefix + "address", cheat.address);
+		cfg.set_int("", prefix + "address_bit_position", cheat.valueMask);
+		cfg.set_bool("", prefix + "big_endian", false);
+		cfg.set_int("", prefix + "cheat_type", (int)cheat.type);
 		cfg.set("", prefix + "code", "");
 		cfg.set("", prefix + "desc", cheat.description);
-		cfg.set("", prefix + "dest_address", cheat.destAddress);
-		cfg.set("", prefix + "enable", false);	// force all cheats disabled at start
-		cfg.set("", prefix + "handler", 1);
+		cfg.set_int("", prefix + "dest_address", cheat.destAddress);
+		cfg.set_bool("", prefix + "enable", false);	// force all cheats disabled at start
+		cfg.set_int("", prefix + "handler", 1);
 		int memSize;
 		switch (cheat.size) {
 		case 1:
@@ -1103,18 +922,18 @@ void CheatManager::saveCheatFile(const std::string& filename)
 			memSize = 5;
 			break;
 		}
-		cfg.set("", prefix + "memory_search_size", memSize);
-		cfg.set("", prefix + "value", cheat.value);
-		cfg.set("", prefix + "repeat_count", cheat.repeatCount);
-		cfg.set("", prefix + "repeat_add_to_value", cheat.repeatValueIncrement);
-		cfg.set("", prefix + "repeat_add_to_address", cheat.repeatAddressIncrement);
+		cfg.set_int("", prefix + "memory_search_size", memSize);
+		cfg.set_int("", prefix + "value", cheat.value);
+		cfg.set_int("", prefix + "repeat_count", cheat.repeatCount);
+		cfg.set_int("", prefix + "repeat_add_to_value", cheat.repeatValueIncrement);
+		cfg.set_int("", prefix + "repeat_add_to_address", cheat.repeatAddressIncrement);
 		i++;
 	}
-	cfg.set("", "cheats", i);
-	hostfs::File *fp = hostfs::storage().openFile(filename.c_str(), "w");
+	cfg.set_int("", "cheats", i);
+	FILE *fp = hostfs::storage().openFile(filename.c_str(), "w");
 	if (fp == nullptr)
-		throw FlycastException(Ts("Can't save cheat file"));
+		throw FlycastException("Can't save cheat file");
 	cfg.save(fp);
-	delete fp;
+	fclose(fp);
 #endif
 }
@@ -69,9 +69,6 @@ struct Cheat
 class CheatManager
 {
 public:
-	~CheatManager() {
-		reset("");
-	}
 	void reset(const std::string& gameId);
 	void apply();
 	size_t cheatCount() const { return cheats.size(); }
@@ -21,10 +21,10 @@
 #include "emulator.h"
 #include "hw/sh4/sh4_if.h"
 #include "hw/sh4/sh4_mem.h"
-#include "hw/sh4/dyna/shil.h"
+#include "hw/sh4/sh4_interpreter.h"
 #include "cfg/option.h"
 #include <array>
-#include <csignal>
+#include <signal.h>
 #include <map>

 #ifndef SIGTRAP
@@ -122,9 +122,9 @@ public:
 		for (u32 i = 0; i < Sh4RegList.size(); i++)
 		{
 			if (Sh4RegList[i] == reg_sr_status)
-				allregs[i] = Sh4cntx.sr.getFull();
+				allregs[i] = sh4_sr_GetFull();
 			else if (Sh4RegList[i] != NoReg)
-				allregs[i] = *GetRegPtr(Sh4cntx, Sh4RegList[i]);
+				allregs[i] = *GetRegPtr(Sh4RegList[i]);
 		}
 		*regs = &allregs[0];
 		return allregs.size();
@@ -134,7 +134,7 @@ public:
 	{
 		for (u32 i = 0; i < Sh4RegList.size(); i++)
 			if (Sh4RegList[i] != NoReg)
-				*GetRegPtr(Sh4cntx, Sh4RegList[i]) = regs[i];
+				*GetRegPtr(Sh4RegList[i]) = regs[i];
 	}

 	u32 readReg(u32 regNum)
@@ -143,9 +143,9 @@ public:
 			return 0;
 		Sh4RegType reg = Sh4RegList[regNum];
 		if (reg == reg_sr_status)
-			return Sh4cntx.sr.getFull();
+			return sh4_sr_GetFull();
 		if (reg != NoReg)
-			return *GetRegPtr(Sh4cntx, reg);
+			return *GetRegPtr(reg);
 		return 0;
 	}
 	void writeReg(u32 regNum, u32 value)
@@ -154,9 +154,9 @@ public:
 			return;
 		Sh4RegType reg = Sh4RegList[regNum];
 		if (reg == reg_sr_status)
-			Sh4cntx.sr.setFull(value);
+			sh4_sr_SetFull(value);
 		else if (reg != NoReg)
-			*GetRegPtr(Sh4cntx, reg) = value;
+			*GetRegPtr(reg) = value;
 	}

 	const u8 *readMem(u32 addr, u32 len)
@@ -4,29 +4,33 @@
 #include <errno.h>
 #include "cdipsr.h"

+// Global variables
+
+unsigned long temp_value;
+
+
 /////////////////////////////////////////////////////////////////////////////

-unsigned long ask_type(hostfs::File *fsource, long header_position)
+unsigned long ask_type(FILE *fsource, long header_position)
 {

 unsigned char filename_length;
 unsigned long track_mode;
-uint32_t temp_value = 0;

-    fsource->seek(header_position, SEEK_SET);
-    fsource->read(&temp_value, 4, 1);
+    fseek(fsource, header_position, SEEK_SET);
+    fread(&temp_value, 4, 1, fsource);
    if (temp_value != 0)
-       fsource->seek(8, SEEK_CUR); // extra data (DJ 3.00.780 and up)
-    fsource->seek(24, SEEK_CUR);
-    fsource->read(&filename_length, 1, 1);
-    fsource->seek(filename_length, SEEK_CUR);
-    fsource->seek(19, SEEK_CUR);
-    fsource->read(&temp_value, 4, 1);
+       fseek(fsource, 8, SEEK_CUR); // extra data (DJ 3.00.780 and up)
+    fseek(fsource, 24, SEEK_CUR);
+    fread(&filename_length, 1, 1, fsource);
+    fseek(fsource, filename_length, SEEK_CUR);
+    fseek(fsource, 19, SEEK_CUR);
+    fread(&temp_value, 4, 1, fsource);
       if (temp_value == 0x80000000)
-          fsource->seek(8, SEEK_CUR); // DJ4
-    fsource->seek(16, SEEK_CUR);
-    fsource->read(&track_mode, 4, 1);
-    fsource->seek(header_position, SEEK_SET);
+          fseek(fsource, 8, SEEK_CUR); // DJ4
+    fseek(fsource, 16, SEEK_CUR);
+    fread(&track_mode, 4, 1, fsource);
+    fseek(fsource, header_position, SEEK_SET);
    return (track_mode);
 }

@@ -34,48 +38,41 @@ uint32_t temp_value = 0;
 /////////////////////////////////////////////////////////////////////////////


-bool CDI_read_track (hostfs::File *fsource, image_s *image, track_s *track)
+void CDI_read_track (FILE *fsource, image_s *image, track_s *track)
 {

     unsigned char TRACK_START_MARK[10] = { 0, 0, 0x01, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
     unsigned char current_start_mark[10];
-     uint32_t temp_value = 0;

-         fsource->read(&temp_value, 4, 1);
+         fread(&temp_value, 4, 1, fsource);
         if (temp_value != 0)
-            fsource->seek(8, SEEK_CUR); // extra data (DJ 3.00.780 and up)
+            fseek(fsource, 8, SEEK_CUR); // extra data (DJ 3.00.780 and up)

-         fsource->read(&current_start_mark, 10, 1);
-         if (memcmp(TRACK_START_MARK, current_start_mark, 10)) {
-        	 printf("CDI_read_track: Unsupported format: Could not find the track start mark\n");
-        	 return false;
-         }
+         fread(&current_start_mark, 10, 1, fsource);
+         if (memcmp(TRACK_START_MARK, current_start_mark, 10)) printf( "Unsupported format: Could not find the track start mark");

-         fsource->read(&current_start_mark, 10, 1);
-         if (memcmp(TRACK_START_MARK, current_start_mark, 10)) {
-        	 printf("CDI_read_track: Unsupported format: Could not find the track start mark\n");
-        	 return false;
-         }
+         fread(&current_start_mark, 10, 1, fsource);
+         if (memcmp(TRACK_START_MARK, current_start_mark, 10)) printf(  "Unsupported format: Could not find the track start mark");

-         fsource->seek(4, SEEK_CUR);
-         fsource->read(&track->filename_length, 1, 1);
-         fsource->seek(track->filename_length, SEEK_CUR);
-         fsource->seek(11, SEEK_CUR);
-         fsource->seek(4, SEEK_CUR);
-         fsource->seek(4, SEEK_CUR);
-         fsource->read(&temp_value, 4, 1);
+         fseek(fsource, 4, SEEK_CUR);
+         fread(&track->filename_length, 1, 1, fsource);
+         fseek(fsource, track->filename_length, SEEK_CUR);
+         fseek(fsource, 11, SEEK_CUR);
+         fseek(fsource, 4, SEEK_CUR);
+         fseek(fsource, 4, SEEK_CUR);
+         fread(&temp_value, 4, 1, fsource);
            if (temp_value == 0x80000000)
-               fsource->seek(8, SEEK_CUR); // DJ4
-         fsource->seek(2, SEEK_CUR);
-         fsource->read(&track->pregap_length, 4, 1);
-         fsource->read(&track->length, 4, 1);
-         fsource->seek(6, SEEK_CUR);
-         fsource->read(&track->mode, 4, 1);
-         fsource->seek(12, SEEK_CUR);
-         fsource->read(&track->start_lba, 4, 1);
-         fsource->read(&track->total_length, 4, 1);
-         fsource->seek(16, SEEK_CUR);
-         fsource->read(&track->sector_size_value, 4, 1);
+               fseek(fsource, 8, SEEK_CUR); // DJ4
+         fseek(fsource, 2, SEEK_CUR);
+         fread(&track->pregap_length, 4, 1, fsource);
+         fread(&track->length, 4, 1, fsource);
+         fseek(fsource, 6, SEEK_CUR);
+         fread(&track->mode, 4, 1, fsource);
+         fseek(fsource, 12, SEEK_CUR);
+         fread(&track->start_lba, 4, 1, fsource);
+         fread(&track->total_length, 4, 1, fsource);
+         fseek(fsource, 16, SEEK_CUR);
+         fread(&track->sector_size_value, 4, 1, fsource);

         switch(track->sector_size_value)
               {
@@ -83,44 +80,39 @@ bool CDI_read_track (hostfs::File *fsource, image_s *image, track_s *track)
               case 1 : track->sector_size = 2336; break;
               case 2 : track->sector_size = 2352; break;
               case 4 : track->sector_size = 2448; break;
-               default:
-            	   printf("CDI_read_track: Unsupported sector size. value %ld\n", track->sector_size_value);
-               	   return false;
+               default: printf("Unsupported sector size. value %ld\n", track->sector_size_value);
+               		break;
               }

-         if (track->mode > 2) {
-        	 printf("CDI_read_track: Unsupported format: Track mode not supported\n");
-        	 return false;
-         }
+         if (track->mode > 2) printf( "Unsupported format: Track mode not supported");

-         fsource->seek(29, SEEK_CUR);
+         fseek(fsource, 29, SEEK_CUR);
         if (image->version != CDI_V2)
-         {
-            fsource->seek(5, SEEK_CUR);
-            fsource->read(&temp_value, 4, 1);
+            {
+            fseek(fsource, 5, SEEK_CUR);
+            fread(&temp_value, 4, 1, fsource);
            if (temp_value == 0xffffffff)
-                fsource->seek(78, SEEK_CUR); // extra data (DJ 3.00.780 and up)
-         }
-         return true;
+                fseek(fsource, 78, SEEK_CUR); // extra data (DJ 3.00.780 and up)
+            }
 }


-void CDI_skip_next_session (hostfs::File *fsource, image_s *image)
+void CDI_skip_next_session (FILE *fsource, image_s *image)
 {
-     fsource->seek(4, SEEK_CUR);
-     fsource->seek(8, SEEK_CUR);
-     if (image->version != CDI_V2) fsource->seek(1, SEEK_CUR);
+     fseek(fsource, 4, SEEK_CUR);
+     fseek(fsource, 8, SEEK_CUR);
+     if (image->version != CDI_V2) fseek(fsource, 1, SEEK_CUR);
 }

-bool CDI_get_tracks (hostfs::File *fsource, image_s *image)
+void CDI_get_tracks (FILE *fsource, image_s *image)
 {
-     return fsource->read(&image->tracks, 2, 1) == 1;
+     fread(&image->tracks, 2, 1, fsource);
 }

-bool CDI_init (hostfs::File *fsource, image_s *image, const char *fsourcename)
+bool CDI_init (FILE *fsource, image_s *image, const char *fsourcename)
 {
-	fsource->seek(0, SEEK_END);
-	image->length = fsource->tell();
+	fseek(fsource, 0, SEEK_END);
+	image->length = ftell(fsource);

 	if (image->length < 8)
 	{
@@ -128,10 +120,9 @@ bool CDI_init (hostfs::File *fsource, image_s *image, const char *fsourcename)
 		return false;
 	}

-	fsource->seek(image->length-8, SEEK_SET);
-	if (fsource->read(&image->version, 4, 1) != 1
-			|| fsource->read(&image->header_offset, 4, 1) != 1)
-		return false;
+	fseek(fsource, image->length-8, SEEK_SET);
+	fread(&image->version, 4, 1, fsource);
+	fread(&image->header_offset, 4, 1, fsource);

 	if ((image->version != CDI_V2 && image->version != CDI_V3 && image->version != CDI_V35)
 			|| image->header_offset == 0)
@@ -142,17 +133,17 @@ bool CDI_init (hostfs::File *fsource, image_s *image, const char *fsourcename)
 	return true;
 }

-bool CDI_get_sessions (hostfs::File *fsource, image_s *image)
+void CDI_get_sessions (FILE *fsource, image_s *image)
 {
 #ifndef DEBUG_CDI
     if (image->version == CDI_V35)
-        fsource->seek((image->length - image->header_offset), SEEK_SET);
+        fseek(fsource, (image->length - image->header_offset), SEEK_SET);
     else
-        fsource->seek(image->header_offset, SEEK_SET);
+        fseek(fsource, image->header_offset, SEEK_SET);

 #else
-     fsource->seek(0L, SEEK_SET);
+     fseek(fsource, 0L, SEEK_SET);
 #endif
-     return fsource->read(&image->sessions, 2, 1) == 1;
+     fread(&image->sessions, 2, 1, fsource);
 }

@@ -1,8 +1,6 @@
 #ifndef __CDI_H__
 #define __CDI_H__

-#include "../../oslib/storage.h"
-
 /* Basic structures */

 typedef struct image_s
@@ -38,11 +36,11 @@ typedef struct track_s
 #define CDI_V3  0x80000005
 #define CDI_V35 0x80000006

-unsigned long ask_type(hostfs::File *fsource, long header_position);
-bool CDI_init(hostfs::File *fsource, image_s *image, const char *fsourcename);
-bool CDI_get_sessions(hostfs::File *fsource, image_s *image);
-bool CDI_get_tracks(hostfs::File *fsource, image_s *image);
-bool CDI_read_track(hostfs::File *fsource, image_s *image, track_s *track);
-void CDI_skip_next_session(hostfs::File *fsource, image_s *image);
+unsigned long ask_type(FILE *fsource, long header_position);
+bool CDI_init(FILE *fsource, image_s *image, const char *fsourcename);
+void CDI_get_sessions(FILE *fsource, image_s *image);
+void CDI_get_tracks(FILE *fsource, image_s *image);
+void CDI_read_track(FILE *fsource, image_s *image, track_s *track);
+void CDI_skip_next_session(FILE *fsource, image_s *image);

 #endif
@@ -56,7 +56,7 @@ public:
 */
 #if defined(_WIN32)
 #  include "platform_windows.h"
-#elif defined(__unix__) || defined(__APPLE__) || defined(__SWITCH__) || defined(__HAIKU__)
+#elif defined(__unix__) || defined(__APPLE__) || defined(__SWITCH__)
 #  include "platform_linux.h"
 #else
 #  error Unsupported platform
@@ -13,15 +13,6 @@
 static const int UDP_HEADER_SIZE = 28;     /* Size of IP + UDP headers */
 static const int NUM_SYNC_PACKETS = 5;
 static const int SYNC_RETRY_INTERVAL = 2000;
-
-static bool IsValidAppData(const UdpMsg *msg, int len)
-{
-   const int header_size = (const uint8 *)msg->u.app_data.data - (const uint8 *)msg;
-   if (len < header_size)
-      return false;
-   return msg->u.app_data.size <= MAX_APPDATA_SIZE
-      && msg->u.app_data.size <= len - header_size;
-}
 static const int SYNC_FIRST_RETRY_INTERVAL = 500;
 static const int RUNNING_RETRY_INTERVAL = 200;
 static const int KEEP_ALIVE_INTERVAL    = 200;
@@ -329,13 +320,6 @@ UdpProtocol::HandlesMsg(sockaddr_in &from,
 void
 UdpProtocol::OnMsg(UdpMsg *msg, int len)
 {
-   if (len < (int)sizeof(msg->hdr)) {
-      return;
-   }
-   if (msg->hdr.type == UdpMsg::AppData && !IsValidAppData(msg, len)) {
-      return;
-   }
-
   bool handled = false;
   typedef bool (UdpProtocol::*DispatchFn)(UdpMsg *msg, int len);
   static const DispatchFn table[] = {
@@ -807,8 +791,6 @@ UdpProtocol::ClearSendQueue()

 void UdpProtocol::SendAppData(const void *data, int len, bool spectators)
 {
-	if (len < 0 || len > MAX_APPDATA_SIZE || (data == nullptr && len != 0))
-		return;
 	if (_udp == nullptr)
 		return;
 	if (_current_state != Synchronzied && _current_state != Running)
@@ -824,8 +806,6 @@ void UdpProtocol::SendAppData(const void *data, int len, bool spectators)

 bool UdpProtocol::OnAppData(UdpMsg *msg, int len)
 {
-	if (!IsValidAppData(msg, len))
-		return false;
    UdpProtocol::Event evt(UdpProtocol::Event::AppData);
    evt.u.app_data.spectators = msg->u.app_data.spectators != 0;
    evt.u.app_data.size = msg->u.app_data.size;
@@ -4,7 +4,7 @@
 * Use of this software is governed by the MIT license that can be found
 * in the LICENSE file.
 */
-#if defined(__unix__) || defined(__APPLE__) || defined(__SWITCH__) || defined(__HAIKU__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__SWITCH__)

 #include "platform_linux.h"
 #include <time.h>
@@ -13,7 +13,7 @@
 template<class T, int N> class RingBuffer
 {
 public:
-   RingBuffer() : 
+   RingBuffer<T, N>() : 
      _head(0),
      _tail(0),
      _size(0) {
@@ -13,7 +13,7 @@
 template<class T, int N> class StaticBuffer
 {
 public:
-   StaticBuffer() :
+   StaticBuffer<T, N>() :
      _size(0) {
   } 

@@ -14,8 +14,7 @@ _input_queues(NULL),
   _framecount = 0;
   _last_confirmed_frame = -1;
   _max_prediction_frames = 0;
-   _savedstate = {};
-   _rollingback = false;
+   memset(&_savedstate, 0, sizeof(_savedstate));
 }

 Sync::~Sync()
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-cmake_policy(VERSION 3.6)
+cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+cmake_policy(VERSION 3.2)

 set(GLM_VERSION "0.9.9")
 project(glm VERSION ${GLM_VERSION} LANGUAGES CXX)
@@ -2,10 +2,8 @@
 // This needs to be used along with a Platform Backend (e.g. Win32)

 // Implemented features:
-//  [X] Renderer: User texture binding. Use 'ID3D11ShaderResourceView*' as texture identifier. Read the FAQ about ImTextureID/ImTextureRef!
-//  [X] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset).
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
-//  [X] Renderer: Expose selected render state for draw callbacks to use. Access in '(ImGui_ImplXXXX_RenderState*)GetPlatformIO().Renderer_RenderState'.
+//  [X] Renderer: User texture binding. Use 'ID3D11ShaderResourceView*' as ImTextureID. Read the FAQ about ImTextureID!
+//  [X] Renderer: Large meshes support (64k+ vertices) with 16-bit indices.

 // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
 // Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
@@ -17,19 +15,12 @@

 // CHANGELOG
 // (minor and older changes stripped away, please see git history for details)
-//  2026-01-19: DirectX11: Added 'SamplerNearest' in ImGui_ImplDX11_RenderState. Renamed 'SamplerDefault' to 'SamplerLinear'.
-//  2025-09-18: Call platform_io.ClearRendererHandlers() on shutdown.
-//  2025-06-11: DirectX11: Added support for ImGuiBackendFlags_RendererHasTextures, for dynamic font atlas.
-//  2025-05-07: DirectX11: Honor draw_data->FramebufferScale to allow for custom backends and experiment using it (consistently with other renderer backends, even though in normal condition it is not set under Windows).
-//  2025-01-06: DirectX11: Expose VertexConstantBuffer in ImGui_ImplDX11_RenderState. Reset projection matrix in ImDrawCallback_ResetRenderState handler.
-//  2024-10-07: DirectX11: Changed default texture sampler to Clamp instead of Repeat/Wrap.
-//  2024-10-07: DirectX11: Expose selected render state in ImGui_ImplDX11_RenderState, which you can access in 'void* platform_io.Renderer_RenderState' during draw callbacks.
 //  2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11.
 //  2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX).
 //  2021-05-19: DirectX11: Replaced direct access to ImDrawCmd::TextureId with a call to ImDrawCmd::GetTexID(). (will become a requirement)
 //  2021-02-18: DirectX11: Change blending equation to preserve alpha in output buffer.
 //  2019-08-01: DirectX11: Fixed code querying the Geometry Shader state (would generally error with Debug layer enabled).
-//  2019-07-21: DirectX11: Backup, clear and restore Geometry Shader is any is bound when calling ImGui_ImplDX11_RenderDrawData. Clearing Hull/Domain/Compute shaders without backup/restore.
+//  2019-07-21: DirectX11: Backup, clear and restore Geometry Shader is any is bound when calling ImGui_ImplDX10_RenderDrawData. Clearing Hull/Domain/Compute shaders without backup/restore.
 //  2019-05-29: DirectX11: Added support for large mesh (64K+ vertices), enable ImGuiBackendFlags_RendererHasVtxOffset flag.
 //  2019-04-30: DirectX11: Added support for special ImDrawCallback_ResetRenderState callback to reset render state.
 //  2018-12-03: Misc: Added #pragma comment statement to automatically link with d3dcompiler.lib when using D3DCompile().
@@ -54,20 +45,7 @@
 #pragma comment(lib, "d3dcompiler") // Automatically link with d3dcompiler.lib as we are using D3DCompile() below.
 #endif

-// Clang/GCC warnings with -Weverything
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wold-style-cast"         // warning: use of old-style cast                            // yes, they are more terse.
-#pragma clang diagnostic ignored "-Wsign-conversion"        // warning: implicit conversion changes signedness
-#endif
-
-/* Flycast: Use ImTextureDX11 instead
 // DirectX11 data
-struct ImGui_ImplDX11_Texture
-{
-    ID3D11Texture2D*            pTexture;
-    ID3D11ShaderResourceView*   pTextureView;
-};
-*/
 struct ImGui_ImplDX11_Data
 {
    ID3D11Device*               pd3dDevice;
@@ -79,9 +57,10 @@ struct ImGui_ImplDX11_Data
    ID3D11InputLayout*          pInputLayout;
    ID3D11Buffer*               pVertexConstantBuffer;
    ID3D11PixelShader*          pPixelShader;
-    ID3D11SamplerState*         pTexSamplerLinear;
-    ID3D11SamplerState*         pTexSamplerLinearBorder;
-    ID3D11SamplerState*         pTexSamplerNearest;
+    ID3D11SamplerState*         pFontSampler;
+	ID3D11SamplerState*         pTextureSampler;
+	ID3D11SamplerState*         pPointSampler;
+	ImTextureDX11               FontTexture;
    ID3D11RasterizerState*      pRasterizerState;
    ID3D11BlendState*           pBlendState;
    ID3D11DepthStencilState*    pDepthStencilState;
@@ -104,24 +83,106 @@ static ImGui_ImplDX11_Data* ImGui_ImplDX11_GetBackendData()
 }

 // Functions
-static void ImGui_ImplDX11_SetupRenderState(const ImDrawData* draw_data, ID3D11DeviceContext* device_ctx)
+static void ImGui_ImplDX11_SetupRenderState(ImDrawData* draw_data, ID3D11DeviceContext* ctx)
 {
    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();

    // Setup viewport
-    D3D11_VIEWPORT vp = {};
-    vp.Width = draw_data->DisplaySize.x * draw_data->FramebufferScale.x;
-    vp.Height = draw_data->DisplaySize.y * draw_data->FramebufferScale.y;
+    D3D11_VIEWPORT vp;
+    memset(&vp, 0, sizeof(D3D11_VIEWPORT));
+    vp.Width = draw_data->DisplaySize.x;
+    vp.Height = draw_data->DisplaySize.y;
    vp.MinDepth = 0.0f;
    vp.MaxDepth = 1.0f;
    vp.TopLeftX = vp.TopLeftY = 0;
-    device_ctx->RSSetViewports(1, &vp);
+    ctx->RSSetViewports(1, &vp);
+
+    // Setup shader and vertex buffers
+    unsigned int stride = sizeof(ImDrawVert);
+    unsigned int offset = 0;
+    ctx->IASetInputLayout(bd->pInputLayout);
+    ctx->IASetVertexBuffers(0, 1, &bd->pVB, &stride, &offset);
+    ctx->IASetIndexBuffer(bd->pIB, sizeof(ImDrawIdx) == 2 ? DXGI_FORMAT_R16_UINT : DXGI_FORMAT_R32_UINT, 0);
+    ctx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+    ctx->VSSetShader(bd->pVertexShader, nullptr, 0);
+    ctx->VSSetConstantBuffers(0, 1, &bd->pVertexConstantBuffer);
+    ctx->PSSetShader(bd->pPixelShader, nullptr, 0);
+    ctx->GSSetShader(nullptr, nullptr, 0);
+    ctx->HSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
+    ctx->DSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
+    ctx->CSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
+
+    // Setup blend state
+    const float blend_factor[4] = { 0.f, 0.f, 0.f, 0.f };
+    ctx->OMSetBlendState(bd->pBlendState, blend_factor, 0xffffffff);
+    ctx->OMSetDepthStencilState(bd->pDepthStencilState, 0);
+    ctx->RSSetState(bd->pRasterizerState);
+}
+
+// Render function
+void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
+{
+    // Avoid rendering when minimized
+    if (draw_data->DisplaySize.x <= 0.0f || draw_data->DisplaySize.y <= 0.0f)
+        return;
+
+    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
+    ID3D11DeviceContext* ctx = bd->pd3dDeviceContext;
+
+    // Create and grow vertex/index buffers if needed
+    if (!bd->pVB || bd->VertexBufferSize < draw_data->TotalVtxCount)
+    {
+        if (bd->pVB) { bd->pVB->Release(); bd->pVB = nullptr; }
+        bd->VertexBufferSize = draw_data->TotalVtxCount + 5000;
+        D3D11_BUFFER_DESC desc;
+        memset(&desc, 0, sizeof(D3D11_BUFFER_DESC));
+        desc.Usage = D3D11_USAGE_DYNAMIC;
+        desc.ByteWidth = bd->VertexBufferSize * sizeof(ImDrawVert);
+        desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+        desc.MiscFlags = 0;
+        if (bd->pd3dDevice->CreateBuffer(&desc, nullptr, &bd->pVB) < 0)
+            return;
+    }
+    if (!bd->pIB || bd->IndexBufferSize < draw_data->TotalIdxCount)
+    {
+        if (bd->pIB) { bd->pIB->Release(); bd->pIB = nullptr; }
+        bd->IndexBufferSize = draw_data->TotalIdxCount + 10000;
+        D3D11_BUFFER_DESC desc;
+        memset(&desc, 0, sizeof(D3D11_BUFFER_DESC));
+        desc.Usage = D3D11_USAGE_DYNAMIC;
+        desc.ByteWidth = bd->IndexBufferSize * sizeof(ImDrawIdx);
+        desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+        if (bd->pd3dDevice->CreateBuffer(&desc, nullptr, &bd->pIB) < 0)
+            return;
+    }
+
+    // Upload vertex/index data into a single contiguous GPU buffer
+    D3D11_MAPPED_SUBRESOURCE vtx_resource, idx_resource;
+    if (ctx->Map(bd->pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vtx_resource) != S_OK)
+        return;
+    if (ctx->Map(bd->pIB, 0, D3D11_MAP_WRITE_DISCARD, 0, &idx_resource) != S_OK)
+        return;
+    ImDrawVert* vtx_dst = (ImDrawVert*)vtx_resource.pData;
+    ImDrawIdx* idx_dst = (ImDrawIdx*)idx_resource.pData;
+    for (int n = 0; n < draw_data->CmdListsCount; n++)
+    {
+        const ImDrawList* cmd_list = draw_data->CmdLists[n];
+        memcpy(vtx_dst, cmd_list->VtxBuffer.Data, cmd_list->VtxBuffer.Size * sizeof(ImDrawVert));
+        memcpy(idx_dst, cmd_list->IdxBuffer.Data, cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx));
+        vtx_dst += cmd_list->VtxBuffer.Size;
+        idx_dst += cmd_list->IdxBuffer.Size;
+    }
+    ctx->Unmap(bd->pVB, 0);
+    ctx->Unmap(bd->pIB, 0);

    // Setup orthographic projection matrix into our constant buffer
    // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayPos is (0,0) for single viewport apps.
-    D3D11_MAPPED_SUBRESOURCE mapped_resource;
-    if (device_ctx->Map(bd->pVertexConstantBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_resource) == S_OK)
    {
+        D3D11_MAPPED_SUBRESOURCE mapped_resource;
+        if (ctx->Map(bd->pVertexConstantBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_resource) != S_OK)
+            return;
        VERTEX_CONSTANT_BUFFER_DX11* constant_buffer = (VERTEX_CONSTANT_BUFFER_DX11*)mapped_resource.pData;
        float L = draw_data->DisplayPos.x;
        float R = draw_data->DisplayPos.x + draw_data->DisplaySize.x;
@@ -135,93 +196,9 @@ static void ImGui_ImplDX11_SetupRenderState(const ImDrawData* draw_data, ID3D11D
            { (R+L)/(L-R),  (T+B)/(B-T),    0.5f,       1.0f },
        };
        memcpy(&constant_buffer->mvp, mvp, sizeof(mvp));
-        device_ctx->Unmap(bd->pVertexConstantBuffer, 0);
+        ctx->Unmap(bd->pVertexConstantBuffer, 0);
    }

-    // Setup shader and vertex buffers
-    unsigned int stride = sizeof(ImDrawVert);
-    unsigned int offset = 0;
-    device_ctx->IASetInputLayout(bd->pInputLayout);
-    device_ctx->IASetVertexBuffers(0, 1, &bd->pVB, &stride, &offset);
-    device_ctx->IASetIndexBuffer(bd->pIB, sizeof(ImDrawIdx) == 2 ? DXGI_FORMAT_R16_UINT : DXGI_FORMAT_R32_UINT, 0);
-    device_ctx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-    device_ctx->VSSetShader(bd->pVertexShader, nullptr, 0);
-    device_ctx->VSSetConstantBuffers(0, 1, &bd->pVertexConstantBuffer);
-    device_ctx->PSSetShader(bd->pPixelShader, nullptr, 0);
-    device_ctx->GSSetShader(nullptr, nullptr, 0);
-    device_ctx->HSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
-    device_ctx->DSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
-    device_ctx->CSSetShader(nullptr, nullptr, 0); // In theory we should backup and restore this as well.. very infrequently used..
-
-    // Setup render state
-    const float blend_factor[4] = { 0.f, 0.f, 0.f, 0.f };
-    device_ctx->OMSetBlendState(bd->pBlendState, blend_factor, 0xffffffff);
-    device_ctx->OMSetDepthStencilState(bd->pDepthStencilState, 0);
-    device_ctx->RSSetState(bd->pRasterizerState);
-}
-
-// Render function
-void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
-{
-    // Avoid rendering when minimized
-    if (draw_data->DisplaySize.x <= 0.0f || draw_data->DisplaySize.y <= 0.0f)
-        return;
-
-    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
-    ID3D11DeviceContext* device = bd->pd3dDeviceContext;
-
-    // Catch up with texture updates. Most of the times, the list will have 1 element with an OK status, aka nothing to do.
-    // (This almost always points to ImGui::GetPlatformIO().Textures[] but is part of ImDrawData to allow overriding or disabling texture updates).
-    if (draw_data->Textures != nullptr)
-        for (ImTextureData* tex : *draw_data->Textures)
-            if (tex->Status != ImTextureStatus_OK)
-                ImGui_ImplDX11_UpdateTexture(tex);
-
-    // Create and grow vertex/index buffers if needed
-    if (!bd->pVB || bd->VertexBufferSize < draw_data->TotalVtxCount)
-    {
-        if (bd->pVB) { bd->pVB->Release(); bd->pVB = nullptr; }
-        bd->VertexBufferSize = draw_data->TotalVtxCount + 5000;
-        D3D11_BUFFER_DESC desc = {};
-        desc.Usage = D3D11_USAGE_DYNAMIC;
-        desc.ByteWidth = bd->VertexBufferSize * sizeof(ImDrawVert);
-        desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        desc.MiscFlags = 0;
-        if (bd->pd3dDevice->CreateBuffer(&desc, nullptr, &bd->pVB) < 0)
-            return;
-    }
-    if (!bd->pIB || bd->IndexBufferSize < draw_data->TotalIdxCount)
-    {
-        if (bd->pIB) { bd->pIB->Release(); bd->pIB = nullptr; }
-        bd->IndexBufferSize = draw_data->TotalIdxCount + 10000;
-        D3D11_BUFFER_DESC desc = {};
-        desc.Usage = D3D11_USAGE_DYNAMIC;
-        desc.ByteWidth = bd->IndexBufferSize * sizeof(ImDrawIdx);
-        desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        if (bd->pd3dDevice->CreateBuffer(&desc, nullptr, &bd->pIB) < 0)
-            return;
-    }
-
-    // Upload vertex/index data into a single contiguous GPU buffer
-    D3D11_MAPPED_SUBRESOURCE vtx_resource, idx_resource;
-    if (device->Map(bd->pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vtx_resource) != S_OK)
-        return;
-    if (device->Map(bd->pIB, 0, D3D11_MAP_WRITE_DISCARD, 0, &idx_resource) != S_OK)
-        return;
-    ImDrawVert* vtx_dst = (ImDrawVert*)vtx_resource.pData;
-    ImDrawIdx* idx_dst = (ImDrawIdx*)idx_resource.pData;
-    for (const ImDrawList* draw_list : draw_data->CmdLists)
-    {
-        memcpy(vtx_dst, draw_list->VtxBuffer.Data, draw_list->VtxBuffer.Size * sizeof(ImDrawVert));
-        memcpy(idx_dst, draw_list->IdxBuffer.Data, draw_list->IdxBuffer.Size * sizeof(ImDrawIdx));
-        vtx_dst += draw_list->VtxBuffer.Size;
-        idx_dst += draw_list->IdxBuffer.Size;
-    }
-    device->Unmap(bd->pVB, 0);
-    device->Unmap(bd->pIB, 0);
-
    // Backup DX state that will be modified to restore it afterwards (unfortunately this is very ugly looking and verbose. Close your eyes!)
    struct BACKUP_DX11_STATE
    {
@@ -249,143 +226,114 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
    };
    BACKUP_DX11_STATE old = {};
    old.ScissorRectsCount = old.ViewportsCount = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
-    device->RSGetScissorRects(&old.ScissorRectsCount, old.ScissorRects);
-    device->RSGetViewports(&old.ViewportsCount, old.Viewports);
-    device->RSGetState(&old.RS);
-    device->OMGetBlendState(&old.BlendState, old.BlendFactor, &old.SampleMask);
-    device->OMGetDepthStencilState(&old.DepthStencilState, &old.StencilRef);
-    device->PSGetShaderResources(0, 1, &old.PSShaderResource);
-    device->PSGetSamplers(0, 1, &old.PSSampler);
+    ctx->RSGetScissorRects(&old.ScissorRectsCount, old.ScissorRects);
+    ctx->RSGetViewports(&old.ViewportsCount, old.Viewports);
+    ctx->RSGetState(&old.RS);
+    ctx->OMGetBlendState(&old.BlendState, old.BlendFactor, &old.SampleMask);
+    ctx->OMGetDepthStencilState(&old.DepthStencilState, &old.StencilRef);
+    ctx->PSGetShaderResources(0, 1, &old.PSShaderResource);
+    ctx->PSGetSamplers(0, 1, &old.PSSampler);
    old.PSInstancesCount = old.VSInstancesCount = old.GSInstancesCount = 256;
-    device->PSGetShader(&old.PS, old.PSInstances, &old.PSInstancesCount);
-    device->VSGetShader(&old.VS, old.VSInstances, &old.VSInstancesCount);
-    device->VSGetConstantBuffers(0, 1, &old.VSConstantBuffer);
-    device->GSGetShader(&old.GS, old.GSInstances, &old.GSInstancesCount);
+    ctx->PSGetShader(&old.PS, old.PSInstances, &old.PSInstancesCount);
+    ctx->VSGetShader(&old.VS, old.VSInstances, &old.VSInstancesCount);
+    ctx->VSGetConstantBuffers(0, 1, &old.VSConstantBuffer);
+    ctx->GSGetShader(&old.GS, old.GSInstances, &old.GSInstancesCount);

-    device->IAGetPrimitiveTopology(&old.PrimitiveTopology);
-    device->IAGetIndexBuffer(&old.IndexBuffer, &old.IndexBufferFormat, &old.IndexBufferOffset);
-    device->IAGetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset);
-    device->IAGetInputLayout(&old.InputLayout);
+    ctx->IAGetPrimitiveTopology(&old.PrimitiveTopology);
+    ctx->IAGetIndexBuffer(&old.IndexBuffer, &old.IndexBufferFormat, &old.IndexBufferOffset);
+    ctx->IAGetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset);
+    ctx->IAGetInputLayout(&old.InputLayout);

    // Setup desired DX state
-    ImGui_ImplDX11_SetupRenderState(draw_data, device);
-
-    // Setup render state structure (for callbacks and custom texture bindings)
-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
-    ImGui_ImplDX11_RenderState render_state;
-    render_state.Device = bd->pd3dDevice;
-    render_state.DeviceContext = bd->pd3dDeviceContext;
-    render_state.SamplerLinear = bd->pTexSamplerLinear;
-    render_state.SamplerNearest = bd->pTexSamplerNearest;
-    render_state.VertexConstantBuffer = bd->pVertexConstantBuffer;
-    platform_io.Renderer_RenderState = &render_state;
+    ImGui_ImplDX11_SetupRenderState(draw_data, ctx);

    // Render command lists
    // (Because we merged all buffers into a single one, we maintain our own offset into them)
    int global_idx_offset = 0;
    int global_vtx_offset = 0;
    ImVec2 clip_off = draw_data->DisplayPos;
-    ImVec2 clip_scale = draw_data->FramebufferScale;
-    for (const ImDrawList* draw_list : draw_data->CmdLists)
+    for (int n = 0; n < draw_data->CmdListsCount; n++)
    {
-        for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++)
+        const ImDrawList* cmd_list = draw_data->CmdLists[n];
+        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
        {
-            const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i];
+            const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
            if (pcmd->UserCallback != nullptr)
            {
                // User callback, registered via ImDrawList::AddCallback()
                // (ImDrawCallback_ResetRenderState is a special callback value used by the user to request the renderer to reset render state.)
                if (pcmd->UserCallback == ImDrawCallback_ResetRenderState)
-                    ImGui_ImplDX11_SetupRenderState(draw_data, device);
+                    ImGui_ImplDX11_SetupRenderState(draw_data, ctx);
                else
-                    pcmd->UserCallback(draw_list, pcmd);
+                    pcmd->UserCallback(cmd_list, pcmd);
            }
            else
            {
                // Project scissor/clipping rectangles into framebuffer space
-                ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y);
-                ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y);
+                ImVec2 clip_min(pcmd->ClipRect.x - clip_off.x, pcmd->ClipRect.y - clip_off.y);
+                ImVec2 clip_max(pcmd->ClipRect.z - clip_off.x, pcmd->ClipRect.w - clip_off.y);
                if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y)
                    continue;

                // Apply scissor/clipping rectangle
                const D3D11_RECT r = { (LONG)clip_min.x, (LONG)clip_min.y, (LONG)clip_max.x, (LONG)clip_max.y };
-                device->RSSetScissorRects(1, &r);
+                ctx->RSSetScissorRects(1, &r);

                // Bind texture, Draw
                ImTextureDX11 *tex = (ImTextureDX11 *)pcmd->GetTexID();
-                if((ImTextureID)tex != ImGui::GetIO().Fonts->TexID.GetTexID())
-                {
-                    if (tex->pointSampling)
-                        device->PSSetSamplers(0, 1, &bd->pTexSamplerNearest);
-                    else
-                        device->PSSetSamplers(0, 1, &bd->pTexSamplerLinearBorder);
-                }
-                else
-                    device->PSSetSamplers(0, 1, &bd->pTexSamplerLinear);
+				if (tex != &bd->FontTexture)
+				{
+					if (tex->pointSampling)
+						ctx->PSSetSamplers(0, 1, &bd->pPointSampler);
+					else
+						ctx->PSSetSamplers(0, 1, &bd->pTextureSampler);
+				}
+				else
+					ctx->PSSetSamplers(0, 1, &bd->pFontSampler);
                ID3D11ShaderResourceView* texture_srv = tex->shaderResourceView;
-                device->PSSetShaderResources(0, 1, &texture_srv);
-                device->DrawIndexed(pcmd->ElemCount, pcmd->IdxOffset + global_idx_offset, pcmd->VtxOffset + global_vtx_offset);
+                ctx->PSSetShaderResources(0, 1, &texture_srv);
+                ctx->DrawIndexed(pcmd->ElemCount, pcmd->IdxOffset + global_idx_offset, pcmd->VtxOffset + global_vtx_offset);
            }
        }
-        global_idx_offset += draw_list->IdxBuffer.Size;
-        global_vtx_offset += draw_list->VtxBuffer.Size;
+        global_idx_offset += cmd_list->IdxBuffer.Size;
+        global_vtx_offset += cmd_list->VtxBuffer.Size;
    }
-    platform_io.Renderer_RenderState = nullptr;

    // Restore modified DX state
-    device->RSSetScissorRects(old.ScissorRectsCount, old.ScissorRects);
-    device->RSSetViewports(old.ViewportsCount, old.Viewports);
-    device->RSSetState(old.RS); if (old.RS) old.RS->Release();
-    device->OMSetBlendState(old.BlendState, old.BlendFactor, old.SampleMask); if (old.BlendState) old.BlendState->Release();
-    device->OMSetDepthStencilState(old.DepthStencilState, old.StencilRef); if (old.DepthStencilState) old.DepthStencilState->Release();
-    device->PSSetShaderResources(0, 1, &old.PSShaderResource); if (old.PSShaderResource) old.PSShaderResource->Release();
-    device->PSSetSamplers(0, 1, &old.PSSampler); if (old.PSSampler) old.PSSampler->Release();
-    device->PSSetShader(old.PS, old.PSInstances, old.PSInstancesCount); if (old.PS) old.PS->Release();
+    ctx->RSSetScissorRects(old.ScissorRectsCount, old.ScissorRects);
+    ctx->RSSetViewports(old.ViewportsCount, old.Viewports);
+    ctx->RSSetState(old.RS); if (old.RS) old.RS->Release();
+    ctx->OMSetBlendState(old.BlendState, old.BlendFactor, old.SampleMask); if (old.BlendState) old.BlendState->Release();
+    ctx->OMSetDepthStencilState(old.DepthStencilState, old.StencilRef); if (old.DepthStencilState) old.DepthStencilState->Release();
+    ctx->PSSetShaderResources(0, 1, &old.PSShaderResource); if (old.PSShaderResource) old.PSShaderResource->Release();
+    ctx->PSSetSamplers(0, 1, &old.PSSampler); if (old.PSSampler) old.PSSampler->Release();
+    ctx->PSSetShader(old.PS, old.PSInstances, old.PSInstancesCount); if (old.PS) old.PS->Release();
    for (UINT i = 0; i < old.PSInstancesCount; i++) if (old.PSInstances[i]) old.PSInstances[i]->Release();
-    device->VSSetShader(old.VS, old.VSInstances, old.VSInstancesCount); if (old.VS) old.VS->Release();
-    device->VSSetConstantBuffers(0, 1, &old.VSConstantBuffer); if (old.VSConstantBuffer) old.VSConstantBuffer->Release();
-    device->GSSetShader(old.GS, old.GSInstances, old.GSInstancesCount); if (old.GS) old.GS->Release();
+    ctx->VSSetShader(old.VS, old.VSInstances, old.VSInstancesCount); if (old.VS) old.VS->Release();
+    ctx->VSSetConstantBuffers(0, 1, &old.VSConstantBuffer); if (old.VSConstantBuffer) old.VSConstantBuffer->Release();
+    ctx->GSSetShader(old.GS, old.GSInstances, old.GSInstancesCount); if (old.GS) old.GS->Release();
    for (UINT i = 0; i < old.VSInstancesCount; i++) if (old.VSInstances[i]) old.VSInstances[i]->Release();
-    device->IASetPrimitiveTopology(old.PrimitiveTopology);
-    device->IASetIndexBuffer(old.IndexBuffer, old.IndexBufferFormat, old.IndexBufferOffset); if (old.IndexBuffer) old.IndexBuffer->Release();
-    device->IASetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset); if (old.VertexBuffer) old.VertexBuffer->Release();
-    device->IASetInputLayout(old.InputLayout); if (old.InputLayout) old.InputLayout->Release();
+    ctx->IASetPrimitiveTopology(old.PrimitiveTopology);
+    ctx->IASetIndexBuffer(old.IndexBuffer, old.IndexBufferFormat, old.IndexBufferOffset); if (old.IndexBuffer) old.IndexBuffer->Release();
+    ctx->IASetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset); if (old.VertexBuffer) old.VertexBuffer->Release();
+    ctx->IASetInputLayout(old.InputLayout); if (old.InputLayout) old.InputLayout->Release();
 }

-static void ImGui_ImplDX11_DestroyTexture(ImTextureData* tex)
-{
-    if (ImTextureDX11* backend_tex = (ImTextureDX11*)tex->BackendUserData)
-    {
-        IM_ASSERT(backend_tex == (ImTextureDX11*)tex->TexID);
-        backend_tex->shaderResourceView->Release();
-        backend_tex->pTexture->Release();
-        IM_DELETE(backend_tex);
-
-        // Clear identifiers and mark as destroyed (in order to allow e.g. calling InvalidateDeviceObjects while running)
-        tex->SetTexID(ImTextureID_Invalid);
-        tex->BackendUserData = nullptr;
-    }
-    tex->SetStatus(ImTextureStatus_Destroyed);
-}
-
-void ImGui_ImplDX11_UpdateTexture(ImTextureData* tex)
+static void ImGui_ImplDX11_CreateFontsTexture()
 {
+    // Build texture atlas
+    ImGuiIO& io = ImGui::GetIO();
    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
-    if (tex->Status == ImTextureStatus_WantCreate)
-    {
-        // Create and upload new texture to graphics system
-        //IMGUI_DEBUG_LOG("UpdateTexture #%03d: WantCreate %dx%d\n", tex->UniqueID, tex->Width, tex->Height);
-        IM_ASSERT(tex->TexID == ImTextureID_Invalid && tex->BackendUserData == nullptr);
-        IM_ASSERT(tex->Format == ImTextureFormat_RGBA32);
-        unsigned int* pixels = (unsigned int*)tex->GetPixels();
-        ImTextureDX11* backend_tex = IM_NEW(ImTextureDX11)();
+    unsigned char* pixels;
+    int width, height;
+    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);

-        // Create texture
+    // Upload texture to graphics system
+    {
        D3D11_TEXTURE2D_DESC desc;
        ZeroMemory(&desc, sizeof(desc));
-        desc.Width = (UINT)tex->Width;
-        desc.Height = (UINT)tex->Height;
+        desc.Width = width;
+        desc.Height = height;
        desc.MipLevels = 1;
        desc.ArraySize = 1;
        desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
@@ -393,12 +341,14 @@ void ImGui_ImplDX11_UpdateTexture(ImTextureData* tex)
        desc.Usage = D3D11_USAGE_DEFAULT;
        desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
        desc.CPUAccessFlags = 0;
+
+        ID3D11Texture2D* pTexture = nullptr;
        D3D11_SUBRESOURCE_DATA subResource;
        subResource.pSysMem = pixels;
        subResource.SysMemPitch = desc.Width * 4;
        subResource.SysMemSlicePitch = 0;
-        bd->pd3dDevice->CreateTexture2D(&desc, &subResource, &backend_tex->pTexture);
-        IM_ASSERT(backend_tex->pTexture != nullptr && "Backend failed to create texture!");
+        bd->pd3dDevice->CreateTexture2D(&desc, &subResource, &pTexture);
+        IM_ASSERT(pTexture != nullptr);

        // Create texture view
        D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
@@ -407,29 +357,35 @@ void ImGui_ImplDX11_UpdateTexture(ImTextureData* tex)
        srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
        srvDesc.Texture2D.MipLevels = desc.MipLevels;
        srvDesc.Texture2D.MostDetailedMip = 0;
-        bd->pd3dDevice->CreateShaderResourceView(backend_tex->pTexture, &srvDesc, &backend_tex->shaderResourceView);
-        IM_ASSERT(backend_tex->shaderResourceView != nullptr && "Backend failed to create texture!");
+        bd->pd3dDevice->CreateShaderResourceView(pTexture, &srvDesc, &bd->FontTexture.shaderResourceView);
+        pTexture->Release();
+    }

-        // Store identifiers
-        tex->SetTexID((ImTextureID)backend_tex);
-        tex->SetStatus(ImTextureStatus_OK);
-        tex->BackendUserData = backend_tex;
-    }
-    else if (tex->Status == ImTextureStatus_WantUpdates)
+    // Store our identifier
+    io.Fonts->SetTexID((ImTextureID)&bd->FontTexture);
+
+    // Create texture samplers
+    // (Bilinear sampling is required by default. Set 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines' or 'style.AntiAliasedLinesUseTex = false' to allow point/nearest sampling)
    {
-        // Update selected blocks. We only ever write to textures regions which have never been used before!
-        // This backend choose to use tex->Updates[] but you can use tex->UpdateRect to upload a single region.
-        ImTextureDX11* backend_tex = (ImTextureDX11*)tex->BackendUserData;
-        IM_ASSERT(backend_tex == (ImTextureDX11*)tex->TexID);
-        for (ImTextureRect& r : tex->Updates)
-        {
-            D3D11_BOX box = { (UINT)r.x, (UINT)r.y, (UINT)0, (UINT)(r.x + r.w), (UINT)(r.y + r .h), (UINT)1 };
-            bd->pd3dDeviceContext->UpdateSubresource(backend_tex->pTexture, 0, &box, tex->GetPixelsAt(r.x, r.y), (UINT)tex->GetPitch(), 0);
-        }
-        tex->SetStatus(ImTextureStatus_OK);
+        D3D11_SAMPLER_DESC desc;
+        ZeroMemory(&desc, sizeof(desc));
+        desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+        desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
+        desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
+        desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
+        desc.MipLODBias = 0.f;
+        desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
+        desc.MinLOD = 0.f;
+        desc.MaxLOD = 0.f;
+        bd->pd3dDevice->CreateSamplerState(&desc, &bd->pFontSampler);
+
+		desc.AddressU = D3D11_TEXTURE_ADDRESS_BORDER;
+		desc.AddressV = D3D11_TEXTURE_ADDRESS_BORDER;
+		bd->pd3dDevice->CreateSamplerState(&desc, &bd->pTextureSampler);
+
+        desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+		bd->pd3dDevice->CreateSamplerState(&desc, &bd->pPointSampler);
    }
-    if (tex->Status == ImTextureStatus_WantDestroy && tex->UnusedFrames > 0)
-        ImGui_ImplDX11_DestroyTexture(tex);
 }

 bool    ImGui_ImplDX11_CreateDeviceObjects()
@@ -437,7 +393,8 @@ bool    ImGui_ImplDX11_CreateDeviceObjects()
    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
    if (!bd->pd3dDevice)
        return false;
-    ImGui_ImplDX11_InvalidateDeviceObjects();
+    if (bd->pFontSampler)
+        ImGui_ImplDX11_InvalidateDeviceObjects();

    // By using D3DCompile() from <d3dcompiler.h> / d3dcompiler.lib, we introduce a dependency to a given version of d3dcompiler_XX.dll (see D3DCOMPILER_DLL_A)
    // If you would like to use this DX11 sample code but remove this dependency you can:
@@ -500,7 +457,7 @@ bool    ImGui_ImplDX11_CreateDeviceObjects()

        // Create the constant buffer
        {
-            D3D11_BUFFER_DESC desc = {};
+            D3D11_BUFFER_DESC desc;
            desc.ByteWidth = sizeof(VERTEX_CONSTANT_BUFFER_DX11);
            desc.Usage = D3D11_USAGE_DYNAMIC;
            desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
@@ -580,28 +537,7 @@ bool    ImGui_ImplDX11_CreateDeviceObjects()
        bd->pd3dDevice->CreateDepthStencilState(&desc, &bd->pDepthStencilState);
    }

-    // Create texture samplers
-    // (Bilinear sampling is required by default. Set 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines' or 'style.AntiAliasedLinesUseTex = false' to allow point/nearest sampling)
-    {
-        D3D11_SAMPLER_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-        desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-        desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-        desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-        desc.MipLODBias = 0.f;
-        desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-        desc.MinLOD = 0.f;
-        desc.MaxLOD = 0.f;
-        bd->pd3dDevice->CreateSamplerState(&desc, &bd->pTexSamplerLinear);
-
-        desc.AddressU = D3D11_TEXTURE_ADDRESS_BORDER;
-        desc.AddressV = D3D11_TEXTURE_ADDRESS_BORDER;
-        bd->pd3dDevice->CreateSamplerState(&desc, &bd->pTexSamplerLinearBorder);
-
-        desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-        bd->pd3dDevice->CreateSamplerState(&desc, &bd->pTexSamplerNearest);
-    }
+    ImGui_ImplDX11_CreateFontsTexture();

    return true;
 }
@@ -612,14 +548,15 @@ void    ImGui_ImplDX11_InvalidateDeviceObjects()
    if (!bd->pd3dDevice)
        return;

-    // Destroy all textures
-    for (ImTextureData* tex : ImGui::GetPlatformIO().Textures)
-        if (tex->RefCount == 1)
-            ImGui_ImplDX11_DestroyTexture(tex);
-
-    if (bd->pTexSamplerLinear)      { bd->pTexSamplerLinear->Release(); bd->pTexSamplerLinear = nullptr; }
-    if (bd->pTexSamplerLinearBorder){ bd->pTexSamplerLinearBorder->Release(); bd->pTexSamplerLinearBorder = nullptr; }
-    if (bd->pTexSamplerNearest)     { bd->pTexSamplerNearest->Release(); bd->pTexSamplerNearest = nullptr; }
+    if (bd->pFontSampler)           { bd->pFontSampler->Release(); bd->pFontSampler = nullptr; }
+	if (bd->pTextureSampler)        { bd->pTextureSampler->Release(); bd->pTextureSampler = nullptr; }
+	if (bd->pPointSampler)          { bd->pPointSampler->Release(); bd->pPointSampler = nullptr; }
+	if (bd->FontTexture.shaderResourceView) {
+		bd->FontTexture.shaderResourceView->Release();
+		bd->FontTexture.shaderResourceView = nullptr;
+		// We copied data->FontTexture.shaderResourceView to io.Fonts->TexID so let's clear that as well.
+		ImGui::GetIO().Fonts->SetTexID(0);
+	}
    if (bd->pIB)                    { bd->pIB->Release(); bd->pIB = nullptr; }
    if (bd->pVB)                    { bd->pVB->Release(); bd->pVB = nullptr; }
    if (bd->pBlendState)            { bd->pBlendState->Release(); bd->pBlendState = nullptr; }
@@ -642,10 +579,6 @@ bool    ImGui_ImplDX11_Init(ID3D11Device* device, ID3D11DeviceContext* device_co
    io.BackendRendererUserData = (void*)bd;
    io.BackendRendererName = "imgui_impl_dx11";
    io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;  // We can honor the ImDrawCmd::VtxOffset field, allowing for large meshes.
-    io.BackendFlags |= ImGuiBackendFlags_RendererHasTextures;   // We can honor ImGuiPlatformIO::Textures[] requests during render.
-
-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
-    platform_io.Renderer_TextureMaxWidth = platform_io.Renderer_TextureMaxHeight = D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;

    // Get factory from device
    IDXGIDevice* pDXGIDevice = nullptr;
@@ -673,17 +606,14 @@ void ImGui_ImplDX11_Shutdown()
    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
    IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?");
    ImGuiIO& io = ImGui::GetIO();
-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();

    ImGui_ImplDX11_InvalidateDeviceObjects();
    if (bd->pFactory)             { bd->pFactory->Release(); }
    if (bd->pd3dDevice)           { bd->pd3dDevice->Release(); }
    if (bd->pd3dDeviceContext)    { bd->pd3dDeviceContext->Release(); }
-
    io.BackendRendererName = nullptr;
    io.BackendRendererUserData = nullptr;
-    io.BackendFlags &= ~(ImGuiBackendFlags_RendererHasVtxOffset | ImGuiBackendFlags_RendererHasTextures);
-    platform_io.ClearRendererHandlers();
+    io.BackendFlags &= ~ImGuiBackendFlags_RendererHasVtxOffset;
    IM_DELETE(bd);
 }

@@ -692,9 +622,8 @@ void ImGui_ImplDX11_NewFrame()
    ImGui_ImplDX11_Data* bd = ImGui_ImplDX11_GetBackendData();
    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplDX11_Init()?");

-    if (!bd->pVertexShader)
-        if (!ImGui_ImplDX11_CreateDeviceObjects())
-            IM_ASSERT(0 && "ImGui_ImplDX11_CreateDeviceObjects() failed!");
+    if (!bd->pFontSampler)
+        ImGui_ImplDX11_CreateDeviceObjects();
 }

 //-----------------------------------------------------------------------------
@@ -2,10 +2,8 @@
 // This needs to be used along with a Platform Backend (e.g. Win32)

 // Implemented features:
-//  [X] Renderer: User texture binding. Use 'ID3D11ShaderResourceView*' as texture identifier. Read the FAQ about ImTextureID/ImTextureRef!
-//  [X] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset).
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
-//  [X] Renderer: Expose selected render state for draw callbacks to use. Access in '(ImGui_ImplXXXX_RenderState*)GetPlatformIO().Renderer_RenderState'.
+//  [X] Renderer: User texture binding. Use 'ID3D11ShaderResourceView*' as ImTextureID. Read the FAQ about ImTextureID!
+//  [X] Renderer: Large meshes support (64k+ vertices) with 16-bit indices.

 // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
 // Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
@@ -21,38 +19,20 @@

 struct ID3D11Device;
 struct ID3D11DeviceContext;
-struct ID3D11Texture2D;
 struct ID3D11ShaderResourceView;
-struct ID3D11SamplerState;
-struct ID3D11Buffer;

-// Follow "Getting Started" link and check examples/ folder to learn about using backends!
 IMGUI_IMPL_API bool     ImGui_ImplDX11_Init(ID3D11Device* device, ID3D11DeviceContext* device_context);
 IMGUI_IMPL_API void     ImGui_ImplDX11_Shutdown();
 IMGUI_IMPL_API void     ImGui_ImplDX11_NewFrame();
 IMGUI_IMPL_API void     ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data);

-// Use if you want to reset your rendering state without using ImGui_ImplDX11_RenderDrawData.
-IMGUI_IMPL_API bool     ImGui_ImplDX11_CreateDeviceObjects();
+// Use if you want to reset your rendering device without losing Dear ImGui state.
 IMGUI_IMPL_API void     ImGui_ImplDX11_InvalidateDeviceObjects();
-
-// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = NULL to handle this manually.
-IMGUI_IMPL_API void     ImGui_ImplDX11_UpdateTexture(ImTextureData* tex);
-
-// Selected render state exposed to applications and callbacks.
-struct ImGui_ImplDX11_RenderState
-{
-    ID3D11Device*           Device;
-    ID3D11DeviceContext*    DeviceContext;
-    ID3D11SamplerState*     SamplerLinear;
-    ID3D11SamplerState*     SamplerNearest;
-    ID3D11Buffer*           VertexConstantBuffer;
-};
+IMGUI_IMPL_API bool     ImGui_ImplDX11_CreateDeviceObjects();

 // ImTextureID should be a pointer to this struct
 struct ImTextureDX11
 {
-    ID3D11Texture2D          *pTexture;
 	ID3D11ShaderResourceView *shaderResourceView;
 	bool pointSampling;
 };
@@ -2,10 +2,8 @@
 // This needs to be used along with a Platform Backend (e.g. Win32)

 // Implemented features:
-//  [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as texture identifier. Read the FAQ about ImTextureID/ImTextureRef!
-//  [X] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset).
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
-//  [X] Renderer: IMGUI_USE_BGRA_PACKED_COLOR support, as this is the optimal color encoding for DirectX9.
+//  [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as ImTextureID. Read the FAQ about ImTextureID!
+//  [X] Renderer: Large meshes support (64k+ vertices) with 16-bit indices.

 // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
 // Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
@@ -17,9 +15,6 @@

 // CHANGELOG
 // (minor and older changes stripped away, please see git history for details)
-//  2025-09-18: Call platform_io.ClearRendererHandlers() on shutdown.
-//  2025-06-11: DirectX9: Added support for ImGuiBackendFlags_RendererHasTextures, for dynamic font atlas.
-//  2024-10-07: DirectX9: Changed default texture sampler to Clamp instead of Repeat/Wrap.
 //  2024-02-12: DirectX9: Using RGBA format when supported by the driver to avoid CPU side conversion. (#6575)
 //  2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11.
 //  2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX).
@@ -47,21 +42,15 @@
 // DirectX
 #include <d3d9.h>

-// Clang/GCC warnings with -Weverything
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wold-style-cast"         // warning: use of old-style cast                            // yes, they are more terse.
-#pragma clang diagnostic ignored "-Wsign-conversion"        // warning: implicit conversion changes signedness
-#endif
-
 // DirectX data
 struct ImGui_ImplDX9_Data
 {
    LPDIRECT3DDEVICE9           pd3dDevice;
    LPDIRECT3DVERTEXBUFFER9     pVB;
    LPDIRECT3DINDEXBUFFER9      pIB;
+    ImTextureDX9                FontTexture;
    int                         VertexBufferSize;
    int                         IndexBufferSize;
-    bool                        HasRgbaSupport;

    ImGui_ImplDX9_Data()        { memset((void*)this, 0, sizeof(*this)); VertexBufferSize = 5000; IndexBufferSize = 10000; }
 };
@@ -99,41 +88,41 @@ static void ImGui_ImplDX9_SetupRenderState(ImDrawData* draw_data)
    vp.Height = (DWORD)draw_data->DisplaySize.y;
    vp.MinZ = 0.0f;
    vp.MaxZ = 1.0f;
-
-    LPDIRECT3DDEVICE9 device = bd->pd3dDevice;
-    device->SetViewport(&vp);
+    bd->pd3dDevice->SetViewport(&vp);

    // Setup render state: fixed-pipeline, alpha-blending, no face culling, no depth testing, shade mode (for gradient), bilinear sampling.
-    device->SetPixelShader(nullptr);
-    device->SetVertexShader(nullptr);
-    device->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
-    device->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
-    device->SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
-    device->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
-    device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-    device->SetRenderState(D3DRS_ZENABLE, FALSE);
-    device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-    device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-    device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-    device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-    device->SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
-    device->SetRenderState(D3DRS_SRCBLENDALPHA, D3DBLEND_ONE);
-    device->SetRenderState(D3DRS_DESTBLENDALPHA, D3DBLEND_INVSRCALPHA);
-    device->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
-    device->SetRenderState(D3DRS_FOGENABLE, FALSE);
-    device->SetRenderState(D3DRS_RANGEFOGENABLE, FALSE);
-    device->SetRenderState(D3DRS_SPECULARENABLE, FALSE);
-    device->SetRenderState(D3DRS_STENCILENABLE, FALSE);
-    device->SetRenderState(D3DRS_CLIPPING, TRUE);
-    device->SetRenderState(D3DRS_LIGHTING, FALSE);
-    device->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-    device->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-    device->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-    device->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
-    device->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-    device->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-    device->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
-    device->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+    bd->pd3dDevice->SetPixelShader(nullptr);
+    bd->pd3dDevice->SetVertexShader(nullptr);
+    bd->pd3dDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
+    bd->pd3dDevice->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
+    bd->pd3dDevice->SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+    bd->pd3dDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
+    bd->pd3dDevice->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
+    bd->pd3dDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+    bd->pd3dDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+    bd->pd3dDevice->SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
+    bd->pd3dDevice->SetRenderState(D3DRS_SRCBLENDALPHA, D3DBLEND_ONE);
+    bd->pd3dDevice->SetRenderState(D3DRS_DESTBLENDALPHA, D3DBLEND_INVSRCALPHA);
+    bd->pd3dDevice->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
+    bd->pd3dDevice->SetRenderState(D3DRS_FOGENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_RANGEFOGENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_SPECULARENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_STENCILENABLE, FALSE);
+    bd->pd3dDevice->SetRenderState(D3DRS_CLIPPING, TRUE);
+    bd->pd3dDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+    bd->pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+    bd->pd3dDevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    bd->pd3dDevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);

    // Setup orthographic projection matrix
    // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayPos is (0,0) for single viewport apps.
@@ -151,9 +140,9 @@ static void ImGui_ImplDX9_SetupRenderState(ImDrawData* draw_data)
            0.0f,         0.0f,         0.5f,  0.0f,
            (L+R)/(L-R),  (T+B)/(B-T),  0.5f,  1.0f
        } } };
-        device->SetTransform(D3DTS_WORLD, &mat_identity);
-        device->SetTransform(D3DTS_VIEW, &mat_identity);
-        device->SetTransform(D3DTS_PROJECTION, &mat_projection);
+        bd->pd3dDevice->SetTransform(D3DTS_WORLD, &mat_identity);
+        bd->pd3dDevice->SetTransform(D3DTS_VIEW, &mat_identity);
+        bd->pd3dDevice->SetTransform(D3DTS_PROJECTION, &mat_projection);
    }
 }

@@ -164,65 +153,33 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
    if (draw_data->DisplaySize.x <= 0.0f || draw_data->DisplaySize.y <= 0.0f)
        return;

-    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
-    LPDIRECT3DDEVICE9 device = bd->pd3dDevice;
-
-    // Catch up with texture updates. Most of the times, the list will have 1 element with an OK status, aka nothing to do.
-    // (This almost always points to ImGui::GetPlatformIO().Textures[] but is part of ImDrawData to allow overriding or disabling texture updates).
-    if (draw_data->Textures != nullptr)
-        for (ImTextureData* tex : *draw_data->Textures)
-            if (tex->Status != ImTextureStatus_OK)
-                ImGui_ImplDX9_UpdateTexture(tex);
-
    // Create and grow buffers if needed
+    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
    if (!bd->pVB || bd->VertexBufferSize < draw_data->TotalVtxCount)
    {
        if (bd->pVB) { bd->pVB->Release(); bd->pVB = nullptr; }
        bd->VertexBufferSize = draw_data->TotalVtxCount + 5000;
-        if (device->CreateVertexBuffer(bd->VertexBufferSize * sizeof(CUSTOMVERTEX), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_DEFAULT, &bd->pVB, nullptr) < 0)
+        if (bd->pd3dDevice->CreateVertexBuffer(bd->VertexBufferSize * sizeof(CUSTOMVERTEX), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_DEFAULT, &bd->pVB, nullptr) < 0)
            return;
    }
    if (!bd->pIB || bd->IndexBufferSize < draw_data->TotalIdxCount)
    {
        if (bd->pIB) { bd->pIB->Release(); bd->pIB = nullptr; }
        bd->IndexBufferSize = draw_data->TotalIdxCount + 10000;
-        if (device->CreateIndexBuffer(bd->IndexBufferSize * sizeof(ImDrawIdx), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, sizeof(ImDrawIdx) == 2 ? D3DFMT_INDEX16 : D3DFMT_INDEX32, D3DPOOL_DEFAULT, &bd->pIB, nullptr) < 0)
+        if (bd->pd3dDevice->CreateIndexBuffer(bd->IndexBufferSize * sizeof(ImDrawIdx), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, sizeof(ImDrawIdx) == 2 ? D3DFMT_INDEX16 : D3DFMT_INDEX32, D3DPOOL_DEFAULT, &bd->pIB, nullptr) < 0)
            return;
    }

-/*  Removed in Flycast
-    // Backup the DX9 state
-    IDirect3DStateBlock9* state_block = nullptr;
-    if (device->CreateStateBlock(D3DSBT_ALL, &state_block) < 0)
-        return;
-    if (state_block->Capture() < 0)
-    {
-        state_block->Release();
-        return;
-    }
-
-    // Backup the DX9 transform (DX9 documentation suggests that it is included in the StateBlock but it doesn't appear to)
-    D3DMATRIX last_world, last_view, last_projection;
-    device->GetTransform(D3DTS_WORLD, &last_world);
-    device->GetTransform(D3DTS_VIEW, &last_view);
-    device->GetTransform(D3DTS_PROJECTION, &last_projection);
-*/
    // Allocate buffers
    CUSTOMVERTEX* vtx_dst;
    ImDrawIdx* idx_dst;
    if (bd->pVB->Lock(0, (UINT)(draw_data->TotalVtxCount * sizeof(CUSTOMVERTEX)), (void**)&vtx_dst, D3DLOCK_DISCARD) < 0)
    {
-/*  Removed in Flycast
-        state_block->Release();
-*/
        return;
    }
    if (bd->pIB->Lock(0, (UINT)(draw_data->TotalIdxCount * sizeof(ImDrawIdx)), (void**)&idx_dst, D3DLOCK_DISCARD) < 0)
    {
        bd->pVB->Unlock();
-/*  Removed in Flycast
-        state_block->Release();
-*/
        return;
    }

@@ -230,10 +187,11 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
    // FIXME-OPT: This is a minor waste of resource, the ideal is to use imconfig.h and
    //  1) to avoid repacking colors:   #define IMGUI_USE_BGRA_PACKED_COLOR
    //  2) to avoid repacking vertices: #define IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT struct ImDrawVert { ImVec2 pos; float z; ImU32 col; ImVec2 uv; }
-    for (const ImDrawList* draw_list : draw_data->CmdLists)
+    for (int n = 0; n < draw_data->CmdListsCount; n++)
    {
-        const ImDrawVert* vtx_src = draw_list->VtxBuffer.Data;
-        for (int i = 0; i < draw_list->VtxBuffer.Size; i++)
+        const ImDrawList* cmd_list = draw_data->CmdLists[n];
+        const ImDrawVert* vtx_src = cmd_list->VtxBuffer.Data;
+        for (int i = 0; i < cmd_list->VtxBuffer.Size; i++)
        {
            vtx_dst->pos[0] = vtx_src->pos.x;
            vtx_dst->pos[1] = vtx_src->pos.y;
@@ -244,14 +202,14 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
            vtx_dst++;
            vtx_src++;
        }
-        memcpy(idx_dst, draw_list->IdxBuffer.Data, draw_list->IdxBuffer.Size * sizeof(ImDrawIdx));
-        idx_dst += draw_list->IdxBuffer.Size;
+        memcpy(idx_dst, cmd_list->IdxBuffer.Data, cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx));
+        idx_dst += cmd_list->IdxBuffer.Size;
    }
    bd->pVB->Unlock();
    bd->pIB->Unlock();
-    device->SetStreamSource(0, bd->pVB, 0, sizeof(CUSTOMVERTEX));
-    device->SetIndices(bd->pIB);
-    device->SetFVF(D3DFVF_CUSTOMVERTEX);
+    bd->pd3dDevice->SetStreamSource(0, bd->pVB, 0, sizeof(CUSTOMVERTEX));
+    bd->pd3dDevice->SetIndices(bd->pIB);
+    bd->pd3dDevice->SetFVF(D3DFVF_CUSTOMVERTEX);

    // Setup desired DX state
    ImGui_ImplDX9_SetupRenderState(draw_data);
@@ -261,11 +219,12 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
    int global_vtx_offset = 0;
    int global_idx_offset = 0;
    ImVec2 clip_off = draw_data->DisplayPos;
-    for (const ImDrawList* draw_list : draw_data->CmdLists)
+    for (int n = 0; n < draw_data->CmdListsCount; n++)
    {
-        for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++)
+        const ImDrawList* cmd_list = draw_data->CmdLists[n];
+        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
        {
-            const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i];
+            const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
            if (pcmd->UserCallback != nullptr)
            {
                // User callback, registered via ImDrawList::AddCallback()
@@ -273,7 +232,7 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
                if (pcmd->UserCallback == ImDrawCallback_ResetRenderState)
                    ImGui_ImplDX9_SetupRenderState(draw_data);
                else
-                    pcmd->UserCallback(draw_list, pcmd);
+                    pcmd->UserCallback(cmd_list, pcmd);
            }
            else
            {
@@ -287,51 +246,73 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
                const RECT r = { (LONG)clip_min.x, (LONG)clip_min.y, (LONG)clip_max.x, (LONG)clip_max.y };
                const ImTextureDX9 *tex = (const ImTextureDX9 *)pcmd->GetTexID();
                const LPDIRECT3DTEXTURE9 texture = tex->d3dTexture;
-                device->SetTexture(0, texture);
-                if((ImTextureID)tex != ImGui::GetIO().Fonts->TexID.GetTexID())
-                {
-                    device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
-                    device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
-                    if (tex->pointSampling)
-                    {
-                        device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-                        device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
-                    }
-                    else
-                    {
-                        device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-                        device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-                    }
-                }
-                else
-                {
-                    device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);
-                    device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);
-                    device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-                    device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-                }
-                device->SetScissorRect(&r);
-                device->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, pcmd->VtxOffset + global_vtx_offset, 0, (UINT)draw_list->VtxBuffer.Size, pcmd->IdxOffset + global_idx_offset, pcmd->ElemCount / 3);
+                bd->pd3dDevice->SetTexture(0, texture);
+				if (tex != &bd->FontTexture)
+				{
+					bd->pd3dDevice->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
+					bd->pd3dDevice->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
+					if (tex->pointSampling)
+					{
+					    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
+					    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
+					}
+					else
+					{
+					    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+					    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+					}
+				}
+				else
+				{
+					bd->pd3dDevice->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP);
+					bd->pd3dDevice->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP);
+				    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+				    bd->pd3dDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+				}
+                bd->pd3dDevice->SetScissorRect(&r);
+                bd->pd3dDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, pcmd->VtxOffset + global_vtx_offset, 0, (UINT)cmd_list->VtxBuffer.Size, pcmd->IdxOffset + global_idx_offset, pcmd->ElemCount / 3);
            }
        }
-        global_idx_offset += draw_list->IdxBuffer.Size;
-        global_vtx_offset += draw_list->VtxBuffer.Size;
+        global_idx_offset += cmd_list->IdxBuffer.Size;
+        global_vtx_offset += cmd_list->VtxBuffer.Size;
    }
-/*  Removed in Flycast
-    // Restore the DX9 transform
-    device->SetTransform(D3DTS_WORLD, &last_world);
-    device->SetTransform(D3DTS_VIEW, &last_view);
-    device->SetTransform(D3DTS_PROJECTION, &last_projection);
-
-    // Restore the DX9 state
-    state_block->Apply();
-    state_block->Release();
-*/
 }

-static bool ImGui_ImplDX9_CheckFormatSupport(LPDIRECT3DDEVICE9 pDevice, D3DFORMAT format)
+bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
 {
-    LPDIRECT3D9 pd3d = nullptr;
+    ImGuiIO& io = ImGui::GetIO();
+    IMGUI_CHECKVERSION();
+    IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");
+
+    // Setup backend capabilities flags
+    ImGui_ImplDX9_Data* bd = IM_NEW(ImGui_ImplDX9_Data)();
+    io.BackendRendererUserData = (void*)bd;
+    io.BackendRendererName = "imgui_impl_dx9";
+    io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;  // We can honor the ImDrawCmd::VtxOffset field, allowing for large meshes.
+
+    bd->pd3dDevice = device;
+    bd->pd3dDevice->AddRef();
+
+    return true;
+}
+
+void ImGui_ImplDX9_Shutdown()
+{
+    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
+    IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?");
+    ImGuiIO& io = ImGui::GetIO();
+
+    ImGui_ImplDX9_InvalidateDeviceObjects();
+    if (bd->pd3dDevice) { bd->pd3dDevice->Release(); }
+    io.BackendRendererName = nullptr;
+    io.BackendRendererUserData = nullptr;
+    io.BackendFlags &= ~ImGuiBackendFlags_RendererHasVtxOffset;
+    IM_DELETE(bd);
+}
+
+static bool ImGui_ImplDX9_CheckFormatSupport(IDirect3DDevice9* pDevice, D3DFORMAT format)
+{
+    IDirect3D9* pd3d = nullptr;
    if (pDevice->GetDirect3D(&pd3d) != D3D_OK)
        return false;
    D3DDEVICE_CREATION_PARAMETERS param = {};
@@ -347,134 +328,58 @@ static bool ImGui_ImplDX9_CheckFormatSupport(LPDIRECT3DDEVICE9 pDevice, D3DFORMA
    return support;
 }

-bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
+static bool ImGui_ImplDX9_CreateFontsTexture()
 {
+    // Build texture atlas
    ImGuiIO& io = ImGui::GetIO();
-    IMGUI_CHECKVERSION();
-    IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");
+    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
+    unsigned char* pixels;
+    int width, height, bytes_per_pixel;
+    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height, &bytes_per_pixel);

-    // Setup backend capabilities flags
-    ImGui_ImplDX9_Data* bd = IM_NEW(ImGui_ImplDX9_Data)();
-    io.BackendRendererUserData = (void*)bd;
-    io.BackendRendererName = "imgui_impl_dx9";
-    io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;  // We can honor the ImDrawCmd::VtxOffset field, allowing for large meshes.
-    io.BackendFlags |= ImGuiBackendFlags_RendererHasTextures;   // We can honor ImGuiPlatformIO::Textures[] requests during render.
+    // Convert RGBA32 to BGRA32 (because RGBA32 is not well supported by DX9 devices)
+#ifndef IMGUI_USE_BGRA_PACKED_COLOR
+    const bool rgba_support = ImGui_ImplDX9_CheckFormatSupport(bd->pd3dDevice, D3DFMT_A8B8G8R8);
+    if (!rgba_support && io.Fonts->TexPixelsUseColors)
+    {
+        ImU32* dst_start = (ImU32*)ImGui::MemAlloc((size_t)width * height * bytes_per_pixel);
+        for (ImU32* src = (ImU32*)pixels, *dst = dst_start, *dst_end = dst_start + (size_t)width * height; dst < dst_end; src++, dst++)
+            *dst = IMGUI_COL_TO_DX9_ARGB(*src);
+        pixels = (unsigned char*)dst_start;
+    }
+#else
+    const bool rgba_support = false;
+#endif

-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
-    platform_io.Renderer_TextureMaxWidth = platform_io.Renderer_TextureMaxHeight = 4096;
+    // Upload texture to graphics system
+    bd->FontTexture.d3dTexture = nullptr;
+    if (bd->pd3dDevice->CreateTexture(width, height, 1, D3DUSAGE_DYNAMIC, rgba_support ? D3DFMT_A8B8G8R8 : D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &bd->FontTexture.d3dTexture, nullptr) < 0)
+        return false;
+    D3DLOCKED_RECT tex_locked_rect;
+    if (bd->FontTexture.d3dTexture->LockRect(0, &tex_locked_rect, nullptr, 0) != D3D_OK)
+        return false;
+    for (int y = 0; y < height; y++)
+        memcpy((unsigned char*)tex_locked_rect.pBits + (size_t)tex_locked_rect.Pitch * y, pixels + (size_t)width * bytes_per_pixel * y, (size_t)width * bytes_per_pixel);
+    bd->FontTexture.d3dTexture->UnlockRect(0);

-    bd->pd3dDevice = device;
-    bd->pd3dDevice->AddRef();
-    bd->HasRgbaSupport = ImGui_ImplDX9_CheckFormatSupport(bd->pd3dDevice, D3DFMT_A8B8G8R8);
+    // Store our identifier
+    io.Fonts->SetTexID((ImTextureID)&bd->FontTexture);
+
+#ifndef IMGUI_USE_BGRA_PACKED_COLOR
+    if (!rgba_support && io.Fonts->TexPixelsUseColors)
+        ImGui::MemFree(pixels);
+#endif

    return true;
 }

-void ImGui_ImplDX9_Shutdown()
-{
-    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
-    IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?");
-    ImGuiIO& io = ImGui::GetIO();
-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
-
-    ImGui_ImplDX9_InvalidateDeviceObjects();
-    if (bd->pd3dDevice) { bd->pd3dDevice->Release(); }
-
-    io.BackendRendererName = nullptr;
-    io.BackendRendererUserData = nullptr;
-    io.BackendFlags &= ~(ImGuiBackendFlags_RendererHasVtxOffset | ImGuiBackendFlags_RendererHasTextures);
-    platform_io.ClearRendererHandlers();
-    IM_DELETE(bd);
-}
-
-// Convert RGBA32 to BGRA32 (because RGBA32 is not well supported by DX9 devices)
-static void ImGui_ImplDX9_CopyTextureRegion(bool tex_use_colors, const ImU32* src, int src_pitch, ImU32* dst, int dst_pitch, int w, int h)
-{
-#ifndef IMGUI_USE_BGRA_PACKED_COLOR
-    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
-    const bool convert_rgba_to_bgra = (!bd->HasRgbaSupport && tex_use_colors);
-#else
-    const bool convert_rgba_to_bgra = false;
-    IM_UNUSED(tex_use_colors);
-#endif
-    for (int y = 0; y < h; y++)
-    {
-        const ImU32* src_p = (const ImU32*)(const void*)((const unsigned char*)src + src_pitch * y);
-        ImU32* dst_p = (ImU32*)(void*)((unsigned char*)dst + dst_pitch * y);
-        if (convert_rgba_to_bgra)
-            for (int x = w; x > 0; x--, src_p++, dst_p++) // Convert copy
-                *dst_p = IMGUI_COL_TO_DX9_ARGB(*src_p);
-        else
-            memcpy(dst_p, src_p, w * 4); // Raw copy
-    }
-}
-
-void ImGui_ImplDX9_UpdateTexture(ImTextureData* tex)
-{
-    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
-
-    if (tex->Status == ImTextureStatus_WantCreate)
-    {
-        // Create and upload new texture to graphics system
-        //IMGUI_DEBUG_LOG("UpdateTexture #%03d: WantCreate %dx%d\n", tex->UniqueID, tex->Width, tex->Height);
-        IM_ASSERT(tex->TexID == ImTextureID_Invalid && tex->BackendUserData == nullptr);
-        IM_ASSERT(tex->Format == ImTextureFormat_RGBA32);
-        LPDIRECT3DTEXTURE9 dx_tex = nullptr;
-        HRESULT hr = bd->pd3dDevice->CreateTexture(tex->Width, tex->Height, 1, D3DUSAGE_DYNAMIC, bd->HasRgbaSupport ? D3DFMT_A8B8G8R8 : D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &dx_tex, nullptr);
-        if (hr < 0)
-        {
-            IM_ASSERT(hr >= 0 && "Backend failed to create texture!");
-            return;
-        }
-
-        D3DLOCKED_RECT locked_rect;
-        if (dx_tex->LockRect(0, &locked_rect, nullptr, 0) == D3D_OK)
-        {
-            ImGui_ImplDX9_CopyTextureRegion(tex->UseColors, (ImU32*)tex->GetPixels(), tex->Width * 4, (ImU32*)locked_rect.pBits, (ImU32)locked_rect.Pitch, tex->Width, tex->Height);
-            dx_tex->UnlockRect(0);
-        }
-
-        // Store identifiers
-        ImTextureDX9* tex_wrapper = new ImTextureDX9{dx_tex, false};
-        tex->SetTexID((ImTextureID)tex_wrapper);
-        tex->SetStatus(ImTextureStatus_OK);
-    }
-    else if (tex->Status == ImTextureStatus_WantUpdates)
-    {
-        // Update selected blocks. We only ever write to textures regions which have never been used before!
-        // This backend choose to use tex->Updates[] but you can use tex->UpdateRect to upload a single region.
-        const ImTextureDX9 *tex_wrapper = (const ImTextureDX9 *)tex->TexID;
-        const LPDIRECT3DTEXTURE9 backend_tex = tex_wrapper->d3dTexture;
-        RECT update_rect = { (LONG)tex->UpdateRect.x, (LONG)tex->UpdateRect.y, (LONG)(tex->UpdateRect.x + tex->UpdateRect.w), (LONG)(tex->UpdateRect.y + tex->UpdateRect.h) };
-        D3DLOCKED_RECT locked_rect;
-        if (backend_tex->LockRect(0, &locked_rect, &update_rect, 0) == D3D_OK)
-            for (ImTextureRect& r : tex->Updates)
-                ImGui_ImplDX9_CopyTextureRegion(tex->UseColors, (ImU32*)tex->GetPixelsAt(r.x, r.y), tex->Width * 4,
-                    (ImU32*)locked_rect.pBits + (r.x - update_rect.left) + (r.y - update_rect.top) * (locked_rect.Pitch / 4), (int)locked_rect.Pitch, r.w, r.h);
-        backend_tex->UnlockRect(0);
-        tex->SetStatus(ImTextureStatus_OK);
-    }
-    else if (tex->Status == ImTextureStatus_WantDestroy)
-    {
-        ImTextureDX9 *tex_wrapper = (ImTextureDX9 *)tex->TexID;
-        if (tex_wrapper)
-        {
-            IM_ASSERT(tex_wrapper == (ImTextureDX9*)tex->TexID);
-            tex_wrapper->d3dTexture->Release();
-            tex_wrapper->d3dTexture = nullptr;
-
-            // Clear identifiers and mark as destroyed (in order to allow e.g. calling InvalidateDeviceObjects while running)
-            tex->SetTexID(ImTextureID_Invalid);
-        }
-        tex->SetStatus(ImTextureStatus_Destroyed);
-    }
-}
-
 bool ImGui_ImplDX9_CreateDeviceObjects()
 {
    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
    if (!bd || !bd->pd3dDevice)
        return false;
+    if (!ImGui_ImplDX9_CreateFontsTexture())
+        return false;
    return true;
 }

@@ -483,23 +388,24 @@ void ImGui_ImplDX9_InvalidateDeviceObjects()
    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
    if (!bd || !bd->pd3dDevice)
        return;
-
-    // Destroy all textures
-    for (ImTextureData* tex : ImGui::GetPlatformIO().Textures)
-        if (tex->RefCount == 1)
-        {
-            tex->SetStatus(ImTextureStatus_WantDestroy);
-            ImGui_ImplDX9_UpdateTexture(tex);
-        }
    if (bd->pVB) { bd->pVB->Release(); bd->pVB = nullptr; }
    if (bd->pIB) { bd->pIB->Release(); bd->pIB = nullptr; }
+    if (bd->FontTexture.d3dTexture)
+    {
+    	bd->FontTexture.d3dTexture->Release();
+    	bd->FontTexture.d3dTexture = nullptr;
+    	// We copied bd->FontTexture to io.Fonts->TexID so let's clear that as well.
+    	ImGui::GetIO().Fonts->SetTexID(0);
+    }
 }

 void ImGui_ImplDX9_NewFrame()
 {
    ImGui_ImplDX9_Data* bd = ImGui_ImplDX9_GetBackendData();
    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplDX9_Init()?");
-    IM_UNUSED(bd);
+
+    if (!bd->FontTexture.d3dTexture)
+        ImGui_ImplDX9_CreateDeviceObjects();
 }

 //-----------------------------------------------------------------------------
@@ -2,10 +2,8 @@
 // This needs to be used along with a Platform Backend (e.g. Win32)

 // Implemented features:
-//  [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as texture identifier. Read the FAQ about ImTextureID/ImTextureRef!
-//  [X] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset).
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
-//  [X] Renderer: IMGUI_USE_BGRA_PACKED_COLOR support, as this is the optimal color encoding for DirectX9.
+//  [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as ImTextureID. Read the FAQ about ImTextureID!
+//  [X] Renderer: Large meshes support (64k+ vertices) with 16-bit indices.

 // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
 // Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
@@ -22,13 +20,12 @@
 struct IDirect3DDevice9;
 struct IDirect3DTexture9;

-// Follow "Getting Started" link and check examples/ folder to learn about using backends!
 IMGUI_IMPL_API bool     ImGui_ImplDX9_Init(IDirect3DDevice9* device);
 IMGUI_IMPL_API void     ImGui_ImplDX9_Shutdown();
 IMGUI_IMPL_API void     ImGui_ImplDX9_NewFrame();
 IMGUI_IMPL_API void     ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data);

-// Use if you want to reset your rendering state without using ImGui_ImplDX9_RenderDrawData.
+// Use if you want to reset your rendering device without losing Dear ImGui state.
 IMGUI_IMPL_API bool     ImGui_ImplDX9_CreateDeviceObjects();
 IMGUI_IMPL_API void     ImGui_ImplDX9_InvalidateDeviceObjects();

@@ -38,7 +35,5 @@ struct ImTextureDX9
 	IDirect3DTexture9 *d3dTexture;
 	bool pointSampling;
 };
-// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = NULL to handle this manually.
-IMGUI_IMPL_API void     ImGui_ImplDX9_UpdateTexture(ImTextureData* tex);

 #endif // #ifndef IMGUI_DISABLE
@@ -11,64 +11,9 @@

 // CHANGELOG
 // (minor and older changes stripped away, please see git history for details)
-//  2025-12-11: OpenGL: Fixed embedded loader multiple init/shutdown cycles broken on some platforms. (#8792, #9112)
-//  2025-09-18: Call platform_io.ClearRendererHandlers() on shutdown.
-//  2025-07-22: OpenGL: Add and call embedded loader shutdown during ImGui_ImplOpenGL3_Shutdown() to facilitate multiple init/shutdown cycles in same process. (#8792)
-//  2025-07-15: OpenGL: Set GL_UNPACK_ALIGNMENT to 1 before updating textures (#8802) + restore non-WebGL/ES update path that doesn't require a CPU-side copy.
-//  2025-06-11: OpenGL: Added support for ImGuiBackendFlags_RendererHasTextures, for dynamic font atlas. Removed ImGui_ImplOpenGL3_CreateFontsTexture() and ImGui_ImplOpenGL3_DestroyFontsTexture().
-//  2025-06-04: OpenGL: Made GLES 3.20 contexts not access GL_CONTEXT_PROFILE_MASK nor GL_PRIMITIVE_RESTART. (#8664)
-//  2025-02-18: OpenGL: Lazily reinitialize embedded GL loader for when calling backend from e.g. other DLL boundaries. (#8406)
-//  2024-10-07: OpenGL: Changed default texture sampler to Clamp instead of Repeat/Wrap.
-//  2024-06-28: OpenGL: ImGui_ImplOpenGL3_NewFrame() recreates font texture if it has been destroyed by ImGui_ImplOpenGL3_DestroyFontsTexture(). (#7748)
-//  2024-05-07: OpenGL: Update loader for Linux to support EGL/GLVND. (#7562)
-//  2024-04-16: OpenGL: Detect ES3 contexts on desktop based on version string, to e.g. avoid calling glPolygonMode() on them. (#7447)
-//  2024-01-09: OpenGL: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" and variants, fixing regression on distros missing a symlink.
-//  2023-11-08: OpenGL: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" instead of "libGL.so.1", accommodating for NetBSD systems having only "libGL.so.3" available. (#6983)
-//  2023-10-05: OpenGL: Rename symbols in our internal loader so that LTO compilation with another copy of gl3w is possible. (#6875, #6668, #4445)
-//  2023-06-20: OpenGL: Fixed erroneous use glGetIntegerv(GL_CONTEXT_PROFILE_MASK) on contexts lower than 3.2. (#6539, #6333)
-//  2023-05-09: OpenGL: Support for glBindSampler() backup/restore on ES3. (#6375)
-//  2023-04-18: OpenGL: Restore front and back polygon mode separately when supported by context. (#6333)
-//  2023-03-23: OpenGL: Properly restoring "no shader program bound" if it was the case prior to running the rendering function. (#6267, #6220, #6224)
-//  2023-03-15: OpenGL: Fixed GL loader crash when GL_VERSION returns nullptr. (#6154, #4445, #3530)
-//  2023-03-06: OpenGL: Fixed restoration of a potentially deleted OpenGL program, by calling glIsProgram(). (#6220, #6224)
-//  2022-11-09: OpenGL: Reverted use of glBufferSubData(), too many corruptions issues + old issues seemingly can't be reproed with Intel drivers nowadays (revert 2021-12-15 and 2022-05-23 changes).
-//  2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11.
-//  2022-09-27: OpenGL: Added ability to '#define IMGUI_IMPL_OPENGL_DEBUG'.
-//  2022-05-23: OpenGL: Reworking 2021-12-15 "Using buffer orphaning" so it only happens on Intel GPU, seems to cause problems otherwise. (#4468, #4825, #4832, #5127).
-//  2022-05-13: OpenGL: Fixed state corruption on OpenGL ES 2.0 due to not preserving GL_ELEMENT_ARRAY_BUFFER_BINDING and vertex attribute states.
-//  2021-12-15: OpenGL: Using buffer orphaning + glBufferSubData(), seems to fix leaks with multi-viewports with some Intel HD drivers.
-//  2021-08-23: OpenGL: Fixed ES 3.0 shader ("#version 300 es") use normal precision floats to avoid wobbly rendering at HD resolutions.
-//  2021-08-19: OpenGL: Embed and use our own minimal GL loader (imgui_impl_opengl3_loader.h), removing requirement and support for third-party loader.
-//  2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX).
-//  2021-06-25: OpenGL: Use OES_vertex_array extension on Emscripten + backup/restore current state.
-//  2021-06-21: OpenGL: Destroy individual vertex/fragment shader objects right after they are linked into the main shader.
-//  2021-05-24: OpenGL: Access GL_CLIP_ORIGIN when "GL_ARB_clip_control" extension is detected, inside of just OpenGL 4.5 version.
-//  2021-05-19: OpenGL: Replaced direct access to ImDrawCmd::TextureId with a call to ImDrawCmd::GetTexID(). (will become a requirement)
-//  2021-04-06: OpenGL: Don't try to read GL_CLIP_ORIGIN unless we're OpenGL 4.5 or greater.
-//  2021-02-18: OpenGL: Change blending equation to preserve alpha in output buffer.
-//  2021-01-03: OpenGL: Backup, setup and restore GL_STENCIL_TEST state.
-//  2020-10-23: OpenGL: Backup, setup and restore GL_PRIMITIVE_RESTART state.
-//  2020-10-15: OpenGL: Use glGetString(GL_VERSION) instead of glGetIntegerv(GL_MAJOR_VERSION, ...) when the later returns zero (e.g. Desktop GL 2.x)
-//  2020-09-17: OpenGL: Fix to avoid compiling/calling glBindSampler() on ES or pre-3.3 context which have the defines set by a loader.
-//  2020-07-10: OpenGL: Added support for glad2 OpenGL loader.
-//  2020-05-08: OpenGL: Made default GLSL version 150 (instead of 130) on OSX.
-//  2020-04-21: OpenGL: Fixed handling of glClipControl(GL_UPPER_LEFT) by inverting projection matrix.
-//  2020-04-12: OpenGL: Fixed context version check mistakenly testing for 4.0+ instead of 3.2+ to enable ImGuiBackendFlags_RendererHasVtxOffset.
-//  2020-03-24: OpenGL: Added support for glbinding 2.x OpenGL loader.
-//  2020-01-07: OpenGL: Added support for glbinding 3.x OpenGL loader.
-//  2019-10-25: OpenGL: Using a combination of GL define and runtime GL version to decide whether to use glDrawElementsBaseVertex(). Fix building with pre-3.2 GL loaders.
-//  2019-09-22: OpenGL: Detect default GL loader using __has_include compiler facility.
-//  2019-09-16: OpenGL: Tweak initialization code to allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before the first NewFrame() call.
-//  2019-05-29: OpenGL: Desktop GL only: Added support for large mesh (64K+ vertices), enable ImGuiBackendFlags_RendererHasVtxOffset flag.
-//  2019-04-30: OpenGL: Added support for special ImDrawCallback_ResetRenderState callback to reset render state.
-//  2019-03-29: OpenGL: Not calling glBindBuffer more than necessary in the render loop.
-//  2019-03-15: OpenGL: Added a GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early.
-//  2019-03-03: OpenGL: Fix support for ES 2.0 (WebGL 1.0).
-//  2019-02-20: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if defined by the headers/loader.
-//  2019-02-11: OpenGL: Projecting clipping rectangles correctly using draw_data->FramebufferScale to allow multi-viewports for retina display.
 //  2019-02-01: OpenGL: Using GLSL 410 shaders for any version over 410 (e.g. 430, 450).
 //  2018-11-30: Misc: Setting up io.BackendRendererName so it can be displayed in the About Window.
-//  2018-11-13: OpenGL: Support for GL 4.5's glClipControl(GL_UPPER_LEFT) / GL_CLIP_ORIGIN.
+//  2018-11-13: OpenGL: Support for GL 4.5's glClipControl(GL_UPPER_LEFT).
 //  2018-08-29: OpenGL: Added support for more OpenGL loaders: glew and glad, with comments indicative that any loader can be used.
 //  2018-08-09: OpenGL: Default to OpenGL ES 3 on iOS and Android. GLSL version default to "#version 300 ES".
 //  2018-07-30: OpenGL: Support for GLSL 300 ES and 410 core. Fixes for Emscripten compilation.
@@ -76,7 +21,7 @@
 //  2018-06-08: Misc: Extracted imgui_impl_opengl3.cpp/.h away from the old combined GLFW/SDL+OpenGL3 examples.
 //  2018-06-08: OpenGL: Use draw_data->DisplayPos and draw_data->DisplaySize to setup projection matrix and clipping rectangle.
 //  2018-05-25: OpenGL: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state.
-//  2018-05-14: OpenGL: Making the call to glBindSampler() optional so 3.2 context won't fail if the function is a nullptr pointer.
+//  2018-05-14: OpenGL: Making the call to glBindSampler() optional so 3.2 context won't fail if the function is a NULL pointer.
 //  2018-03-06: OpenGL: Added const char* glsl_version parameter to ImGui_ImplOpenGL3_Init() so user can override the GLSL version e.g. "#version 150".
 //  2018-02-23: OpenGL: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context.
 //  2018-02-16: Misc: Obsoleted the io.RenderDrawListsFn callback and exposed ImGui_ImplSdlGL3_RenderDrawData() in the .h file so you can call it yourself.
@@ -92,17 +37,17 @@
 // version   version   string
 //----------------------------------------
 //  2.0       110       "#version 110"
-//  2.1       120       "#version 120"
-//  3.0       130       "#version 130"
-//  3.1       140       "#version 140"
+//  2.1       120
+//  3.0       130
+//  3.1       140
 //  3.2       150       "#version 150"
-//  3.3       330       "#version 330 core"
-//  4.0       400       "#version 400 core"
+//  3.3       330
+//  4.0       400
 //  4.1       410       "#version 410 core"
-//  4.2       420       "#version 410 core"
-//  4.3       430       "#version 430 core"
-//  ES 2.0    100       "#version 100"      = WebGL 1.0
-//  ES 3.0    300       "#version 300 es"   = WebGL 2.0
+//  4.2       420
+//  4.3       430
+//  ES 2.0    100       "#version 100"
+//  ES 3.0    300       "#version 300 es"
 //----------------------------------------

 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
@@ -110,7 +55,6 @@
 #endif

 #include "imgui.h"
-#ifndef IMGUI_DISABLE
 #include "imgui_impl_opengl3.h"
 #include <stdio.h>
 #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
@@ -125,110 +69,76 @@
 #include "rend/gles/glcache.h"

 // OpenGL Data
-struct ImGui_ImplOpenGL3_Data
-{
-    GLuint          GlVersion;
-    char            GlslVersionString[32];
-    GLuint          ShaderHandle;
-    GLint           AttribLocationTex;
-    GLint           AttribLocationProjMtx;
-    GLuint          AttribLocationVtxPos;
-    GLuint          AttribLocationVtxUV;
-    GLuint          AttribLocationVtxColor;
-    unsigned int    VboHandle, ElementsHandle;
-    bool            HasPolygonMode;
-    bool            HasBindSampler;
-    bool            HasClipOrigin;
-    ImVector<char>  TempBuffer;
-
-    ImGui_ImplOpenGL3_Data() { memset((void*)this, 0, sizeof(*this)); }
-};
-
-// Backend data stored in io.BackendRendererUserData to allow support for multiple Dear ImGui contexts
-static ImGui_ImplOpenGL3_Data* ImGui_ImplOpenGL3_GetBackendData()
-{
-    return ImGui::GetCurrentContext() ? (ImGui_ImplOpenGL3_Data*)ImGui::GetIO().BackendRendererUserData : nullptr;
-}
+static char         g_GlslVersionString[32] = "";
+static GLuint       g_FontTexture = 0;
+static GLuint       g_ShaderHandle = 0;
+static int          g_AttribLocationTex = 0, g_AttribLocationProjMtx = 0;
+static int          g_AttribLocationPosition = 0, g_AttribLocationUV = 0, g_AttribLocationColor = 0;
+static unsigned int g_VboHandle = 0, g_ElementsHandle = 0;

 // Functions
-bool ImGui_ImplOpenGL3_CreateDeviceObjects();
-void ImGui_ImplOpenGL3_DestroyDeviceObjects();
+static bool ImGui_ImplOpenGL3_CreateDeviceObjects();
+static void ImGui_ImplOpenGL3_DestroyDeviceObjects();

-bool    ImGui_ImplOpenGL3_Init(const char* glsl_version)
+bool    ImGui_ImplOpenGL3_Init()
 {
    ImGuiIO& io = ImGui::GetIO();
    IMGUI_CHECKVERSION();
-    IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");

-    // Setup backend capabilities flags
-    ImGui_ImplOpenGL3_Data* bd = IM_NEW(ImGui_ImplOpenGL3_Data)();
-    io.BackendRendererUserData = (void*)bd;
    io.BackendRendererName = "imgui_impl_opengl3";
-    io.BackendFlags |= ImGuiBackendFlags_RendererHasTextures;

-    // Flycast: Detect version using GL context
-    if (glsl_version == nullptr)
-    {
-        if (GLGraphicsContext::Instance()->isGLES())
-            glsl_version = "#version 100";      // OpenGL ES 2.0
-        else
-#if defined(__APPLE__)
-            glsl_version = "#version 140";      // OpenGL 3.1
-#else
-            glsl_version = "#version 130";      // OpenGL 3.0
-#endif
-    }
-    IM_ASSERT((int)strlen(glsl_version) + 2 < IM_ARRAYSIZE(bd->GlslVersionString));
-    strcpy(bd->GlslVersionString, glsl_version);
-    strcat(bd->GlslVersionString, "\n");
-
-    // Detect extensions we support
-    const bool isGLES = GLGraphicsContext::Instance()->isGLES();
-    const int majorVer = GLGraphicsContext::Instance()->getMajorVersion();
-    bd->HasPolygonMode = !isGLES;
-    if (isGLES)
-    	// GLES 3.0+
-    	bd->HasBindSampler = majorVer >= 3;
+    // Store GLSL version string so we can refer to it later in case we recreate shaders. Note: GLSL version is NOT the same as GL version. Leave this to NULL if unsure.
+    const char* glsl_version;
+    if (theGLContext.isGLES())
+    	glsl_version = "#version 100";		// OpenGL ES 2.0
    else
-    	// OpenGL 3.3+
-    	bd->HasBindSampler = majorVer > 3
-			|| (majorVer == 3 && GLGraphicsContext::Instance()->getMinorVersion() >= 3);
-#ifdef GL_CLIP_ORIGIN
-    bd->HasClipOrigin = (majorVer >= 4 && glClipControl != NULL);
+#if defined(__APPLE__)
+    	glsl_version = "#version 140";		// OpenGL 3.1
+#else
+    	glsl_version = "#version 130";		// OpenGL 3.0
 #endif
+    IM_ASSERT((int)strlen(glsl_version) + 2 < IM_ARRAYSIZE(g_GlslVersionString));
+    strcpy(g_GlslVersionString, glsl_version);
+    strcat(g_GlslVersionString, "\n");

    return true;
 }

 void    ImGui_ImplOpenGL3_Shutdown()
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-    IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?");
-    ImGuiIO& io = ImGui::GetIO();
-    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
-
    ImGui_ImplOpenGL3_DestroyDeviceObjects();
-
-    io.BackendRendererName = nullptr;
-    io.BackendRendererUserData = nullptr;
-    io.BackendFlags &= ~ImGuiBackendFlags_RendererHasTextures;
-    platform_io.ClearRendererHandlers();
-    IM_DELETE(bd);
 }

 void    ImGui_ImplOpenGL3_NewFrame()
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplOpenGL3_Init()?");
-
-    if (!bd->ShaderHandle)
-        if (!ImGui_ImplOpenGL3_CreateDeviceObjects())
-            IM_ASSERT(0 && "ImGui_ImplOpenGL3_CreateDeviceObjects() failed!");
+    if (!g_FontTexture)
+        ImGui_ImplOpenGL3_CreateDeviceObjects();
 }

-static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_width, int fb_height, GLuint vertex_array_object)
+// OpenGL3 Render function.
+// (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop)
+// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly, in order to be able to run within any OpenGL engine that doesn't do so.
+void    ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data)
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
+    // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
+    ImGuiIO& io = ImGui::GetIO();
+    int fb_width = (int)(draw_data->DisplaySize.x * io.DisplayFramebufferScale.x);
+    int fb_height = (int)(draw_data->DisplaySize.y * io.DisplayFramebufferScale.y);
+    if (fb_width <= 0 || fb_height <= 0)
+        return;
+    draw_data->ScaleClipRects(io.DisplayFramebufferScale);
+
+    // Backup GL state
+    glActiveTexture(GL_TEXTURE0);
+    bool clip_origin_lower_left = true;
+#ifdef GL_CLIP_ORIGIN
+    if (theGLContext.getMajorVersion() >= 4 && glClipControl != NULL)
+    {
+		GLenum last_clip_origin = 0; glGetIntegerv(GL_CLIP_ORIGIN, (GLint*)&last_clip_origin); // Support for GL 4.5's glClipControl(GL_UPPER_LEFT)
+		if (last_clip_origin == GL_UPPER_LEFT)
+			clip_origin_lower_left = false;
+    }
+#endif

    // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, polygon fill
    glcache.Enable(GL_BLEND);
@@ -236,24 +146,13 @@ static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_wid
    glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
    glcache.Disable(GL_CULL_FACE);
    glcache.Disable(GL_DEPTH_TEST);
-    glcache.Disable(GL_STENCIL_TEST);
    glcache.Enable(GL_SCISSOR_TEST);
+    glcache.Disable(GL_STENCIL_TEST);
 #ifdef GL_POLYGON_MODE
-    if (bd->HasPolygonMode && glPolygonMode != NULL)
+    if (glPolygonMode != NULL)
    	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 #endif

-    // Support for GL 4.5 rarely used glClipControl(GL_UPPER_LEFT)
-#if defined(GL_CLIP_ORIGIN)
-    bool clip_origin_lower_left = true;
-    if (bd->HasClipOrigin)
-    {
-        GLenum current_clip_origin = 0; glGetIntegerv(GL_CLIP_ORIGIN, (GLint*)&current_clip_origin);
-        if (current_clip_origin == GL_UPPER_LEFT)
-            clip_origin_lower_left = false;
-    }
-#endif
-
    // Setup viewport, orthographic projection matrix
    // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayMin is typically (0,0) for single viewport apps.
    glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height);
@@ -261,9 +160,6 @@ static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_wid
    float R = draw_data->DisplayPos.x + draw_data->DisplaySize.x;
    float T = draw_data->DisplayPos.y;
    float B = draw_data->DisplayPos.y + draw_data->DisplaySize.y;
-#if defined(GL_CLIP_ORIGIN)
-    if (!clip_origin_lower_left) { float tmp = T; T = B; B = tmp; } // Swap top and bottom if origin is upper left
-#endif
    const float ortho_projection[4][4] =
    {
        { 2.0f/(R-L),   0.0f,         0.0f,   0.0f },
@@ -271,95 +167,64 @@ static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_wid
        { 0.0f,         0.0f,        -1.0f,   0.0f },
        { (R+L)/(L-R),  (T+B)/(B-T),  0.0f,   1.0f },
    };
-    glcache.UseProgram(bd->ShaderHandle);
-    glUniform1i(bd->AttribLocationTex, 0);
-    glUniformMatrix4fv(bd->AttribLocationProjMtx, 1, GL_FALSE, &ortho_projection[0][0]);
+    glcache.UseProgram(g_ShaderHandle);
+    glUniform1i(g_AttribLocationTex, 0);
+    glUniformMatrix4fv(g_AttribLocationProjMtx, 1, GL_FALSE, &ortho_projection[0][0]);
 #ifndef GLES2
-    if (bd->HasBindSampler && glBindSampler != NULL)
+    if (theGLContext.getMajorVersion() >= 3 && glBindSampler != NULL)
    	glBindSampler(0, 0); // We use combined texture/sampler state. Applications using GL 3.3 may set that otherwise.
 #endif
+    GLuint vao_handle = 0;
 #ifndef GLES2
-    if (GLGraphicsContext::Instance()->getMajorVersion() >= 3)
-		glBindVertexArray(vertex_array_object);
-#endif
-    glBindBuffer(GL_ARRAY_BUFFER, bd->VboHandle);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bd->ElementsHandle);
-    glEnableVertexAttribArray(bd->AttribLocationVtxPos);
-    glEnableVertexAttribArray(bd->AttribLocationVtxUV);
-    glEnableVertexAttribArray(bd->AttribLocationVtxColor);
-    glVertexAttribPointer(bd->AttribLocationVtxPos, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, pos));
-    glVertexAttribPointer(bd->AttribLocationVtxUV, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, uv));
-    glVertexAttribPointer(bd->AttribLocationVtxColor, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, col));
-}
-
-// OpenGL3 Render function.
-// (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop)
-// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly, in order to be able to run within any OpenGL engine that doesn't do so.
-void    ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data)
-{
-    // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
-    int fb_width = (int)(draw_data->DisplaySize.x * draw_data->FramebufferScale.x);
-    int fb_height = (int)(draw_data->DisplaySize.y * draw_data->FramebufferScale.y);
-    if (fb_width <= 0 || fb_height <= 0)
-        return;
-
-    // Catch up with texture updates. Most of the times, the list will have 1 element with an OK status, aka nothing to do.
-    // (This almost always points to ImGui::GetPlatformIO().Textures[] but is part of ImDrawData to allow overriding or disabling texture updates).
-    if (draw_data->Textures != nullptr)
-        for (ImTextureData* tex : *draw_data->Textures)
-            if (tex->Status != ImTextureStatus_OK)
-                ImGui_ImplOpenGL3_UpdateTexture(tex);
-
-    // Backup GL state
-    glActiveTexture(GL_TEXTURE0);
-
-    // Setup desired GL state
-    // Recreate the VAO every time (this is to easily allow multiple GL contexts to be rendered to. VAO are not shared among GL contexts)
-    // The renderer would actually work without any VAO bound, but then our VertexAttrib calls would overwrite the default one currently bound.
-    GLuint vertex_array_object = 0;
-#ifndef GLES2
-    if (GLGraphicsContext::Instance()->getMajorVersion() >= 3)
-        glGenVertexArrays(1, &vertex_array_object);
-#endif
-    ImGui_ImplOpenGL3_SetupRenderState(draw_data, fb_width, fb_height, vertex_array_object);
-
-    // Will project scissor/clipping rectangles into framebuffer space
-    ImVec2 clip_off = draw_data->DisplayPos;         // (0,0) unless using multi-viewports
-    ImVec2 clip_scale = draw_data->FramebufferScale; // (1,1) unless using retina display which are often (2,2)
-
-	for (const ImDrawList* draw_list : draw_data->CmdLists)
+    if (theGLContext.getMajorVersion() >= 3)
    {
+		// Recreate the VAO every time
+		// (This is to easily allow multiple GL contexts. VAO are not shared among GL contexts, and we don't track creation/deletion of windows so we don't have an obvious key to use to cache them.)
+		glGenVertexArrays(1, &vao_handle);
+		glBindVertexArray(vao_handle);
+    }
+#endif
+    glBindBuffer(GL_ARRAY_BUFFER, g_VboHandle);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ElementsHandle);
+    glEnableVertexAttribArray(g_AttribLocationPosition);
+    glEnableVertexAttribArray(g_AttribLocationUV);
+    glEnableVertexAttribArray(g_AttribLocationColor);
+    glVertexAttribPointer(g_AttribLocationPosition, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, pos));
+    glVertexAttribPointer(g_AttribLocationUV, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, uv));
+    glVertexAttribPointer(g_AttribLocationColor, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, col));

-        glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)draw_list->VtxBuffer.Size * sizeof(ImDrawVert), (const GLvoid*)draw_list->VtxBuffer.Data, GL_STREAM_DRAW);
-        glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)draw_list->IdxBuffer.Size * sizeof(ImDrawIdx), (const GLvoid*)draw_list->IdxBuffer.Data, GL_STREAM_DRAW);
+    // Draw
+    ImVec2 pos = draw_data->DisplayPos;
+    for (int n = 0; n < draw_data->CmdListsCount; n++)
+    {
+        const ImDrawList* cmd_list = draw_data->CmdLists[n];

-        for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++)
+        glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)cmd_list->VtxBuffer.Size * sizeof(ImDrawVert), (const GLvoid*)cmd_list->VtxBuffer.Data, GL_STREAM_DRAW);
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx), (const GLvoid*)cmd_list->IdxBuffer.Data, GL_STREAM_DRAW);
+
+        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
        {
-            const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i];
-            if (pcmd->UserCallback != nullptr)
+            const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
+            if (pcmd->UserCallback)
            {
-                // User callback, registered via ImDrawList::AddCallback()
-                // (ImDrawCallback_ResetRenderState is a special callback value used by the user to request the renderer to reset render state.)
-                if (pcmd->UserCallback == ImDrawCallback_ResetRenderState)
-                    ImGui_ImplOpenGL3_SetupRenderState(draw_data, fb_width, fb_height, vertex_array_object);
-                else
-                    pcmd->UserCallback(draw_list, pcmd);
+                // User callback (registered via ImDrawList::AddCallback)
+                pcmd->UserCallback(cmd_list, pcmd);
            }
            else
            {
-                // Project scissor/clipping rectangles into framebuffer space
-                ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y);
-                ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y);
-                if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y)
-                    continue;
+                ImVec4 clip_rect = ImVec4(pcmd->ClipRect.x - pos.x, pcmd->ClipRect.y - pos.y, pcmd->ClipRect.z - pos.x, pcmd->ClipRect.w - pos.y);
+                if (clip_rect.x < fb_width && clip_rect.y < fb_height && clip_rect.z >= 0.0f && clip_rect.w >= 0.0f)
+                {
+                    // Apply scissor/clipping rectangle
+                    if (clip_origin_lower_left)
+                    	glcache.Scissor((int)clip_rect.x, (int)(fb_height - clip_rect.w), (int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y));
+                    else
+                    	glcache.Scissor((int)clip_rect.x, (int)clip_rect.y, (int)clip_rect.z, (int)clip_rect.w); // Support for GL 4.5's glClipControl(GL_UPPER_LEFT)

-                // Apply scissor/clipping rectangle (Y is inverted in OpenGL)
-                glcache.Scissor((int)clip_min.x, (int)((float)fb_height - clip_max.y), (int)(clip_max.x - clip_min.x), (int)(clip_max.y - clip_min.y));
-
-                // Bind texture, Draw
-                glcache.BindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->GetTexID());
-                glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx)));
-                
+                    // Bind texture, Draw
+                    glcache.BindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId);
+                    glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx)));
+                }
            }
        }
    }
@@ -367,77 +232,43 @@ void    ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data)
    glcache.BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #ifndef GLES2
-    if (vertex_array_object != 0)
-    	glDeleteVertexArrays(1, &vertex_array_object);
+    if (vao_handle != 0)
+    	glDeleteVertexArrays(1, &vao_handle);
 #endif
 }

-static void ImGui_ImplOpenGL3_DestroyTexture(ImTextureData* tex)
+static bool ImGui_ImplOpenGL3_CreateFontsTexture()
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-    if (tex->BackendUserData != (void*)bd)
-        return;
-    GLuint gl_tex_id = (GLuint)(intptr_t)tex->TexID;
-    if (gl_tex_id != 0)
-        glcache.DeleteTextures(1, &gl_tex_id);
-    tex->SetTexID(ImTextureID_Invalid);
-    tex->SetStatus(ImTextureStatus_Destroyed);
-    tex->BackendUserData = nullptr;
+    // Build texture atlas
+    ImGuiIO& io = ImGui::GetIO();
+    unsigned char* pixels;
+    int width, height;
+    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);   // Load as RGBA 32-bits (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory.
+
+    // Upload texture to graphics system
+    g_FontTexture = glcache.GenTexture();
+    glcache.BindTexture(GL_TEXTURE_2D, g_FontTexture);
+    glcache.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glcache.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    if (theGLContext.getMajorVersion() >= 3)
+    	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+
+    // Store our identifier
+    io.Fonts->TexID = (ImTextureID)(intptr_t)g_FontTexture;
+
+    return true;
 }

-void ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex)
+static void ImGui_ImplOpenGL3_DestroyFontsTexture()
 {
-    if (tex->Status == ImTextureStatus_Destroyed)
-        tex->SetStatus(ImTextureStatus_WantCreate);
-
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-
-    if (tex->Status == ImTextureStatus_WantCreate || tex->Status == ImTextureStatus_WantUpdates)
+    if (g_FontTexture)
    {
-        if (GLGraphicsContext::Instance()->getMajorVersion() >= 3)
-            glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+        ImGuiIO& io = ImGui::GetIO();
+        glcache.DeleteTextures(1, &g_FontTexture);
+        io.Fonts->TexID = 0;
+        g_FontTexture = 0;
    }
-
-    if (tex->Status == ImTextureStatus_WantCreate)
-    {
-        GLuint gl_texture_id = glcache.GenTexture();
-        glcache.BindTexture(GL_TEXTURE_2D, gl_texture_id);
-        glcache.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glcache.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex->Width, tex->Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex->GetPixels());
-
-        tex->SetTexID((ImTextureID)(intptr_t)gl_texture_id);
-        tex->SetStatus(ImTextureStatus_OK);
-        tex->BackendUserData = (void*)bd;
-    }
-    else if (tex->Status == ImTextureStatus_WantUpdates)
-    {
-        GLuint gl_tex_id = (GLuint)(intptr_t)tex->TexID;
-        glcache.BindTexture(GL_TEXTURE_2D, gl_tex_id);
-        if (GLGraphicsContext::Instance()->getMajorVersion() >= 3)
-        {
-             glPixelStorei(GL_UNPACK_ROW_LENGTH, tex->Width);
-             for (auto& r : tex->Updates)
-                 glTexSubImage2D(GL_TEXTURE_2D, 0, r.x, r.y, r.w, r.h, GL_RGBA, GL_UNSIGNED_BYTE, tex->GetPixelsAt(r.x, r.y));
-             glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-        }
-        else
-        {
-             // Fallback for GLES2 / No unpack row length: use a temporary buffer to upload
-             for (auto& r : tex->Updates)
-             {
-                 const int src_pitch = r.w * 4; // RGBA
-                 bd->TempBuffer.resize(r.h * src_pitch);
-                 char* out_p = bd->TempBuffer.Data;
-                 for (int y = 0; y < r.h; y++, out_p += src_pitch)
-                     memcpy(out_p, (const char*)tex->GetPixelsAt(r.x, r.y + y), src_pitch);
-                 glTexSubImage2D(GL_TEXTURE_2D, 0, r.x, r.y, r.w, r.h, GL_RGBA, GL_UNSIGNED_BYTE, bd->TempBuffer.Data);
-             }
-        }
-        tex->SetStatus(ImTextureStatus_OK);
-    }
-    else if (tex->Status == ImTextureStatus_WantDestroy && tex->UnusedFrames > 0)
-        ImGui_ImplOpenGL3_DestroyTexture(tex);
 }

 // If you get an error please report on github. You may try different GL context version or GLSL version. See GL<>GLSL version table at the top of this file.
@@ -461,12 +292,11 @@ static bool CheckShader(GLuint handle, const char* desc)
 // If you get an error please report on GitHub. You may try different GL context version or GLSL version.
 static bool CheckProgram(GLuint handle, const char* desc)
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
    GLint status = 0, log_length = 0;
    glGetProgramiv(handle, GL_LINK_STATUS, &status);
    glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length);
    if ((GLboolean)status == GL_FALSE)
-    	WARN_LOG(RENDERER, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to link %s! (with GLSL '%s')", desc, bd->GlslVersionString);
+    	WARN_LOG(RENDERER, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to link %s! (with GLSL '%s')", desc, g_GlslVersionString);
    if (log_length > 0)
    {
        ImVector<char> buf;
@@ -477,13 +307,11 @@ static bool CheckProgram(GLuint handle, const char* desc)
    return (GLboolean)status == GL_TRUE;
 }

-bool    ImGui_ImplOpenGL3_CreateDeviceObjects()
+static bool ImGui_ImplOpenGL3_CreateDeviceObjects()
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-
    // Parse GLSL version string
    int glsl_version = 130;
-    sscanf(bd->GlslVersionString, "#version %d", &glsl_version);
+    sscanf(g_GlslVersionString, "#version %d", &glsl_version);

    const GLchar* vertex_shader_glsl_120 =
        "uniform mat4 ProjMtx;\n"
@@ -514,7 +342,7 @@ bool    ImGui_ImplOpenGL3_CreateDeviceObjects()
        "}\n";

    const GLchar* vertex_shader_glsl_300_es =
-        "precision highp float;\n"
+        "precision mediump float;\n"
        "layout (location = 0) in vec2 Position;\n"
        "layout (location = 1) in vec2 UV;\n"
        "layout (location = 2) in vec4 Color;\n"
@@ -586,8 +414,8 @@ bool    ImGui_ImplOpenGL3_CreateDeviceObjects()
        "}\n";

    // Select shaders matching our GLSL versions
-    const GLchar* vertex_shader = nullptr;
-    const GLchar* fragment_shader = nullptr;
+    const GLchar* vertex_shader = NULL;
+    const GLchar* fragment_shader = NULL;
    if (glsl_version < 130)
    {
        vertex_shader = vertex_shader_glsl_120;
@@ -610,61 +438,52 @@ bool    ImGui_ImplOpenGL3_CreateDeviceObjects()
    }

    // Create shaders
-    const GLchar* vertex_shader_with_version[2] = { bd->GlslVersionString, vertex_shader };
+    const GLchar* vertex_shader_with_version[2] = { g_GlslVersionString, vertex_shader };
    GLuint vert_handle = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vert_handle, 2, vertex_shader_with_version, nullptr);
+    glShaderSource(vert_handle, 2, vertex_shader_with_version, NULL);
    glCompileShader(vert_handle);
-    if (!CheckShader(vert_handle, "vertex shader"))
-        return false;
+    CheckShader(vert_handle, "vertex shader");

-    const GLchar* fragment_shader_with_version[2] = { bd->GlslVersionString, fragment_shader };
+    const GLchar* fragment_shader_with_version[2] = { g_GlslVersionString, fragment_shader };
    GLuint frag_handle = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(frag_handle, 2, fragment_shader_with_version, nullptr);
+    glShaderSource(frag_handle, 2, fragment_shader_with_version, NULL);
    glCompileShader(frag_handle);
-    if (!CheckShader(frag_handle, "fragment shader"))
-        return false;
+    CheckShader(frag_handle, "fragment shader");

-    // Link
-    bd->ShaderHandle = glCreateProgram();
-    glAttachShader(bd->ShaderHandle, vert_handle);
-    glAttachShader(bd->ShaderHandle, frag_handle);
-    glLinkProgram(bd->ShaderHandle);
-    if (!CheckProgram(bd->ShaderHandle, "shader program"))
-        return false;
+    g_ShaderHandle = glCreateProgram();
+    glAttachShader(g_ShaderHandle, vert_handle);
+    glAttachShader(g_ShaderHandle, frag_handle);
+    glLinkProgram(g_ShaderHandle);
+    CheckProgram(g_ShaderHandle, "shader program");

-    glDetachShader(bd->ShaderHandle, vert_handle);
-    glDetachShader(bd->ShaderHandle, frag_handle);
+    glDetachShader(g_ShaderHandle, vert_handle);
+    glDetachShader(g_ShaderHandle, frag_handle);
    glDeleteShader(vert_handle);
    glDeleteShader(frag_handle);

-    bd->AttribLocationTex = glGetUniformLocation(bd->ShaderHandle, "Texture");
-    bd->AttribLocationProjMtx = glGetUniformLocation(bd->ShaderHandle, "ProjMtx");
-    bd->AttribLocationVtxPos = (GLuint)glGetAttribLocation(bd->ShaderHandle, "Position");
-    bd->AttribLocationVtxUV = (GLuint)glGetAttribLocation(bd->ShaderHandle, "UV");
-    bd->AttribLocationVtxColor = (GLuint)glGetAttribLocation(bd->ShaderHandle, "Color");
+    g_AttribLocationTex = glGetUniformLocation(g_ShaderHandle, "Texture");
+    g_AttribLocationProjMtx = glGetUniformLocation(g_ShaderHandle, "ProjMtx");
+    g_AttribLocationPosition = glGetAttribLocation(g_ShaderHandle, "Position");
+    g_AttribLocationUV = glGetAttribLocation(g_ShaderHandle, "UV");
+    g_AttribLocationColor = glGetAttribLocation(g_ShaderHandle, "Color");

    // Create buffers
-    glGenBuffers(1, &bd->VboHandle);
-    glGenBuffers(1, &bd->ElementsHandle);
+    glGenBuffers(1, &g_VboHandle);
+    glGenBuffers(1, &g_ElementsHandle);
+
+    ImGui_ImplOpenGL3_CreateFontsTexture();

    return true;
 }

-void    ImGui_ImplOpenGL3_DestroyDeviceObjects()
+static void ImGui_ImplOpenGL3_DestroyDeviceObjects()
 {
-    ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData();
-    if (bd == nullptr) {
-    	WARN_LOG(RENDERER, "ImGui_ImplOpenGL3_DestroyDeviceObjects: backend data is null");
-    	return;
-    }
-    if (bd->VboHandle)      { glDeleteBuffers(1, &bd->VboHandle); bd->VboHandle = 0; }
-    if (bd->ElementsHandle) { glDeleteBuffers(1, &bd->ElementsHandle); bd->ElementsHandle = 0; }
-    if (bd->ShaderHandle)   { glDeleteProgram(bd->ShaderHandle); bd->ShaderHandle = 0; }
+    if (g_VboHandle) glDeleteBuffers(1, &g_VboHandle);
+    if (g_ElementsHandle) glDeleteBuffers(1, &g_ElementsHandle);
+    g_VboHandle = g_ElementsHandle = 0;

-    // Destroy all textures
-    for (ImTextureData* tex : ImGui::GetPlatformIO().Textures)
-        if (tex->RefCount == 1)
-            ImGui_ImplOpenGL3_DestroyTexture(tex);
+    glcache.DeleteProgram(g_ShaderHandle);
+    g_ShaderHandle = 0;
+
+    ImGui_ImplOpenGL3_DestroyFontsTexture();
 }
-
-#endif // #ifndef IMGUI_DISABLE
@@ -1,68 +1,35 @@
-// dear imgui: Renderer Backend for modern OpenGL with shaders / programmatic pipeline
-// - Desktop GL: 2.x 3.x 4.x
-// - Embedded GL: ES 2.0 (WebGL 1.0), ES 3.0 (WebGL 2.0)
-// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..)
+// dear imgui: Renderer for OpenGL3 / OpenGL ES2 / OpenGL ES3 (modern OpenGL with shaders / programmatic pipeline)
+// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..)
+// (Note: We are using GL3W as a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc..)

 // Implemented features:
-//  [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture as texture identifier. Read the FAQ about ImTextureID/ImTextureRef!
-//  [x] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset) [Desktop OpenGL only!]
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
+//  [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp.

-// About WebGL/ES:
-// - You need to '#define IMGUI_IMPL_OPENGL_ES2' or '#define IMGUI_IMPL_OPENGL_ES3' to use WebGL or OpenGL ES.
-// - This is done automatically on iOS, Android and Emscripten targets.
-// - For other targets, the define needs to be visible from the imgui_impl_opengl3.cpp compilation unit. If unsure, define globally or in imconfig.h.
+// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
+// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp.
+// https://github.com/ocornut/imgui

-// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
-// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
-// Learn about Dear ImGui:
-// - FAQ                  https://dearimgui.com/faq
-// - Getting Started      https://dearimgui.com/getting-started
-// - Documentation        https://dearimgui.com/docs (same as your local docs/ folder).
-// - Introduction, links and more at the top of imgui.cpp
+// About OpenGL function loaders:
+// About OpenGL function loaders: modern OpenGL doesn't have a standard header file and requires individual function pointers to be loaded manually.
+// Helper libraries are often used for this purpose! Here we are supporting a few common ones: gl3w, glew, glad.
+// You may use another loader/header of your choice (glext, glLoadGen, etc.), or chose to manually implement your own.

 // About GLSL version:
-//  The 'glsl_version' initialization parameter should be nullptr (default) or a "#version XXX" string.
-//  On computer platform the GLSL version default to "#version 130". On OpenGL ES 3 platform it defaults to "#version 300 es"
-//  Only override if your GL version doesn't handle this GLSL version. See GLSL version table at the top of imgui_impl_opengl3.cpp.
+// The 'glsl_version' initialization parameter should be NULL (default) or a "#version XXX" string.
+// On computer platform the GLSL version default to "#version 130". On OpenGL ES 3 platform it defaults to "#version 300 es"
+// Only override if your GL version doesn't handle this GLSL version. See GLSL version table at the top of imgui_impl_opengl3.cpp.

 #pragma once
-#include "imgui.h"      // IMGUI_IMPL_API
-#ifndef IMGUI_DISABLE

-// Follow "Getting Started" link and check examples/ folder to learn about using backends!
-IMGUI_IMPL_API bool     ImGui_ImplOpenGL3_Init(const char* glsl_version = nullptr);
+// Set default OpenGL loader to be gl3w
+#if !defined(IMGUI_IMPL_OPENGL_LOADER_GL3W)     \
+ && !defined(IMGUI_IMPL_OPENGL_LOADER_GLEW)     \
+ && !defined(IMGUI_IMPL_OPENGL_LOADER_GLAD)     \
+ && !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM)
+#define IMGUI_IMPL_OPENGL_LOADER_GL3W
+#endif
+
+IMGUI_IMPL_API bool     ImGui_ImplOpenGL3_Init();
 IMGUI_IMPL_API void     ImGui_ImplOpenGL3_Shutdown();
 IMGUI_IMPL_API void     ImGui_ImplOpenGL3_NewFrame();
 IMGUI_IMPL_API void     ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data);
-
-// (Optional) Called by Init/NewFrame/Shutdown
-IMGUI_IMPL_API bool     ImGui_ImplOpenGL3_CreateDeviceObjects();
-IMGUI_IMPL_API void     ImGui_ImplOpenGL3_DestroyDeviceObjects();
-
-// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = nullptr to handle this manually.
-IMGUI_IMPL_API void     ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex);
-
-// Configuration flags to add in your imconfig file:
-//#define IMGUI_IMPL_OPENGL_ES2     // Enable ES 2 (Auto-detected on Emscripten)
-//#define IMGUI_IMPL_OPENGL_ES3     // Enable ES 3 (Auto-detected on iOS/Android)
-
-// You can explicitly select GLES2 or GLES3 API by using one of the '#define IMGUI_IMPL_OPENGL_LOADER_XXX' in imconfig.h or compiler command-line.
-#if !defined(IMGUI_IMPL_OPENGL_ES2) \
-&& !defined(IMGUI_IMPL_OPENGL_ES3)
-
-// Try to detect GLES on matching platforms
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#endif
-#if (defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_TV)) || (defined(__ANDROID__))
-#define IMGUI_IMPL_OPENGL_ES3               // iOS, Android  -> GL ES 3, "#version 300 es"
-#elif defined(__EMSCRIPTEN__) || defined(__amigaos4__)
-#define IMGUI_IMPL_OPENGL_ES2               // Emscripten    -> GL ES 2, "#version 100"
-#else
-// Otherwise imgui_impl_opengl3_loader.h will be used.
-#endif
-
-#endif
-
-#endif // #ifndef IMGUI_DISABLE
@@ -2,10 +2,11 @@
 // This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..)

 // Implemented features:
-//  [!] Renderer: User texture binding. Use 'VkDescriptorSet' as texture identifier. Call ImGui_ImplVulkan_AddTexture() to register one. Read the FAQ about ImTextureID/ImTextureRef + https://github.com/ocornut/imgui/pull/914 for discussions.
-//  [X] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset).
-//  [X] Renderer: Texture updates support for dynamic font atlas (ImGuiBackendFlags_RendererHasTextures).
-//  [X] Renderer: Expose selected render state for draw callbacks to use. Access in '(ImGui_ImplXXXX_RenderState*)GetPlatformIO().Renderer_RenderState'.
+//  [!] Renderer: User texture binding. Use 'VkDescriptorSet' as ImTextureID. Read the FAQ about ImTextureID! See https://github.com/ocornut/imgui/pull/914 for discussions.
+//  [X] Renderer: Large meshes support (64k+ vertices) with 16-bit indices.
+
+// Important: on 32-bit systems, user texture binding is only supported if your imconfig file has '#define ImTextureID ImU64'.
+// See imgui_impl_vulkan.cpp file for details.

 // The aim of imgui_impl_vulkan.h/.cpp is to be usable in your engine without any modification.
 // IF YOU FEEL YOU NEED TO MAKE ANY CHANGE TO THIS CODE, please share them and your feedback at https://github.com/ocornut/imgui/
@@ -41,20 +42,9 @@
 // If you have no idea what this is, leave it alone!
 //#define IMGUI_IMPL_VULKAN_NO_PROTOTYPES

-// [Configuration] Convenience support for Volk
+// Convenience support for Volk
 // (you can also technically use IMGUI_IMPL_VULKAN_NO_PROTOTYPES + wrap Volk via ImGui_ImplVulkan_LoadFunctions().)
-// (When using Volk from directory outside your include directories list you can specify full path to the volk.h header,
-//  for example when using Volk from VulkanSDK and using include_directories(${Vulkan_INCLUDE_DIRS})' from 'find_package(Vulkan REQUIRED)')
 //#define IMGUI_IMPL_VULKAN_USE_VOLK
-//#define IMGUI_IMPL_VULKAN_VOLK_FILENAME    <Volk/volk.h>
-//#define IMGUI_IMPL_VULKAN_VOLK_FILENAME    <volk.h>       // Default
-// Reminder: make those changes in your imconfig.h file, not here!
-
-// Clang/GCC warnings with -Weverything
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast
-#endif

 #if defined(IMGUI_IMPL_VULKAN_NO_PROTOTYPES) && !defined(VK_NO_PROTOTYPES)
 #define VK_NO_PROTOTYPES
@@ -65,11 +55,7 @@

 // Vulkan includes
 #ifdef IMGUI_IMPL_VULKAN_USE_VOLK
-#ifdef IMGUI_IMPL_VULKAN_VOLK_FILENAME
-#include IMGUI_IMPL_VULKAN_VOLK_FILENAME
-#else
-#include <volk.h>
-#endif
+#include <Volk/volk.h>
 #else
 #include <vulkan/vulkan.h>
 #endif
@@ -77,131 +63,84 @@
 #define IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
 #endif

-// Backend uses a small number of descriptors per font atlas + as many as additional calls done to ImGui_ImplVulkan_AddTexture().
-#define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (8)     // Minimum per atlas
-
-// Specify settings to create pipeline and swapchain
-struct ImGui_ImplVulkan_PipelineInfo
-{
-    VkRenderPass                    RenderPass;                     // Ignored if using dynamic rendering
-    uint32_t                        Subpass;                        //
-    VkSampleCountFlagBits           MSAASamples = {};               // 0 defaults to VK_SAMPLE_COUNT_1_BIT
-#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
-    VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;   // Optional, valid if .sType == VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR
-#endif
-};
-
 // Initialization data, for ImGui_ImplVulkan_Init()
+// - VkDescriptorPool should be created with VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
+//   and must contain a pool size large enough to hold an ImGui VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER descriptor.
+// - When using dynamic rendering, set UseDynamicRendering=true and fill PipelineRenderingCreateInfo structure.
 // [Please zero-clear before use!]
-// - About descriptor pool:
-//   - A VkDescriptorPool should be created with VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
-//     and must contain a pool size large enough to hold a small number of VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER descriptors.
-//   - As an convenience, by setting DescriptorPoolSize > 0 the backend will create one for you.
-// - About dynamic rendering:
-//   - When using dynamic rendering, set UseDynamicRendering=true + fill PipelineInfoMain.PipelineRenderingCreateInfo structure.
 struct ImGui_ImplVulkan_InitInfo
 {
-    uint32_t                        ApiVersion;                 // Fill with API version of Instance, e.g. VK_API_VERSION_1_3 or your value of VkApplicationInfo::apiVersion. May be lower than header version (VK_HEADER_VERSION_COMPLETE)
    VkInstance                      Instance;
    VkPhysicalDevice                PhysicalDevice;
    VkDevice                        Device;
    uint32_t                        QueueFamily;
    VkQueue                         Queue;
-    VkDescriptorPool                DescriptorPool;             // See requirements in note above; ignored if using DescriptorPoolSize > 0
-    uint32_t                        DescriptorPoolSize;         // Optional: set to create internal descriptor pool automatically instead of using DescriptorPool.
-    uint32_t                        MinImageCount;              // >= 2
-    uint32_t                        ImageCount;                 // >= MinImageCount
-    VkPipelineCache                 PipelineCache;              // Optional
+    VkDescriptorPool                DescriptorPool;               // See requirements in note above
+    VkRenderPass                    RenderPass;                   // Ignored if using dynamic rendering
+    uint32_t                        MinImageCount;                // >= 2
+    uint32_t                        ImageCount;                   // >= MinImageCount
+    VkSampleCountFlagBits           MSAASamples;                  // 0 defaults to VK_SAMPLE_COUNT_1_BIT

-    // Pipeline
-    ImGui_ImplVulkan_PipelineInfo   PipelineInfoMain;           // Infos for Main Viewport (created by app/user)
-    //VkRenderPass                  RenderPass;                 // --> Since 2025/09/26: set 'PipelineInfoMain.RenderPass' instead
-    //uint32_t                      Subpass;                    // --> Since 2025/09/26: set 'PipelineInfoMain.Subpass' instead
-    //VkSampleCountFlagBits         MSAASamples;                // --> Since 2025/09/26: set 'PipelineInfoMain.MSAASamples' instead
-    //VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo; // Since 2025/09/26: set 'PipelineInfoMain.PipelineRenderingCreateInfo' instead
+    // (Optional)
+    VkPipelineCache                 PipelineCache;
+    uint32_t                        Subpass;

    // (Optional) Dynamic Rendering
-    // Need to explicitly enable VK_KHR_dynamic_rendering extension to use this, even for Vulkan 1.3 + setup PipelineInfoMain.PipelineRenderingCreateInfo.
+    // Need to explicitly enable VK_KHR_dynamic_rendering extension to use this, even for Vulkan 1.3.
    bool                            UseDynamicRendering;
+#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
+    VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
+#endif

    // (Optional) Allocation, Debugging
    const VkAllocationCallbacks*    Allocator;
    void                            (*CheckVkResultFn)(VkResult err);
-    VkDeviceSize                    MinAllocationSize;          // Minimum allocation size. Set to 1024*1024 to satisfy zealous best practices validation layer and waste a little memory.
-
-    // (Optional) Customize default vertex/fragment shaders.
-    // - if .sType == VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO we use specified structs, otherwise we use defaults.
-    // - Shader inputs/outputs need to match ours. Code/data pointed to by the structure needs to survive for whole during of backend usage.
-    VkShaderModuleCreateInfo        CustomShaderVertCreateInfo;
-    VkShaderModuleCreateInfo        CustomShaderFragCreateInfo;
+    VkDeviceSize                    MinAllocationSize;      // Minimum allocation size. Set to 1024*1024 to satisfy zealous best practices validation layer and waste a little memory.
 };

-// Follow "Getting Started" link and check examples/ folder to learn about using backends!
-IMGUI_IMPL_API bool             ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info);
-IMGUI_IMPL_API void             ImGui_ImplVulkan_Shutdown();
-IMGUI_IMPL_API void             ImGui_ImplVulkan_NewFrame();
-IMGUI_IMPL_API void             ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer command_buffer, VkPipeline pipeline = VK_NULL_HANDLE);
-IMGUI_IMPL_API void             ImGui_ImplVulkan_SetMinImageCount(uint32_t min_image_count); // To override MinImageCount after initialization (e.g. if swap chain is recreated)
-
-// (Advanced) Use e.g. if you need to recreate pipeline without reinitializing the backend (see #8110, #8111)
-// The main window pipeline will be created by ImGui_ImplVulkan_Init() if possible (== RenderPass xor (UseDynamicRendering && PipelineRenderingCreateInfo->sType == VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR))
-// Else, the pipeline can be created, or re-created, using ImGui_ImplVulkan_CreateMainPipeline() before rendering.
-IMGUI_IMPL_API void             ImGui_ImplVulkan_CreateMainPipeline(const ImGui_ImplVulkan_PipelineInfo* info);
-
-// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = nullptr to handle this manually.
-IMGUI_IMPL_API void             ImGui_ImplVulkan_UpdateTexture(ImTextureData* tex);
+// Called by user code
+IMGUI_IMPL_API bool         ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info);
+IMGUI_IMPL_API void         ImGui_ImplVulkan_Shutdown();
+IMGUI_IMPL_API void         ImGui_ImplVulkan_NewFrame();
+IMGUI_IMPL_API void         ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer command_buffer, VkPipeline pipeline = VK_NULL_HANDLE);
+IMGUI_IMPL_API bool         ImGui_ImplVulkan_CreateFontsTexture();
+IMGUI_IMPL_API void         ImGui_ImplVulkan_DestroyFontsTexture();
+IMGUI_IMPL_API void         ImGui_ImplVulkan_SetMinImageCount(uint32_t min_image_count); // To override MinImageCount after initialization (e.g. if swap chain is recreated)

 // Register a texture (VkDescriptorSet == ImTextureID)
 // FIXME: This is experimental in the sense that we are unsure how to best design/tackle this problem
 // Please post to https://github.com/ocornut/imgui/pull/914 if you have suggestions.
-IMGUI_IMPL_API VkDescriptorSet  ImGui_ImplVulkan_AddTexture(VkSampler sampler, VkImageView image_view, VkImageLayout image_layout);
-IMGUI_IMPL_API void             ImGui_ImplVulkan_RemoveTexture(VkDescriptorSet descriptor_set);
+IMGUI_IMPL_API VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler, VkImageView image_view, VkImageLayout image_layout);
+IMGUI_IMPL_API void            ImGui_ImplVulkan_RemoveTexture(VkDescriptorSet descriptor_set);

 // Optional: load Vulkan functions with a custom function loader
 // This is only useful with IMGUI_IMPL_VULKAN_NO_PROTOTYPES / VK_NO_PROTOTYPES
-IMGUI_IMPL_API bool             ImGui_ImplVulkan_LoadFunctions(uint32_t api_version, PFN_vkVoidFunction(*loader_func)(const char* function_name, void* user_data), void* user_data = nullptr);
-
-// [BETA] Selected render state data shared with callbacks.
-// This is temporarily stored in GetPlatformIO().Renderer_RenderState during the ImGui_ImplVulkan_RenderDrawData() call.
-// (Please open an issue if you feel you need access to more data)
-struct ImGui_ImplVulkan_RenderState
-{
-    VkCommandBuffer     CommandBuffer;
-    VkPipeline          Pipeline;
-    VkPipelineLayout    PipelineLayout;
-};
+IMGUI_IMPL_API bool         ImGui_ImplVulkan_LoadFunctions(PFN_vkVoidFunction(*loader_func)(const char* function_name, void* user_data), void* user_data = nullptr);

 //-------------------------------------------------------------------------
 // Internal / Miscellaneous Vulkan Helpers
+// (Used by example's main.cpp. Used by multi-viewport features. PROBABLY NOT used by your own engine/app.)
 //-------------------------------------------------------------------------
-// Used by example's main.cpp. Used by multi-viewport features. PROBABLY NOT used by your own engine/app.
-//
 // You probably do NOT need to use or care about those functions.
-// WE DO NOT PROVIDE STRONG GUARANTEES OF BACKWARD/FORWARD COMPATIBILITY.
 // Those functions only exist because:
 //   1) they facilitate the readability and maintenance of the multiple main.cpp examples files.
 //   2) the multi-viewport / platform window implementation needs them internally.
-// Generally we avoid exposing any kind of superfluous high-level helpers in the backends,
+// Generally we avoid exposing any kind of superfluous high-level helpers in the bindings,
 // but it is too much code to duplicate everywhere so we exceptionally expose them.
 //
-// Your engine/app will likely _already_ have code to setup all that stuff (swap chain,
-// render pass, frame buffers, etc.). You may read this code if you are curious, but
-// it is recommended you use your own custom tailored code to do equivalent work.
-//
-// The ImGui_ImplVulkanH_XXX functions should NOT interact with any of the state used
-// by the regular ImGui_ImplVulkan_XXX functions.
+// Your engine/app will likely _already_ have code to setup all that stuff (swap chain, render pass, frame buffers, etc.).
+// You may read this code to learn about Vulkan, but it is recommended you use you own custom tailored code to do equivalent work.
+// (The ImGui_ImplVulkanH_XXX functions do not interact with any of the state used by the regular ImGui_ImplVulkan_XXX functions)
 //-------------------------------------------------------------------------

 struct ImGui_ImplVulkanH_Frame;
 struct ImGui_ImplVulkanH_Window;

 // Helpers
-IMGUI_IMPL_API void                 ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance, VkPhysicalDevice physical_device, VkDevice device, ImGui_ImplVulkanH_Window* wd, uint32_t queue_family, const VkAllocationCallbacks* allocator, int w, int h, uint32_t min_image_count, VkImageUsageFlags image_usage);
-IMGUI_IMPL_API void                 ImGui_ImplVulkanH_DestroyWindow(VkInstance instance, VkDevice device, ImGui_ImplVulkanH_Window* wd, const VkAllocationCallbacks* allocator);
+IMGUI_IMPL_API void                 ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance, VkPhysicalDevice physical_device, VkDevice device, ImGui_ImplVulkanH_Window* wnd, uint32_t queue_family, const VkAllocationCallbacks* allocator, int w, int h, uint32_t min_image_count);
+IMGUI_IMPL_API void                 ImGui_ImplVulkanH_DestroyWindow(VkInstance instance, VkDevice device, ImGui_ImplVulkanH_Window* wnd, const VkAllocationCallbacks* allocator);
 IMGUI_IMPL_API VkSurfaceFormatKHR   ImGui_ImplVulkanH_SelectSurfaceFormat(VkPhysicalDevice physical_device, VkSurfaceKHR surface, const VkFormat* request_formats, int request_formats_count, VkColorSpaceKHR request_color_space);
 IMGUI_IMPL_API VkPresentModeKHR     ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice physical_device, VkSurfaceKHR surface, const VkPresentModeKHR* request_modes, int request_modes_count);
-IMGUI_IMPL_API VkPhysicalDevice     ImGui_ImplVulkanH_SelectPhysicalDevice(VkInstance instance);
-IMGUI_IMPL_API uint32_t             ImGui_ImplVulkanH_SelectQueueFamilyIndex(VkPhysicalDevice physical_device);
 IMGUI_IMPL_API int                  ImGui_ImplVulkanH_GetMinImageCountFromPresentMode(VkPresentModeKHR present_mode);

 // Helper structure to hold the data needed by one rendering frame
@@ -227,48 +166,30 @@ struct ImGui_ImplVulkanH_FrameSemaphores
 // (Used by example's main.cpp. Used by multi-viewport features. Probably NOT used by your own engine/app.)
 struct ImGui_ImplVulkanH_Window
 {
-    // Input
-    bool                    UseDynamicRendering;
-    VkSurfaceKHR            Surface;            // Surface created and destroyed by caller.
-    VkSurfaceFormatKHR      SurfaceFormat;
-    VkPresentModeKHR        PresentMode;
-    VkAttachmentDescription AttachmentDesc;     // RenderPass creation: main attachment description.
-    VkClearValue            ClearValue;         // RenderPass creation: clear value when using VK_ATTACHMENT_LOAD_OP_CLEAR.
-
-    // Internal
-    int                     Width;              // Generally same as passed to ImGui_ImplVulkanH_CreateOrResizeWindow()
-    int                     Height;
-    VkSwapchainKHR          Swapchain;
-    VkRenderPass            RenderPass;
-    VkPipeline              Pipeline;           // The window pipeline may uses a different VkRenderPass than the one passed in ImGui_ImplVulkan_InitInfo
-    uint32_t                FrameIndex;         // Current frame being rendered to (0 <= FrameIndex < FrameInFlightCount)
-    uint32_t                ImageCount;         // Number of simultaneous in-flight frames (returned by vkGetSwapchainImagesKHR, usually derived from min_image_count)
-    uint32_t                SemaphoreCount;     // Number of simultaneous in-flight frames + 1, to be able to use it in vkAcquireNextImageKHR
-    uint32_t                SemaphoreIndex;     // Current set of swapchain wait semaphores we're using (needs to be distinct from per frame data)
-    ImVector<ImGui_ImplVulkanH_Frame>           Frames;
-    ImVector<ImGui_ImplVulkanH_FrameSemaphores> FrameSemaphores;
+    int                 Width;
+    int                 Height;
+    VkSwapchainKHR      Swapchain;
+    VkSurfaceKHR        Surface;
+    VkSurfaceFormatKHR  SurfaceFormat;
+    VkPresentModeKHR    PresentMode;
+    VkRenderPass        RenderPass;
+    VkPipeline          Pipeline;               // The window pipeline may uses a different VkRenderPass than the one passed in ImGui_ImplVulkan_InitInfo
+    bool                UseDynamicRendering;
+    bool                ClearEnable;
+    VkClearValue        ClearValue;
+    uint32_t            FrameIndex;             // Current frame being rendered to (0 <= FrameIndex < FrameInFlightCount)
+    uint32_t            ImageCount;             // Number of simultaneous in-flight frames (returned by vkGetSwapchainImagesKHR, usually derived from min_image_count)
+    uint32_t            SemaphoreCount;         // Number of simultaneous in-flight frames + 1, to be able to use it in vkAcquireNextImageKHR
+    uint32_t            SemaphoreIndex;         // Current set of swapchain wait semaphores we're using (needs to be distinct from per frame data)
+    ImGui_ImplVulkanH_Frame*            Frames;
+    ImGui_ImplVulkanH_FrameSemaphores*  FrameSemaphores;

    ImGui_ImplVulkanH_Window()
    {
        memset((void*)this, 0, sizeof(*this));
-
-        // Parameters to create SwapChain
-        PresentMode = (VkPresentModeKHR)~0;             // Ensure we get an error if user doesn't set this.
-
-        // Parameters to create RenderPass
-        AttachmentDesc.format = VK_FORMAT_UNDEFINED;    // Will automatically use wd->SurfaceFormat.format.
-        AttachmentDesc.samples = VK_SAMPLE_COUNT_1_BIT;
-        AttachmentDesc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-        AttachmentDesc.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-        AttachmentDesc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-        AttachmentDesc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-        AttachmentDesc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-        AttachmentDesc.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+        PresentMode = (VkPresentModeKHR)~0;     // Ensure we get an error if user doesn't set this.
+        ClearEnable = true;
    }
 };

-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #endif // #ifndef IMGUI_DISABLE
@@ -15,21 +15,20 @@
 #pragma once

 //---- Define assertion handler. Defaults to calling assert().
-// - If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
-// - Compiling with NDEBUG will usually strip out assert() to nothing, which is NOT recommended because we use asserts to notify of programmer mistakes.
+// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
 //#define IM_ASSERT(_EXPR)  MyAssert(_EXPR)
 //#define IM_ASSERT(_EXPR)  ((void)(_EXPR))     // Disable asserts

 //---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
 // Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
-// - Windows DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
-//   for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
-//#define IMGUI_API __declspec(dllexport)                   // MSVC Windows: DLL export
-//#define IMGUI_API __declspec(dllimport)                   // MSVC Windows: DLL import
-//#define IMGUI_API __attribute__((visibility("default")))  // GCC/Clang: override visibility when set is hidden
+// DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
+// for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
+//#define IMGUI_API __declspec( dllexport )
+//#define IMGUI_API __declspec( dllimport )

 //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names.
 //#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+//#define IMGUI_DISABLE_OBSOLETE_KEYIO                      // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS.

 //---- Disable all of Dear ImGui or don't implement standard windows/tools.
 // It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp.
@@ -43,31 +42,23 @@
 //#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a)
 //#define IMGUI_DISABLE_WIN32_FUNCTIONS                     // [Win32] Won't use and link with any Win32 function (clipboard, IME).
 //#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
-//#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS             // Don't implement default platform_io.Platform_OpenInShellFn() handler (Win32: ShellExecute(), require shell32.lib/.a, Mac/Linux: use system("")).
 //#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
 //#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
 //#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 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.
-//#define IMGUI_ENABLE_TEST_ENGINE                          // Enable imgui_test_engine hooks. Generally set automatically by include "imgui_te_config.h", see Test Engine for details.
-
 //---- Include imgui_user.h at the end of imgui.h as a convenience
 // May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included.
 //#define IMGUI_INCLUDE_IMGUI_USER_H
 //#define IMGUI_USER_H_FILENAME         "my_folder/my_imgui_user.h"

-//---- Pack vertex colors as BGRA8 instead of RGBA8 (to avoid converting from one to another). Need dedicated backend support.
+//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
 //#define IMGUI_USE_BGRA_PACKED_COLOR

-//---- Use legacy CRC32-adler tables (used before 1.91.6), in order to preserve old .ini data that you cannot afford to invalidate.
-//#define IMGUI_USE_LEGACY_CRC32_ADLER
-
 //---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
-#define IMGUI_USE_WCHAR32
+//#define IMGUI_USE_WCHAR32

 //---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
 // By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
@@ -84,16 +75,13 @@

 //---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear ImGui)
 // Requires FreeType headers to be available in the include path. Requires program to be compiled with 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided).
-// Note that imgui_freetype.cpp may be used _without_ this define, if you manually call ImFontAtlas::SetFontLoader(). The define is simply a convenience.
 // On Windows you may use vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'.
-#define IMGUI_ENABLE_FREETYPE
+//#define IMGUI_ENABLE_FREETYPE

-//---- Use FreeType + plutosvg or lunasvg to render OpenType SVG fonts (SVGinOT)
+//---- Use FreeType+lunasvg library to render OpenType SVG fonts (SVGinOT)
+// Requires lunasvg headers to be available in the include path + program to be linked with the lunasvg library (not provided).
 // Only works in combination with IMGUI_ENABLE_FREETYPE.
-// - 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
+// (implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
 //#define IMGUI_ENABLE_FREETYPE_LUNASVG

 //---- Use stb_truetype to build and rasterize the font atlas (default)
@@ -131,10 +119,6 @@
 //#define IM_DEBUG_BREAK  IM_ASSERT(0)
 //#define IM_DEBUG_BREAK  __debugbreak()

-//---- Debug Tools: Enable highlight ID conflicts _before_ hovering items. When io.ConfigDebugHighlightIdConflicts is set.
-// (THIS WILL SLOW DOWN DEAR IMGUI. Only use occasionally and disable after use)
-//#define IMGUI_DEBUG_HIGHLIGHT_ALL_ID_CONFLICTS
-
 //---- Debug Tools: Enable slower asserts
 //#define IMGUI_DEBUG_PARANOID

@@ -1,284 +0,0 @@
-// Solution adapted from https://github.com/ocornut/imgui/issues/9066
-
-#include "imgui_cjk.h"
-#include "imgui_internal.h"
-#include <array>
-#include <vector>
-#include <string>
-#include <unordered_set>
-#include <algorithm>
-#include <cstdint>
-
-// From imgui_draw.cpp
-extern float BuildLoadGlyphGetAdvanceOrFallback(ImFontBaked* baked, unsigned int codepoint);
-
-namespace {
-
-// --- Bitmap helpers ---
-template <size_t N>
-struct Bitmap {
-	std::array<uint8_t, N> bits{};
-
-	void set(size_t idx) {
-		bits[idx] = 1;
-	}
-
-	bool test(size_t idx) const {
-		return bits[idx] != 0;
-	}
-};
-
-// --- Build bitmaps for dense ranges ---
-static constexpr size_t RANGE_3000_30FF_SIZE = 0x100; // 256 code points
-static Bitmap<RANGE_3000_30FF_SIZE> bitmap_3000_30FF{};
-
-static constexpr size_t RANGE_31F0_31FF_SIZE = 0x10; // 16 code points
-static Bitmap<RANGE_31F0_31FF_SIZE> bitmap_31F0_31FF{};
-
-static constexpr size_t RANGE_FF61_FF70_SIZE = 0x10; // 16 code points
-static Bitmap<RANGE_FF61_FF70_SIZE> bitmap_FF61_FF70{};
-
-// --- Hash set for scattered values ---
-static const std::unordered_set<unsigned int> HeadProhibitedScatter = {
-	0x00A2, 0x00B0, 0x2032, 0x2033, 0x2030, 0x2103,
-	0x201D, 0x3009, 0x300B, 0x300D, 0x300F, 0x3011, 0x3015,
-	0xFF09, 0xFF3D, 0xFF5D, 0xFF63
-	// add other scattered ones here
-};
-
-// --- Initialization (fill bitmaps) ---
-struct InitBitmaps {
-	InitBitmaps() {
-		// Fill 0x3000–0x30FF bitmap
-		unsigned int dense_3000_30FF[] = {
-			0x3001, 0x3002, 0x3005, 0x303B, 0x30FB,
-			0x309D, 0x309E, 0x30FD, 0x30FE, 0x30FC,
-			0x30A1, 0x30A3, 0x30A5, 0x30A7, 0x30A9,
-			0x30C3, 0x30E3, 0x30E5, 0x30E7, 0x30EE,
-			0x30F5, 0x30F6
-		};
-		for (auto c : dense_3000_30FF) {
-			bitmap_3000_30FF.set(c - 0x3000);
-		}
-
-		// Fill 0x31F0–0x31FF bitmap
-		for (unsigned int c = 0x31F0; c <= 0x31FF; ++c) {
-			bitmap_31F0_31FF.set(c - 0x31F0);
-		}
-
-		// Fill 0xFF61–0xFF70 bitmap
-		for (unsigned int c = 0xFF61; c <= 0xFF70; ++c) {
-			bitmap_FF61_FF70.set(c - 0xFF61);
-		}
-	}
-};
-
-// Static initializer
-static InitBitmaps initBitmaps;
-
-// --- Lookup function ---
-inline bool ImCharIsHeadProhibitedW(unsigned int c)
-{
-	if (c >= 0x3000 && c <= 0x30FF) {
-		return bitmap_3000_30FF.test(c - 0x3000);
-	}
-	if (c >= 0x31F0 && c <= 0x31FF) {
-		return bitmap_31F0_31FF.test(c - 0x31F0);
-	}
-	if (c >= 0xFF61 && c <= 0xFF70) {
-		return bitmap_FF61_FF70.test(c - 0xFF61);
-	}
-	return HeadProhibitedScatter.find(c) != HeadProhibitedScatter.end();
-}
-
-inline bool ImCharIsHeadProhibitedA(char c) { return c == ' ' || c == '\t' || c == '}' || c == ')' || c == ']' || c == '?' || c == '!' || c == '|' || c == '/' || c == '&' || c == '.' || c == ',' || c == ':' || c == ';';}
-inline bool ImCharIsHeadProhibited(unsigned int c)  { return (c < 128 && ImCharIsHeadProhibitedA((char)c)) || ImCharIsHeadProhibitedW(c); }
-inline bool ImCharIsTailProhibitedA(unsigned int c) { return c == '(' || c == '[' || c == '{' || c == '+'; }
-const unsigned int TailProhibitedW[] = { 0x2018, 0x201c, 0x3008, 0x300a, 0x300c, 0x300e, 0x3010, 0x3014, 0xff08, 0xff3b, 0xff5b, 0xff62, 0xa3, 0xa5, 0xff04, 0xffe1, 0xffe5, 0xff0b };
-inline bool ImCharIsTailProhibitedW(unsigned int c) { for (int i = 0; i < IM_ARRAYSIZE(TailProhibitedW); i++) if (c == TailProhibitedW[i]) return true; return false; }
-inline bool ImCharIsTailProhibited(unsigned int c)  { return (c < 128 && ImCharIsTailProhibitedA(c)) || ImCharIsTailProhibitedW(c); }
-
-inline bool ImCharIsLineBreakableW(unsigned int c)
-{
-	return
-		(unsigned)(c - 0x3040) <= (0x9FFF - 0x3040) ||
-		(unsigned)(c - 0x20000) <= (0xDFFFF - 0x20000) ||
-		(unsigned)(c - 0xAC00) <= (0xD7FF - 0xAC00) ||
-		(unsigned)(c - 0xF900) <= (0xFAFF - 0xF900) ||
-		(unsigned)(c - 0x1100) <= (0x11FF - 0x1100) ||
-		(unsigned)(c - 0x2E80) <= (0x2FFF - 0x2E80);
-}
-
-const char *CalcWordWrapPositionCJK(ImFont *font, float size, const char *text, const char *text_end, float wrap_width)
-{
-	if (wrap_width <= 0.0f)
-		return text_end;
-
-	ImFontBaked *baked = font->GetFontBaked(size);
-	const float scale = size / baked->Size;
-
-	float line_width = 0.0f;
-	float word_width = 0.0f;
-	float blank_width = 0.0f;
-	wrap_width /= scale;
-
-	const char *word_end = text;
-	const char *prev_s = NULL;
-	const char *s = NULL;
-	const char *next_s = text;
-	unsigned int prev_c = 0;
-	unsigned int c = 0;
-	unsigned int next_c = 0;
-
-	bool next_char_is_line_break_able = false;
-	bool char_line_is_break_able = false;
-	bool next_char_is_head_prohibited = false;
-	bool char_is_head_prohibited = false;
-
-#define IM_ADVANCE_WORD()						\
-	do											\
-	{											\
-		word_end = s;							\
-		line_width += word_width + blank_width;	\
-		word_width = blank_width = 0.0f;		\
-	} while (0)
-
-	IM_ASSERT(text_end != NULL);
-	while (s < text_end)
-	{
-		// prev_s is the END of prev_c, which actually points to c
-		// same for s and next_s.
-		prev_s = s;
-		s = next_s;
-		prev_c = c;
-		c = next_c;
-		char_line_is_break_able = next_char_is_line_break_able;
-		char_is_head_prohibited = next_char_is_head_prohibited;
-		
-		next_c = (unsigned int) *next_s;
-		if (next_c < 0x80)
-			next_s = next_s + 1;
-		else
-			next_s = next_s + ImTextCharFromUtf8(&next_c, next_s, text_end);
-		if (next_s > text_end)
-			next_c = 0;
-		
-		if (prev_s == NULL)
-		{
-			continue;
-		}
-		if (c < 0x20)
-		{
-			if (c == '\n')
-				return prev_s;
-			if (c == '\r')
-				continue;
-		}
-		// Optimized inline version of 'float char_width = GetCharAdvance((ImWchar)c);'
-		float char_width = (c < (unsigned int) baked->IndexAdvanceX.Size) ? baked->IndexAdvanceX.Data[c] : -1.0f;
-		if (char_width < 0.0f)
-			char_width = BuildLoadGlyphGetAdvanceOrFallback(baked, c);
-		if (ImCharIsBlankW(c))
-			blank_width += char_width;
-		else
-		{
-			word_width += char_width + blank_width;
-			blank_width = 0.0f;
-		}
-		// We ignore blank width at the end of the line (they can be skipped)
-		if (line_width + word_width > wrap_width)
-		{
-			// Words that cannot possibly fit within an entire line will be cut anywhere.
-			if (word_width < wrap_width)
-				s = word_end;
-			else
-				s = prev_s;
-			break;
-		}
-		
-		if (!next_c)
-		{
-			IM_ADVANCE_WORD();
-		}
-		else if (c)
-		{
-			next_char_is_line_break_able = ImCharIsLineBreakableW(next_c);
-			next_char_is_head_prohibited = ImCharIsHeadProhibited(next_c);
-			if (prev_c >= '0' && prev_c <= '9' && next_c >= '0' && next_c <= '9' && !next_char_is_line_break_able)
-				continue;
-			if (next_char_is_line_break_able && !next_char_is_head_prohibited && !ImCharIsTailProhibited(c))
-				IM_ADVANCE_WORD();
-			if ((char_is_head_prohibited || char_line_is_break_able) && !next_char_is_head_prohibited)
-				IM_ADVANCE_WORD();
-		}
-	}
-#undef IM_ADVANCE_WORD
-
-	if (s == text && text < text_end)
-		return s + ImTextCountUtf8BytesFromChar(s, text_end);
-	return (s > text_end) ? text_end : s;
-}
-
-} // namespace
-
-void ImGui::RenderTextWrappedCJK(ImVec2 pos, const char* text, const char* text_end, float wrap_width)
-{
-	ImGuiContext& g = *GImGui;
-	ImGuiWindow* window = g.CurrentWindow;
-
-	if (!text_end)
-		text_end = text + strlen(text);
-
-	if (text == text_end)
-		return;
-
-	ImFont* font = g.Font;
-	float fontSize = g.FontSize;
-
-	const char* s = text;
-	ImVec2 current_pos = pos;
-
-	while (s < text_end)
-	{
-		const char* line_end = CalcWordWrapPositionCJK(font, fontSize, s, text_end, wrap_width);
-
-		if (s != line_end)
-		{
-			window->DrawList->AddText(font, fontSize, current_pos, GetColorU32(ImGuiCol_Text), s, line_end, 0.0f);
-		}
-
-		current_pos.y += fontSize;
-		s = ImTextCalcWordWrapNextLineStart(line_end, text_end);
-	}
-
-	if (g.LogEnabled)
-		LogRenderedText(&pos, text, text_end);
-}
-
-ImVec2 ImGui::CalcTextSizeCJK(ImFont* font, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** out_remaining)
-{
-	if (!text_end)
-		text_end = text_begin + strlen(text_begin);
-
-	if (text_begin == text_end)
-		return ImVec2(0.0f, size);
-
-	ImVec2 text_size(0.0f, 0.0f);
-	const char* s = text_begin;
-
-	while (s < text_end)
-	{
-		const char* line_end = CalcWordWrapPositionCJK(font, size, s, text_end, wrap_width);
-
-		ImVec2 line_size = font->CalcTextSizeA(size, FLT_MAX, 0.0f, s, line_end);
-		text_size.x = ImMax(text_size.x, line_size.x);
-		text_size.y += size;
-
-		s = ImTextCalcWordWrapNextLineStart(line_end, text_end);
-	}
-
-	if (out_remaining)
-		*out_remaining = s;
-
-	return text_size;
-}
@@ -1,9 +0,0 @@
-#pragma once
-#include "imgui.h"
-
-namespace ImGui {
-	// CJK-aware text wrapping function.
-	// Use this instead of ImGui::RenderTextWrapped for better CJK support.
-	void RenderTextWrappedCJK(ImVec2 pos, const char* text, const char* text_end, float wrap_width);
-	ImVec2 CalcTextSizeCJK(ImFont* font, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** out_remaining = nullptr);
-}
@@ -1,26 +1,13 @@
 // dear imgui: wrappers for C++ standard library (STL) types (std::string, etc.)
-
 // This is also an example of how you may wrap your own similar types.
-// TL;DR; this is using the ImGuiInputTextFlags_CallbackResize facility,
-// which also demonstrated in 'Dear ImGui Demo->Widgets->Text Input->Resize Callback'.

 // Changelog:
 // - v0.10: Initial version. Added InputText() / InputTextMultiline() calls with std::string

-// Usage:
-// {
-//   #include "misc/cpp/imgui_stdlib.h"
-//   #include "misc/cpp/imgui_stdlib.cpp" // <-- If you want to include implementation without messing with your project/build.
-//   [...]
-//   std::string my_string;
-//   ImGui::InputText("my string", &my_string);
-// }
-
-// See more C++ related extension (fmt, RAII, syntactic sugar) on Wiki:
+// See more C++ related extension (fmt, RAII, syntaxis sugar) on Wiki:
 //   https://github.com/ocornut/imgui/wiki/Useful-Extensions#cness

 #include "imgui.h"
-#ifndef IMGUI_DISABLE
 #include "imgui_stdlib.h"

 // Clang warnings with -Weverything
@@ -96,5 +83,3 @@ bool ImGui::InputTextWithHint(const char* label, const char* hint, std::string*
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
-
-#endif // #ifndef IMGUI_DISABLE
@@ -1,28 +1,14 @@
 // dear imgui: wrappers for C++ standard library (STL) types (std::string, etc.)
-
 // This is also an example of how you may wrap your own similar types.
-// TL;DR; this is using the ImGuiInputTextFlags_CallbackResize facility,
-// which also demonstrated in 'Dear ImGui Demo->Widgets->Text Input->Resize Callback'.

 // Changelog:
 // - v0.10: Initial version. Added InputText() / InputTextMultiline() calls with std::string

-// Usage:
-// {
-//   #include "misc/cpp/imgui_stdlib.h"
-//   #include "misc/cpp/imgui_stdlib.cpp" // <-- If you want to include implementation without messing with your project/build.
-//   [...]
-//   std::string my_string;
-//   ImGui::InputText("my string", &my_string);
-// }
-
 // See more C++ related extension (fmt, RAII, syntaxis sugar) on Wiki:
 //   https://github.com/ocornut/imgui/wiki/Useful-Extensions#cness

 #pragma once

-#ifndef IMGUI_DISABLE
-
 #include <string>

 namespace ImGui
@@ -33,5 +19,3 @@ namespace ImGui
    IMGUI_API bool  InputTextMultiline(const char* label, std::string* str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
    IMGUI_API bool  InputTextWithHint(const char* label, const char* hint, std::string* str, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
 }
-
-#endif // #ifndef IMGUI_DISABLE
@@ -3,10 +3,7 @@
 // Those changes would need to be pushed into nothings/stb:
 // - Fix in stb_textedit_discard_redo (see https://github.com/nothings/stb/issues/321)
 // - Fix in stb_textedit_find_charpos to handle last line (see https://github.com/ocornut/imgui/issues/6000 + #6783)
-// - Added name to struct or it may be forward declared in our code.
-// - Added UTF-8 support (see https://github.com/nothings/stb/issues/188 + https://github.com/ocornut/imgui/pull/7925)
-// - Changed STB_TEXTEDIT_INSERTCHARS() to return inserted count (instead of 0/1 bool), allowing partial insertion.
-// Grep for [DEAR IMGUI] to find some changes.
+// Grep for [DEAR IMGUI] to find the changes.
 // - Also renamed macros used or defined outside of IMSTB_TEXTEDIT_IMPLEMENTATION block from STB_TEXTEDIT_* to IMSTB_TEXTEDIT_*

 // stb_textedit.h - v1.14  - public domain - Sean Barrett
@@ -40,7 +37,6 @@
 //
 // VERSION HISTORY
 //
-//   !!!! (2025-10-23) changed STB_TEXTEDIT_INSERTCHARS() to return inserted count (instead of 0/1 bool), allowing partial insertion.
 //   1.14 (2021-07-11) page up/down, various fixes
 //   1.13 (2019-02-07) fix bug in undo size management
 //   1.12 (2018-01-29) user can change STB_TEXTEDIT_KEYTYPE, fix redo to avoid crash
@@ -143,14 +139,12 @@
 //                                        with previous char)
 //    STB_TEXTEDIT_KEYTOTEXT(k)         maps a keyboard input to an insertable character
 //                                        (return type is int, -1 means not valid to insert)
-//                                        (not supported if you want to use UTF-8, see below)
 //    STB_TEXTEDIT_GETCHAR(obj,i)       returns the i'th character of obj, 0-based
 //    STB_TEXTEDIT_NEWLINE              the character returned by _GETCHAR() we recognize
 //                                        as manually wordwrapping for end-of-line positioning
 //
 //    STB_TEXTEDIT_DELETECHARS(obj,i,n)      delete n characters starting at i
-//    STB_TEXTEDIT_INSERTCHARS(obj,i,c*,n)   try to insert n characters at i (pointed to by STB_TEXTEDIT_CHARTYPE*)
-//                                           returns number of characters actually inserted. [DEAR IMGUI]
+//    STB_TEXTEDIT_INSERTCHARS(obj,i,c*,n)   insert n characters at i (pointed to by STB_TEXTEDIT_CHARTYPE*)
 //
 //    STB_TEXTEDIT_K_SHIFT       a power of two that is or'd in to a keyboard input to represent the shift key
 //
@@ -182,13 +176,6 @@
 //    STB_TEXTEDIT_K_TEXTSTART2          secondary keyboard input to move cursor to start of text
 //    STB_TEXTEDIT_K_TEXTEND2            secondary keyboard input to move cursor to end of text
 //
-// To support UTF-8:
-//
-//    STB_TEXTEDIT_GETPREVCHARINDEX      returns index of previous character
-//    STB_TEXTEDIT_GETNEXTCHARINDEX      returns index of next character
-//    Do NOT define STB_TEXTEDIT_KEYTOTEXT.
-//    Instead, call stb_textedit_text() directly for text contents.
-//
 // Keyboard input must be encoded as a single integer value; e.g. a character code
 // and some bitflags that represent shift states. to simplify the interface, SHIFT must
 // be a bitflag, so we can test the shifted state of cursor movements to allow selection,
@@ -222,7 +209,6 @@
 //    int  stb_textedit_cut(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
 //    int  stb_textedit_paste(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int len)
 //    void stb_textedit_key(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXEDIT_KEYTYPE key)
-//    void stb_textedit_text(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int text_len)
 //
 //    Each of these functions potentially updates the string and updates the
 //    state.
@@ -257,14 +243,7 @@
 //          various definitions like STB_TEXTEDIT_K_LEFT have the is-key-event bit
 //          set, and make STB_TEXTEDIT_KEYTOCHAR check that the is-key-event bit is
 //          clear. STB_TEXTEDIT_KEYTYPE defaults to int, but you can #define it to
-//          anything other type you want before including.
-//          if the STB_TEXTEDIT_KEYTOTEXT function is defined, selected keys are
-//          transformed into text and stb_textedit_text() is automatically called.
-//
-//      text: (added 2025)
-//          call this to directly send text input the textfield, which is required
-//          for UTF-8 support, because stb_textedit_key() + STB_TEXTEDIT_KEYTOTEXT()
-//          cannot infer text length.
+//          anything other type you wante before including.
 //
 //
 //   When rendering, you can read the cursor position and selection state from
@@ -339,7 +318,7 @@ typedef struct
   int undo_char_point, redo_char_point;
 } StbUndoState;

-typedef struct STB_TexteditState
+typedef struct
 {
   /////////////////////
   //
@@ -413,16 +392,6 @@ typedef struct
 #define IMSTB_TEXTEDIT_memmove memmove
 #endif

-// [DEAR IMGUI]
-// Functions must be implemented for UTF8 support
-// Code in this file that uses those functions is modified for [DEAR IMGUI] and deviates from the original stb_textedit.
-// There is not necessarily a '[DEAR IMGUI]' at the usage sites.
-#ifndef IMSTB_TEXTEDIT_GETPREVCHARINDEX
-#define IMSTB_TEXTEDIT_GETPREVCHARINDEX(OBJ, IDX) ((IDX) - 1)
-#endif
-#ifndef IMSTB_TEXTEDIT_GETNEXTCHARINDEX
-#define IMSTB_TEXTEDIT_GETNEXTCHARINDEX(OBJ, IDX) ((IDX) + 1)
-#endif

 /////////////////////////////////////////////////////////////////////////////
 //
@@ -430,7 +399,7 @@ typedef struct
 //

 // traverse the layout to locate the nearest character to a display position
-static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y, int* out_side_on_line)
+static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y)
 {
   StbTexteditRow r;
   int n = STB_TEXTEDIT_STRINGLEN(str);
@@ -440,7 +409,6 @@ static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y, i
   r.x0 = r.x1 = 0;
   r.ymin = r.ymax = 0;
   r.num_chars = 0;
-   *out_side_on_line = 0;

   // search rows to find one that straddles 'y'
   while (i < n) {
@@ -460,10 +428,7 @@ static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y, i

   // below all text, return 'after' last character
   if (i >= n)
-   {
-      *out_side_on_line = 1;
      return n;
-   }

   // check if it's before the beginning of the line
   if (x < r.x0)
@@ -473,14 +438,13 @@ static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y, i
   if (x < r.x1) {
      // search characters in row for one that straddles 'x'
      prev_x = r.x0;
-      for (k=0; k < r.num_chars; k = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, i + k) - i) {
+      for (k=0; k < r.num_chars; ++k) {
         float w = STB_TEXTEDIT_GETWIDTH(str, i, k);
         if (x < prev_x+w) {
-            *out_side_on_line = (k == 0) ? 0 : 1;
            if (x < prev_x+w/2)
               return k+i;
            else
-               return IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, i + k);
+               return k+i+1;
         }
         prev_x += w;
      }
@@ -488,7 +452,6 @@ static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y, i
   }

   // if the last character is a newline, return that. otherwise return 'after' the last character
-   *out_side_on_line = 1;
   if (STB_TEXTEDIT_GETCHAR(str, i+r.num_chars-1) == STB_TEXTEDIT_NEWLINE)
      return i+r.num_chars-1;
   else
@@ -500,7 +463,6 @@ static void stb_textedit_click(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *st
 {
   // In single-line mode, just always make y = 0. This lets the drag keep working if the mouse
   // goes off the top or bottom of the text
-   int side_on_line;
   if( state->single_line )
   {
      StbTexteditRow r;
@@ -508,18 +470,16 @@ static void stb_textedit_click(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *st
      y = r.ymin;
   }

-   state->cursor = stb_text_locate_coord(str, x, y, &side_on_line);
+   state->cursor = stb_text_locate_coord(str, x, y);
   state->select_start = state->cursor;
   state->select_end = state->cursor;
   state->has_preferred_x = 0;
-   str->LastMoveDirectionLR = (ImS8)(side_on_line ? ImGuiDir_Right : ImGuiDir_Left);
 }

 // API drag: on mouse drag, move the cursor and selection endpoint to the clicked location
 static void stb_textedit_drag(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y)
 {
   int p = 0;
-   int side_on_line;

   // In single-line mode, just always make y = 0. This lets the drag keep working if the mouse
   // goes off the top or bottom of the text
@@ -533,9 +493,8 @@ static void stb_textedit_drag(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *sta
   if (state->select_start == state->select_end)
      state->select_start = state->cursor;

-   p = stb_text_locate_coord(str, x, y, &side_on_line);
+   p = stb_text_locate_coord(str, x, y);
   state->cursor = state->select_end = p;
-   str->LastMoveDirectionLR = (ImS8)(side_on_line ? ImGuiDir_Right : ImGuiDir_Left);
 }

 /////////////////////////////////////////////////////////////////////////////
@@ -585,8 +544,6 @@ static void stb_textedit_find_charpos(StbFindState *find, IMSTB_TEXTEDIT_STRING
      STB_TEXTEDIT_LAYOUTROW(&r, str, i);
      if (n < i + r.num_chars)
         break;
-      if (str->LastMoveDirectionLR == ImGuiDir_Right && str->Stb->cursor > 0 && str->Stb->cursor == i + r.num_chars && STB_TEXTEDIT_GETCHAR(str, i + r.num_chars - 1) != STB_TEXTEDIT_NEWLINE) // [DEAR IMGUI] Wrapping point handling
-         break;
      if (i + r.num_chars == z && z > 0 && STB_TEXTEDIT_GETCHAR(str, z - 1) != STB_TEXTEDIT_NEWLINE)  // [DEAR IMGUI] special handling for last line
         break;   // [DEAR IMGUI]
      prev_start = i;
@@ -606,7 +563,7 @@ static void stb_textedit_find_charpos(StbFindState *find, IMSTB_TEXTEDIT_STRING

   // now scan to find xpos
   find->x = r.x0;
-   for (i=0; first+i < n; i = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, first + i) - first)
+   for (i=0; first+i < n; ++i)
      find->x += STB_TEXTEDIT_GETWIDTH(str, first, i);
 }

@@ -683,35 +640,6 @@ static void stb_textedit_move_to_last(IMSTB_TEXTEDIT_STRING *str, STB_TexteditSt
   }
 }

-// [DEAR IMGUI] Extracted this function so we can more easily add support for word-wrapping.
-#ifndef STB_TEXTEDIT_MOVELINESTART
-static int stb_textedit_move_line_start(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int cursor)
-{
-   if (state->single_line)
-      return 0;
-   while (cursor > 0) {
-      int prev = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, cursor);
-      if (STB_TEXTEDIT_GETCHAR(str, prev) == STB_TEXTEDIT_NEWLINE)
-         break;
-      cursor = prev;
-   }
-   return cursor;
-}
-#define STB_TEXTEDIT_MOVELINESTART stb_textedit_move_line_start
-#endif
-#ifndef STB_TEXTEDIT_MOVELINEEND
-static int stb_textedit_move_line_end(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int cursor)
-{
-   int n = STB_TEXTEDIT_STRINGLEN(str);
-   if (state->single_line)
-      return n;
-   while (cursor < n && STB_TEXTEDIT_GETCHAR(str, cursor) != STB_TEXTEDIT_NEWLINE)
-      cursor = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, cursor);
-   return cursor;
-}
-#define STB_TEXTEDIT_MOVELINEEND stb_textedit_move_line_end
-#endif
-
 #ifdef STB_TEXTEDIT_IS_SPACE
 static int is_word_boundary( IMSTB_TEXTEDIT_STRING *str, int idx )
 {
@@ -721,9 +649,9 @@ static int is_word_boundary( IMSTB_TEXTEDIT_STRING *str, int idx )
 #ifndef STB_TEXTEDIT_MOVEWORDLEFT
 static int stb_textedit_move_to_word_previous( IMSTB_TEXTEDIT_STRING *str, int c )
 {
-   c = IMSTB_TEXTEDIT_GETPREVCHARINDEX( str, c ); // always move at least one character
-   while (c >= 0 && !is_word_boundary(str, c))
-      c = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, c);
+   --c; // always move at least one character
+   while( c >= 0 && !is_word_boundary( str, c ) )
+      --c;

   if( c < 0 )
      c = 0;
@@ -737,9 +665,9 @@ static int stb_textedit_move_to_word_previous( IMSTB_TEXTEDIT_STRING *str, int c
 static int stb_textedit_move_to_word_next( IMSTB_TEXTEDIT_STRING *str, int c )
 {
   const int len = STB_TEXTEDIT_STRINGLEN(str);
-   c = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, c); // always move at least one character
+   ++c; // always move at least one character
   while( c < len && !is_word_boundary( str, c ) )
-      c = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, c);
+      ++c;

   if( c > len )
      c = len;
@@ -778,8 +706,7 @@ static int stb_textedit_paste_internal(IMSTB_TEXTEDIT_STRING *str, STB_TexteditS
   stb_textedit_clamp(str, state);
   stb_textedit_delete_selection(str,state);
   // try to insert the characters
-   len = STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, len);
-   if (len) {
+   if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, len)) {
      stb_text_makeundo_insert(state, state->cursor, len);
      state->cursor += len;
      state->has_preferred_x = 0;
@@ -793,47 +720,36 @@ static int stb_textedit_paste_internal(IMSTB_TEXTEDIT_STRING *str, STB_TexteditS
 #define STB_TEXTEDIT_KEYTYPE int
 #endif

-// API key: process text input
-// [DEAR IMGUI] Added stb_textedit_text(), extracted out and called by stb_textedit_key() for backward compatibility.
-static void stb_textedit_text(IMSTB_TEXTEDIT_STRING* str, STB_TexteditState* state, const IMSTB_TEXTEDIT_CHARTYPE* text, int text_len)
-{
-   // can't add newline in single-line mode
-   if (text[0] == '\n' && state->single_line)
-      return;
-
-   if (state->insert_mode && !STB_TEXT_HAS_SELECTION(state) && state->cursor < STB_TEXTEDIT_STRINGLEN(str)) {
-      stb_text_makeundo_replace(str, state, state->cursor, 1, 1);
-      STB_TEXTEDIT_DELETECHARS(str, state->cursor, 1);
-      text_len = STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, text_len);
-      if (text_len) {
-         state->cursor += text_len;
-         state->has_preferred_x = 0;
-      }
-   } else {
-      stb_textedit_delete_selection(str, state); // implicitly clamps
-      text_len = STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, text_len);
-      if (text_len) {
-         stb_text_makeundo_insert(state, state->cursor, text_len);
-         state->cursor += text_len;
-         state->has_preferred_x = 0;
-      }
-   }
-}
-
 // API key: process a keyboard input
 static void stb_textedit_key(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_KEYTYPE key)
 {
 retry:
   switch (key) {
      default: {
-#ifdef STB_TEXTEDIT_KEYTOTEXT
-         // This is not suitable for UTF-8 support.
         int c = STB_TEXTEDIT_KEYTOTEXT(key);
         if (c > 0) {
-            IMSTB_TEXTEDIT_CHARTYPE ch = (IMSTB_TEXTEDIT_CHARTYPE)c;
-            stb_textedit_text(str, state, &ch, 1);
+            IMSTB_TEXTEDIT_CHARTYPE ch = (IMSTB_TEXTEDIT_CHARTYPE) c;
+
+            // can't add newline in single-line mode
+            if (c == '\n' && state->single_line)
+               break;
+
+            if (state->insert_mode && !STB_TEXT_HAS_SELECTION(state) && state->cursor < STB_TEXTEDIT_STRINGLEN(str)) {
+               stb_text_makeundo_replace(str, state, state->cursor, 1, 1);
+               STB_TEXTEDIT_DELETECHARS(str, state->cursor, 1);
+               if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) {
+                  ++state->cursor;
+                  state->has_preferred_x = 0;
+               }
+            } else {
+               stb_textedit_delete_selection(str,state); // implicitly clamps
+               if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) {
+                  stb_text_makeundo_insert(state, state->cursor, 1);
+                  ++state->cursor;
+                  state->has_preferred_x = 0;
+               }
+            }
         }
-#endif
         break;
      }

@@ -859,7 +775,7 @@ retry:
            stb_textedit_move_to_first(state);
         else
            if (state->cursor > 0)
-               state->cursor = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->cursor);
+               --state->cursor;
         state->has_preferred_x = 0;
         break;

@@ -868,7 +784,7 @@ retry:
         if (STB_TEXT_HAS_SELECTION(state))
            stb_textedit_move_to_last(str, state);
         else
-            state->cursor = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor);
+            ++state->cursor;
         stb_textedit_clamp(str, state);
         state->has_preferred_x = 0;
         break;
@@ -878,7 +794,7 @@ retry:
         stb_textedit_prep_selection_at_cursor(state);
         // move selection left
         if (state->select_end > 0)
-            state->select_end = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->select_end);
+            --state->select_end;
         state->cursor = state->select_end;
         state->has_preferred_x = 0;
         break;
@@ -928,7 +844,7 @@ retry:
      case STB_TEXTEDIT_K_RIGHT | STB_TEXTEDIT_K_SHIFT:
         stb_textedit_prep_selection_at_cursor(state);
         // move selection right
-         state->select_end = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->select_end);
+         ++state->select_end;
         stb_textedit_clamp(str, state);
         state->cursor = state->select_end;
         state->has_preferred_x = 0;
@@ -968,16 +884,15 @@ retry:

            // [DEAR IMGUI]
            // going down while being on the last line shouldn't bring us to that line end
-            //if (STB_TEXTEDIT_GETCHAR(str, find.first_char + find.length - 1) != STB_TEXTEDIT_NEWLINE)
-            //   break;
+            if (STB_TEXTEDIT_GETCHAR(str, find.first_char + find.length - 1) != STB_TEXTEDIT_NEWLINE)
+               break;

            // now find character position down a row
            state->cursor = start;
            STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor);
            x = row.x0;
-            for (i=0; i < row.num_chars; ) {
+            for (i=0; i < row.num_chars; ++i) {
               float dx = STB_TEXTEDIT_GETWIDTH(str, start, i);
-               int next = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor);
               #ifdef IMSTB_TEXTEDIT_GETWIDTH_NEWLINE
               if (dx == IMSTB_TEXTEDIT_GETWIDTH_NEWLINE)
                  break;
@@ -985,13 +900,10 @@ retry:
               x += dx;
               if (x > goal_x)
                  break;
-               i += next - state->cursor;
-               state->cursor = next;
+               ++state->cursor;
            }
            stb_textedit_clamp(str, state);

-            if (state->cursor == find.first_char + find.length)
-               str->LastMoveDirectionLR = ImGuiDir_Left;
            state->has_preferred_x = 1;
            state->preferred_x = goal_x;

@@ -1041,9 +953,8 @@ retry:
            state->cursor = find.prev_first;
            STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor);
            x = row.x0;
-            for (i=0; i < row.num_chars; ) {
+            for (i=0; i < row.num_chars; ++i) {
               float dx = STB_TEXTEDIT_GETWIDTH(str, find.prev_first, i);
-               int next = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor);
               #ifdef IMSTB_TEXTEDIT_GETWIDTH_NEWLINE
               if (dx == IMSTB_TEXTEDIT_GETWIDTH_NEWLINE)
                  break;
@@ -1051,15 +962,10 @@ retry:
               x += dx;
               if (x > goal_x)
                  break;
-               i += next - state->cursor;
-               state->cursor = next;
+               ++state->cursor;
            }
            stb_textedit_clamp(str, state);

-            if (state->cursor == find.first_char)
-               str->LastMoveDirectionLR = ImGuiDir_Right;
-            else if (state->cursor == find.prev_first)
-               str->LastMoveDirectionLR = ImGuiDir_Left;
            state->has_preferred_x = 1;
            state->preferred_x = goal_x;

@@ -1069,15 +975,10 @@ retry:
            // go to previous line
            // (we need to scan previous line the hard way. maybe we could expose this as a new API function?)
            prev_scan = find.prev_first > 0 ? find.prev_first - 1 : 0;
-            while (prev_scan > 0)
-            {
-               int prev = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, prev_scan);
-               if (STB_TEXTEDIT_GETCHAR(str, prev) == STB_TEXTEDIT_NEWLINE)
-                  break;
-               prev_scan = prev;
-            }
+            while (prev_scan > 0 && STB_TEXTEDIT_GETCHAR(str, prev_scan - 1) != STB_TEXTEDIT_NEWLINE)
+               --prev_scan;
            find.first_char = find.prev_first;
-            find.prev_first = STB_TEXTEDIT_MOVELINESTART(str, state, prev_scan);
+            find.prev_first = prev_scan;
         }
         break;
      }
@@ -1089,7 +990,7 @@ retry:
         else {
            int n = STB_TEXTEDIT_STRINGLEN(str);
            if (state->cursor < n)
-               stb_textedit_delete(str, state, state->cursor, IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor) - state->cursor);
+               stb_textedit_delete(str, state, state->cursor, 1);
         }
         state->has_preferred_x = 0;
         break;
@@ -1101,9 +1002,8 @@ retry:
         else {
            stb_textedit_clamp(str, state);
            if (state->cursor > 0) {
-               int prev = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->cursor);
-               stb_textedit_delete(str, state, prev, state->cursor - prev);
-               state->cursor = prev;
+               stb_textedit_delete(str, state, state->cursor-1, 1);
+               --state->cursor;
            }
         }
         state->has_preferred_x = 0;
@@ -1151,7 +1051,10 @@ retry:
      case STB_TEXTEDIT_K_LINESTART:
         stb_textedit_clamp(str, state);
         stb_textedit_move_to_first(state);
-         state->cursor = STB_TEXTEDIT_MOVELINESTART(str, state, state->cursor);
+         if (state->single_line)
+            state->cursor = 0;
+         else while (state->cursor > 0 && STB_TEXTEDIT_GETCHAR(str, state->cursor-1) != STB_TEXTEDIT_NEWLINE)
+            --state->cursor;
         state->has_preferred_x = 0;
         break;

@@ -1159,9 +1062,13 @@ retry:
      case STB_TEXTEDIT_K_LINEEND2:
 #endif
      case STB_TEXTEDIT_K_LINEEND: {
+         int n = STB_TEXTEDIT_STRINGLEN(str);
         stb_textedit_clamp(str, state);
-         stb_textedit_move_to_last(str, state);
-         state->cursor = STB_TEXTEDIT_MOVELINEEND(str, state, state->cursor);
+         stb_textedit_move_to_first(state);
+         if (state->single_line)
+             state->cursor = n;
+         else while (state->cursor < n && STB_TEXTEDIT_GETCHAR(str, state->cursor) != STB_TEXTEDIT_NEWLINE)
+             ++state->cursor;
         state->has_preferred_x = 0;
         break;
      }
@@ -1172,7 +1079,10 @@ retry:
      case STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_SHIFT:
         stb_textedit_clamp(str, state);
         stb_textedit_prep_selection_at_cursor(state);
-         state->cursor = STB_TEXTEDIT_MOVELINESTART(str, state, state->cursor);
+         if (state->single_line)
+            state->cursor = 0;
+         else while (state->cursor > 0 && STB_TEXTEDIT_GETCHAR(str, state->cursor-1) != STB_TEXTEDIT_NEWLINE)
+            --state->cursor;
         state->select_end = state->cursor;
         state->has_preferred_x = 0;
         break;
@@ -1181,9 +1091,13 @@ retry:
      case STB_TEXTEDIT_K_LINEEND2 | STB_TEXTEDIT_K_SHIFT:
 #endif
      case STB_TEXTEDIT_K_LINEEND | STB_TEXTEDIT_K_SHIFT: {
+         int n = STB_TEXTEDIT_STRINGLEN(str);
         stb_textedit_clamp(str, state);
         stb_textedit_prep_selection_at_cursor(state);
-         state->cursor = STB_TEXTEDIT_MOVELINEEND(str, state, state->cursor);
+         if (state->single_line)
+             state->cursor = n;
+         else while (state->cursor < n && STB_TEXTEDIT_GETCHAR(str, state->cursor) != STB_TEXTEDIT_NEWLINE)
+            ++state->cursor;
         state->select_end = state->cursor;
         state->has_preferred_x = 0;
         break;
@@ -1358,7 +1272,7 @@ static void stb_text_undo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state)
   // check type of recorded action:
   if (u.insert_length) {
      // easy case: was a deletion, so we need to insert n characters
-      u.insert_length = STB_TEXTEDIT_INSERTCHARS(str, u.where, &s->undo_char[u.char_storage], u.insert_length);
+      STB_TEXTEDIT_INSERTCHARS(str, u.where, &s->undo_char[u.char_storage], u.insert_length);
      s->undo_char_point -= u.insert_length;
   }

@@ -1409,7 +1323,7 @@ static void stb_text_redo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state)

   if (r.insert_length) {
      // easy case: need to insert n characters
-      r.insert_length = STB_TEXTEDIT_INSERTCHARS(str, r.where, &s->undo_char[r.char_storage], r.insert_length);
+      STB_TEXTEDIT_INSERTCHARS(str, r.where, &s->undo_char[r.char_storage], r.insert_length);
      s->redo_char_point += r.insert_length;
   }

@@ -4516,8 +4516,8 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex
            q2[0] = (float)x2;
            q2[1] = (float)y2;
            if (equal(q0,q1) || equal(q1,q2)) {
-               x0 = (int)verts[i-1].x; //-V1048
-               y0 = (int)verts[i-1].y; //-V1048
+               x0 = (int)verts[i-1].x;
+               y0 = (int)verts[i-1].y;
               x1 = (int)verts[i  ].x;
               y1 = (int)verts[i  ].y;
               if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
@@ -1,844 +0,0 @@
-// dear imgui: FreeType font builder (used as a replacement for the stb_truetype builder)
-// (code)
-
-// Get the latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype
-// Original code by @vuhdo (Aleksei Skriabin) in 2017, with improvements by @mikesart.
-// Maintained since 2019 by @ocornut.
-
-// CHANGELOG
-// (minor and older changes stripped away, please see git history for details)
-//  2025/06/11: refactored for the new ImFontLoader architecture, and ImGuiBackendFlags_RendererHasTextures support.
-//  2024/10/17: added plutosvg support for SVG Fonts (seems faster/better than lunasvg). Enable by using '#define IMGUI_ENABLE_FREETYPE_PLUTOSVG'. (#7927)
-//  2023/11/13: added support for ImFontConfig::RasterizationDensity field for scaling render density without scaling metrics.
-//  2023/08/01: added support for SVG fonts, enable by using '#define IMGUI_ENABLE_FREETYPE_LUNASVG'. (#6591)
-//  2023/01/04: fixed a packing issue which in some occurrences would prevent large amount of glyphs from being packed correctly.
-//  2021/08/23: fixed crash when FT_Render_Glyph() fails to render a glyph and returns nullptr.
-//  2021/03/05: added ImGuiFreeTypeBuilderFlags_Bitmap to load bitmap glyphs.
-//  2021/03/02: set 'atlas->TexPixelsUseColors = true' to help some backends with deciding of a preferred texture format.
-//  2021/01/28: added support for color-layered glyphs via ImGuiFreeTypeBuilderFlags_LoadColor (require Freetype 2.10+).
-//  2021/01/26: simplified integration by using '#define IMGUI_ENABLE_FREETYPE'. renamed ImGuiFreeType::XXX flags to ImGuiFreeTypeBuilderFlags_XXX for consistency with other API. removed ImGuiFreeType::BuildFontAtlas().
-//  2020/06/04: fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails.
-//  2019/02/09: added RasterizerFlags::Monochrome flag to disable font anti-aliasing (combine with ::MonoHinting for best results!)
-//  2019/01/15: added support for imgui allocators + added FreeType only override function SetAllocatorFunctions().
-//  2019/01/10: re-factored to match big update in STB builder. fixed texture height waste. fixed redundant glyphs when merging. support for glyph padding.
-//  2018/06/08: added support for ImFontConfig::GlyphMinAdvanceX, GlyphMaxAdvanceX.
-//  2018/02/04: moved to main imgui repository (away from http://www.github.com/ocornut/imgui_club)
-//  2018/01/22: fix for addition of ImFontAtlas::TexUvscale member.
-//  2017/10/22: minor inconsequential change to match change in master (removed an unnecessary statement).
-//  2017/09/26: fixes for imgui internal changes.
-//  2017/08/26: cleanup, optimizations, support for ImFontConfig::RasterizerFlags, ImFontConfig::RasterizerMultiply.
-//  2017/08/16: imported from https://github.com/Vuhdo/imgui_freetype into http://www.github.com/ocornut/imgui_club, updated for latest changes in ImFontAtlas, minor tweaks.
-
-// About Gamma Correct Blending:
-// - FreeType assumes blending in linear space rather than gamma space.
-// - See https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Render_Glyph
-// - For correct results you need to be using sRGB and convert to linear space in the pixel shader output.
-// - The default dear imgui styles will be impacted by this change (alpha values will need tweaking).
-
-// FIXME: cfg.OversampleH, OversampleV are not supported, but generally not necessary with this rasterizer because Hinting makes everything look better.
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-#include "imgui_freetype.h"
-#include "imgui_internal.h"     // ImMin,ImMax,ImFontAtlasBuild*,
-#include <stdint.h>
-#ifdef _MSC_VER
-#pragma push_macro("generic")
-#undef generic
-#define generic __generic
-#endif
-#include <ft2build.h>
-#include FT_FREETYPE_H          // <freetype/freetype.h>
-#include FT_MODULE_H            // <freetype/ftmodapi.h>
-#include FT_GLYPH_H             // <freetype/ftglyph.h>
-#include FT_SIZES_H             // <freetype/ftsizes.h>
-#include FT_SYNTHESIS_H         // <freetype/ftsynth.h>
-#include FT_TRUETYPE_TABLES_H   // <freetype/tttables.h>
-#include FT_TRUETYPE_TAGS_H     // <freetype/tttags.h>
-#ifdef _MSC_VER
-#pragma pop_macro("generic")
-#endif
-
-// Handle LunaSVG and PlutoSVG
-#if defined(IMGUI_ENABLE_FREETYPE_LUNASVG) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG)
-#error "Cannot enable both IMGUI_ENABLE_FREETYPE_LUNASVG and IMGUI_ENABLE_FREETYPE_PLUTOSVG"
-#endif
-#ifdef  IMGUI_ENABLE_FREETYPE_LUNASVG
-#include FT_OTSVG_H             // <freetype/otsvg.h>
-#include FT_BBOX_H              // <freetype/ftbbox.h>
-#include <lunasvg.h>
-#endif
-#ifdef  IMGUI_ENABLE_FREETYPE_PLUTOSVG
-#include <plutosvg.h>
-#endif
-#if defined(IMGUI_ENABLE_FREETYPE_LUNASVG) || defined (IMGUI_ENABLE_FREETYPE_PLUTOSVG)
-#if !((FREETYPE_MAJOR >= 2) && (FREETYPE_MINOR >= 12))
-#error IMGUI_ENABLE_FREETYPE_PLUTOSVG or IMGUI_ENABLE_FREETYPE_LUNASVG requires FreeType version >= 2.12
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable: 4505)     // unreferenced local function has been removed (stb stuff)
-#pragma warning (disable: 26812)    // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"                  // warning: unknown option after '#pragma GCC diagnostic' kind
-#pragma GCC diagnostic ignored "-Wunused-function"          // warning: 'xxxx' defined but not used
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wsubobject-linkage"        // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace
-#endif
-#endif
-
-//-------------------------------------------------------------------------
-// Data
-//-------------------------------------------------------------------------
-
-// Default memory allocators
-static void* ImGuiFreeTypeDefaultAllocFunc(size_t size, void* user_data) { IM_UNUSED(user_data); return IM_ALLOC(size); }
-static void  ImGuiFreeTypeDefaultFreeFunc(void* ptr, void* user_data) { IM_UNUSED(user_data); IM_FREE(ptr); }
-
-// Current memory allocators
-static void* (*GImGuiFreeTypeAllocFunc)(size_t size, void* user_data) = ImGuiFreeTypeDefaultAllocFunc;
-static void  (*GImGuiFreeTypeFreeFunc)(void* ptr, void* user_data) = ImGuiFreeTypeDefaultFreeFunc;
-static void* GImGuiFreeTypeAllocatorUserData = nullptr;
-
-// Lunasvg support
-#ifdef IMGUI_ENABLE_FREETYPE_LUNASVG
-static FT_Error ImGuiLunasvgPortInit(FT_Pointer* state);
-static void     ImGuiLunasvgPortFree(FT_Pointer* state);
-static FT_Error ImGuiLunasvgPortRender(FT_GlyphSlot slot, FT_Pointer* _state);
-static FT_Error ImGuiLunasvgPortPresetSlot(FT_GlyphSlot slot, FT_Bool cache, FT_Pointer* _state);
-#endif
-
-//-------------------------------------------------------------------------
-// Code
-//-------------------------------------------------------------------------
-
-#define FT_CEIL(X)      (((X + 63) & -64) / 64) // From SDL_ttf: Handy routines for converting from fixed point
-#define FT_SCALEFACTOR  64.0f                   // For converting from/to 26.6 factionals
-
-// Glyph metrics:
-// --------------
-//
-//                       xmin                     xmax
-//                        |                         |
-//                        |<-------- width -------->|
-//                        |                         |
-//              |         +-------------------------+----------------- ymax
-//              |         |    ggggggggg   ggggg    |     ^        ^
-//              |         |   g:::::::::ggg::::g    |     |        |
-//              |         |  g:::::::::::::::::g    |     |        |
-//              |         | g::::::ggggg::::::gg    |     |        |
-//              |         | g:::::g     g:::::g     |     |        |
-//    offsetX  -|-------->| g:::::g     g:::::g     |  offsetY     |
-//              |         | g:::::g     g:::::g     |     |        |
-//              |         | g::::::g    g:::::g     |     |        |
-//              |         | g:::::::ggggg:::::g     |     |        |
-//              |         |  g::::::::::::::::g     |     |      height
-//              |         |   gg::::::::::::::g     |     |        |
-//  baseline ---*---------|---- gggggggg::::::g-----*--------      |
-//            / |         |             g:::::g     |              |
-//     origin   |         | gggggg      g:::::g     |              |
-//              |         | g:::::gg   gg:::::g     |              |
-//              |         |  g::::::ggg:::::::g     |              |
-//              |         |   gg:::::::::::::g      |              |
-//              |         |     ggg::::::ggg        |              |
-//              |         |         gggggg          |              v
-//              |         +-------------------------+----------------- ymin
-//              |                                   |
-//              |------------- advanceX ----------->|
-
-// Stored in ImFontAtlas::FontLoaderData. ALLOCATED BY US.
-struct ImGui_ImplFreeType_Data
-{
-	FT_Library                      Library;
-	FT_MemoryRec_                   MemoryManager;
-	ImGui_ImplFreeType_Data()       { memset((void*)this, 0, sizeof(*this)); }
-};
-
-// Stored in ImFontConfig::FontLoaderData. ALLOCATED BY US.
-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, const ImFontConfig* src, ImGuiFreeTypeLoaderFlags extra_user_flags);
-	void                            CloseFont();
-	ImGui_ImplFreeType_FontSrcData()   { memset((void*)this, 0, sizeof(*this)); }
-	~ImGui_ImplFreeType_FontSrcData()  { CloseFont(); }
-	
-	// Members
-	FT_Face                         FtFace;
-	ImGuiFreeTypeLoaderFlags        UserFlags;          // = ImFontConfig::FontLoaderFlags
-	FT_Int32                        LoadFlags;
-	ImFontBaked*                    BakedLastActivated;
-};
-
-// Stored in ImFontBaked::FontLoaderDatas: pointer to SourcesCount instances of this. ALLOCATED BY CORE.
-struct ImGui_ImplFreeType_FontSrcBakedData
-{
-	FT_Size     FtSize;             // This represent a FT_Face with a given size.
-	ImGui_ImplFreeType_FontSrcBakedData() { memset((void*)this, 0, sizeof(*this)); }
-};
-
-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, (const FT_Byte*)src->FontData, (FT_Long)src->FontDataSize, (FT_Long)src->FontNo, &FtFace);
-	if (error != 0)
-		return false;
-	
-	// Reject COLRv1 fonts as they require a dedicated rendering engine (not supported)
-	if (FT_IS_SFNT(FtFace))
-	{
-		FT_ULong len = 0;
-		if (FT_Load_Sfnt_Table(FtFace, TTAG_COLR, 0, nullptr, &len) == 0 && len >= 2)
-		{
-			FT_Byte header[2];
-			FT_ULong headerLen = sizeof(header);
-			if (FT_Load_Sfnt_Table(FtFace, TTAG_COLR, 0, header, &headerLen) == 0 && headerLen >= 2)
-			{
-				int version = (header[0] << 8) | header[1];
-				if (version == 1)
-				{
-					FT_Done_Face(FtFace);
-					FtFace = nullptr;
-					return false;
-				}
-			}
-		}
-	}
-	
-	error = FT_Select_Charmap(FtFace, FT_ENCODING_UNICODE);
-	if (error != 0)
-		return false;
-	
-	// Convert to FreeType flags (NB: Bold and Oblique are processed separately)
-	UserFlags = (ImGuiFreeTypeLoaderFlags)(src->FontLoaderFlags | extra_font_loader_flags);
-	
-	LoadFlags = 0;
-	if ((UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) == 0)
-		LoadFlags |= FT_LOAD_NO_BITMAP;
-	if (UserFlags & ImGuiFreeTypeLoaderFlags_NoHinting)
-		LoadFlags |= FT_LOAD_NO_HINTING;
-	if (UserFlags & ImGuiFreeTypeLoaderFlags_NoAutoHint)
-		LoadFlags |= FT_LOAD_NO_AUTOHINT;
-	if (UserFlags & ImGuiFreeTypeLoaderFlags_ForceAutoHint)
-		LoadFlags |= FT_LOAD_FORCE_AUTOHINT;
-	if (UserFlags & ImGuiFreeTypeLoaderFlags_LightHinting)
-		LoadFlags |= FT_LOAD_TARGET_LIGHT;
-	else if (UserFlags & ImGuiFreeTypeLoaderFlags_MonoHinting)
-		LoadFlags |= FT_LOAD_TARGET_MONO;
-	else
-		LoadFlags |= FT_LOAD_TARGET_NORMAL;
-	
-	if (UserFlags & ImGuiFreeTypeLoaderFlags_LoadColor)
-		LoadFlags |= FT_LOAD_COLOR;
-	
-	return true;
-}
-
-void ImGui_ImplFreeType_FontSrcData::CloseFont()
-{
-	if (FtFace)
-	{
-		FT_Done_Face(FtFace);
-		FtFace = nullptr;
-	}
-}
-
-static const FT_Glyph_Metrics* ImGui_ImplFreeType_LoadGlyph(ImGui_ImplFreeType_FontSrcData* src_data, uint32_t codepoint)
-{
-	uint32_t glyph_index = FT_Get_Char_Index(src_data->FtFace, codepoint);
-	if (glyph_index == 0)
-		return nullptr;
-	
-	// If this crash for you: FreeType 2.11.0 has a crash bug on some bitmap/colored fonts.
-	// - https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
-	// - https://github.com/ocornut/imgui/issues/4567
-	// - https://github.com/ocornut/imgui/issues/4566
-	// You can use FreeType 2.10, or the patched version of 2.11.0 in VcPkg, or probably any upcoming FreeType version.
-	FT_Error error = FT_Load_Glyph(src_data->FtFace, glyph_index, src_data->LoadFlags);
-	if (error)
-		return nullptr;
-	
-	// Need an outline for this to work
-	FT_GlyphSlot slot = src_data->FtFace->glyph;
-#if defined(IMGUI_ENABLE_FREETYPE_LUNASVG) || defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG)
-	IM_ASSERT(slot->format == FT_GLYPH_FORMAT_OUTLINE || slot->format == FT_GLYPH_FORMAT_BITMAP || slot->format == FT_GLYPH_FORMAT_SVG);
-#else
-#if ((FREETYPE_MAJOR >= 2) && (FREETYPE_MINOR >= 12))
-	IM_ASSERT(slot->format != FT_GLYPH_FORMAT_SVG && "The font contains SVG glyphs, you'll need to enable IMGUI_ENABLE_FREETYPE_PLUTOSVG or IMGUI_ENABLE_FREETYPE_LUNASVG in imconfig.h and install required libraries in order to use this font");
-#endif
-	IM_ASSERT(slot->format == FT_GLYPH_FORMAT_OUTLINE || slot->format == FT_GLYPH_FORMAT_BITMAP);
-#endif // IMGUI_ENABLE_FREETYPE_LUNASVG
-	
-	// Apply convenience transform (this is not picking from real "Bold"/"Italic" fonts! Merely applying FreeType helper transform. Oblique == Slanting)
-	if (src_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bold)
-		FT_GlyphSlot_Embolden(slot);
-	if (src_data->UserFlags & ImGuiFreeTypeLoaderFlags_Oblique)
-	{
-		FT_GlyphSlot_Oblique(slot);
-		//FT_BBox bbox;
-		//FT_Outline_Get_BBox(&slot->outline, &bbox);
-		//slot->metrics.width = bbox.xMax - bbox.xMin;
-		//slot->metrics.height = bbox.yMax - bbox.yMin;
-	}
-	
-	return &slot->metrics;
-}
-
-static void ImGui_ImplFreeType_BlitGlyph(const FT_Bitmap* ft_bitmap, uint32_t* dst, uint32_t dst_pitch)
-{
-	IM_ASSERT(ft_bitmap != nullptr);
-	const uint32_t w = ft_bitmap->width;
-	const uint32_t h = ft_bitmap->rows;
-	const uint8_t* src = ft_bitmap->buffer;
-	const uint32_t src_pitch = ft_bitmap->pitch;
-	
-	switch (ft_bitmap->pixel_mode)
-	{
-		case FT_PIXEL_MODE_GRAY: // Grayscale image, 1 byte per pixel.
-		{
-			for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-				for (uint32_t x = 0; x < w; x++)
-					dst[x] = IM_COL32(255, 255, 255, src[x]);
-			break;
-		}
-		case FT_PIXEL_MODE_MONO: // Monochrome image, 1 bit per pixel. The bits in each byte are ordered from MSB to LSB.
-		{
-			for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-			{
-				uint8_t bits = 0;
-				const uint8_t* bits_ptr = src;
-				for (uint32_t x = 0; x < w; x++, bits <<= 1)
-				{
-					if ((x & 7) == 0)
-						bits = *bits_ptr++;
-					dst[x] = IM_COL32(255, 255, 255, (bits & 0x80) ? 255 : 0);
-				}
-			}
-			break;
-		}
-		case FT_PIXEL_MODE_BGRA:
-		{
-			// FIXME: Converting pre-multiplied alpha to straight. Doesn't smell good.
-#define DE_MULTIPLY(color, alpha) ImMin((ImU32)(255.0f * (float)color / (float)(alpha + FLT_MIN) + 0.5f), 255u)
-			for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-				for (uint32_t x = 0; x < w; x++)
-				{
-					uint8_t r = src[x * 4 + 2], g = src[x * 4 + 1], b = src[x * 4], a = src[x * 4 + 3];
-					dst[x] = IM_COL32(DE_MULTIPLY(r, a), DE_MULTIPLY(g, a), DE_MULTIPLY(b, a), a);
-				}
-#undef DE_MULTIPLY
-			break;
-		}
-		default:
-			IM_ASSERT(0 && "FreeTypeFont::BlitGlyph(): Unknown bitmap pixel mode!");
-	}
-}
-
-// FreeType memory allocation callbacks
-static void* FreeType_Alloc(FT_Memory /*memory*/, long size)
-{
-	return GImGuiFreeTypeAllocFunc((size_t)size, GImGuiFreeTypeAllocatorUserData);
-}
-
-static void FreeType_Free(FT_Memory /*memory*/, void* block)
-{
-	GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-}
-
-static void* FreeType_Realloc(FT_Memory /*memory*/, long cur_size, long new_size, void* block)
-{
-	// Implement realloc() as we don't ask user to provide it.
-	if (block == nullptr)
-		return GImGuiFreeTypeAllocFunc((size_t)new_size, GImGuiFreeTypeAllocatorUserData);
-	
-	if (new_size == 0)
-	{
-		GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-		return nullptr;
-	}
-	
-	if (new_size > cur_size)
-	{
-		void* new_block = GImGuiFreeTypeAllocFunc((size_t)new_size, GImGuiFreeTypeAllocatorUserData);
-		memcpy(new_block, block, (size_t)cur_size);
-		GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-		return new_block;
-	}
-	
-	return block;
-}
-
-static bool ImGui_ImplFreeType_LoaderInit(ImFontAtlas* atlas)
-{
-	IM_ASSERT(atlas->FontLoaderData == nullptr);
-	ImGui_ImplFreeType_Data* bd = IM_NEW(ImGui_ImplFreeType_Data)();
-	
-	// FreeType memory management: https://www.freetype.org/freetype2/docs/design/design-4.html
-	bd->MemoryManager.user = nullptr;
-	bd->MemoryManager.alloc = &FreeType_Alloc;
-	bd->MemoryManager.free = &FreeType_Free;
-	bd->MemoryManager.realloc = &FreeType_Realloc;
-	
-	// https://www.freetype.org/freetype2/docs/reference/ft2-module_management.html#FT_New_Library
-	FT_Error error = FT_New_Library(&bd->MemoryManager, &bd->Library);
-	if (error != 0)
-	{
-		IM_DELETE(bd);
-		return false;
-	}
-	
-	// If you don't call FT_Add_Default_Modules() the rest of code may work, but FreeType won't use our custom allocator.
-	FT_Add_Default_Modules(bd->Library);
-	
-#ifdef IMGUI_ENABLE_FREETYPE_LUNASVG
-	// Install svg hooks for FreeType
-	// https://freetype.org/freetype2/docs/reference/ft2-properties.html#svg-hooks
-	// https://freetype.org/freetype2/docs/reference/ft2-svg_fonts.html#svg_fonts
-	SVG_RendererHooks hooks = { ImGuiLunasvgPortInit, ImGuiLunasvgPortFree, ImGuiLunasvgPortRender, ImGuiLunasvgPortPresetSlot };
-	FT_Property_Set(bd->Library, "ot-svg", "svg-hooks", &hooks);
-#endif // IMGUI_ENABLE_FREETYPE_LUNASVG
-#ifdef IMGUI_ENABLE_FREETYPE_PLUTOSVG
-	// With plutosvg, use provided hooks
-	FT_Property_Set(bd->Library, "ot-svg", "svg-hooks", plutosvg_ft_svg_hooks());
-#endif // IMGUI_ENABLE_FREETYPE_PLUTOSVG
-	
-	// Store our data
-	atlas->FontLoaderData = (void*)bd;
-	
-	return true;
-}
-
-static void ImGui_ImplFreeType_LoaderShutdown(ImFontAtlas* atlas)
-{
-	ImGui_ImplFreeType_Data* bd = (ImGui_ImplFreeType_Data*)atlas->FontLoaderData;
-	IM_ASSERT(bd != nullptr);
-	FT_Done_Library(bd->Library);
-	IM_DELETE(bd);
-	atlas->FontLoaderData = nullptr;
-}
-
-static bool ImGui_ImplFreeType_FontSrcInit(ImFontAtlas* atlas, ImFontConfig* src)
-{
-	ImGui_ImplFreeType_Data* bd = (ImGui_ImplFreeType_Data*)atlas->FontLoaderData;
-	ImGui_ImplFreeType_FontSrcData* bd_font_data = IM_NEW(ImGui_ImplFreeType_FontSrcData);
-	IM_ASSERT(src->FontLoaderData == nullptr);
-	src->FontLoaderData = bd_font_data;
-	
-	if (!bd_font_data->InitFont(bd->Library, src, (ImGuiFreeTypeLoaderFlags)atlas->FontLoaderFlags))
-	{
-		IM_DELETE(bd_font_data);
-		src->FontLoaderData = nullptr;
-		return false;
-	}
-	
-	return true;
-}
-
-static void ImGui_ImplFreeType_FontSrcDestroy(ImFontAtlas* atlas, ImFontConfig* src)
-{
-	IM_UNUSED(atlas);
-	ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData;
-	IM_DELETE(bd_font_data);
-	src->FontLoaderData = nullptr;
-}
-
-static bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src)
-{
-	IM_UNUSED(atlas);
-	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;
-	
-	// We use one FT_Size per (source + baked) combination.
-	ImGui_ImplFreeType_FontSrcBakedData* bd_baked_data = (ImGui_ImplFreeType_FontSrcBakedData*)loader_data_for_baked_src;
-	IM_ASSERT(bd_baked_data != nullptr);
-	IM_PLACEMENT_NEW(bd_baked_data) ImGui_ImplFreeType_FontSrcBakedData();
-	
-	FT_New_Size(bd_font_data->FtFace, &bd_baked_data->FtSize);
-	FT_Activate_Size(bd_baked_data->FtSize);
-	const float rasterizer_density = src->RasterizerDensity * baked->RasterizerDensity;
-	if (((bd_font_data->FtFace->face_flags & FT_FACE_FLAG_FIXED_SIZES) != 0) && ((bd_font_data->FtFace->face_flags & FT_FACE_FLAG_SCALABLE) == 0) && ((bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) != 0))
-	{
-		IM_ASSERT(bd_font_data->FtFace->num_fixed_sizes > 0);
-		
-		// Loop over sizes and pick the closest, larger (or better equal) size.
-		int best_index = 0;
-		float best_height = bd_font_data->FtFace->available_sizes[best_index].y_ppem / FT_SCALEFACTOR;
-		for (int i = 1; i < bd_font_data->FtFace->num_fixed_sizes; i++)
-		{
-			const float cur_height = bd_font_data->FtFace->available_sizes[i].y_ppem / FT_SCALEFACTOR;
-			// FIXME: is this overkill?
-			// FIXME: is-float-close with epsilon param would be nice, maybe
-			if (ImFabs(cur_height - size) < 0.001f)
-			{
-				best_index = i;
-				best_height = cur_height;
-				break;
-			}
-			else if (cur_height < size)
-			{
-				if (best_height < cur_height)
-				{
-					best_index = i;
-					best_height = cur_height;
-				}
-			}
-			else
-			{
-				if (best_height < size && best_height < cur_height)
-				{
-					best_index = i;
-					best_height = cur_height;
-				}
-			}
-		}
-		FT_Select_Size(bd_font_data->FtFace, best_index);
-	}
-	else
-	{
-		// Vuhdo 2017: "I'm not sure how to deal with font sizes properly. As far as I understand, currently ImGui assumes that the 'pixel_height'
-		// is a maximum height of an any given glyph, i.e. it's the sum of font's ascender and descender. Seems strange to me.
-		// FT_Set_Pixel_Sizes() doesn't seem to get us the same result."
-		// (FT_Set_Pixel_Sizes() essentially calls FT_Request_Size() with FT_SIZE_REQUEST_TYPE_NOMINAL)
-		
-		FT_Size_RequestRec req;
-		req.type = (bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) ? FT_SIZE_REQUEST_TYPE_NOMINAL : FT_SIZE_REQUEST_TYPE_REAL_DIM;
-		req.width = 0;
-		req.height = (uint32_t)(size * FT_SCALEFACTOR * rasterizer_density);
-		req.horiResolution = 0;
-		req.vertResolution = 0;
-		FT_Request_Size(bd_font_data->FtFace, &req);
-	}
-	
-	// Output
-	if (src->MergeMode == false)
-	{
-		// Read metrics
-		FT_Size_Metrics metrics = bd_baked_data->FtSize->metrics;
-		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.
-		//LineGap         = (float)FT_CEIL(metrics.height - metrics.ascender + metrics.descender) * scale; // The spacing in pixels between one row's descent and the next row's ascent.
-		//MaxAdvanceWidth = (float)FT_CEIL(metrics.max_advance) * scale;    // This field gives the maximum horizontal cursor advance for all glyphs in the font.
-	}
-	return true;
-}
-
-static void ImGui_ImplFreeType_FontBakedDestroy(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src)
-{
-	IM_UNUSED(atlas);
-	IM_UNUSED(baked);
-	IM_UNUSED(src);
-	ImGui_ImplFreeType_FontSrcBakedData* bd_baked_data = (ImGui_ImplFreeType_FontSrcBakedData*)loader_data_for_baked_src;
-	IM_ASSERT(bd_baked_data != nullptr);
-	FT_Done_Size(bd_baked_data->FtSize);
-	bd_baked_data->~ImGui_ImplFreeType_FontSrcBakedData(); // ~IM_PLACEMENT_DELETE()
-}
-
-static bool ImGui_ImplFreeType_FontBakedLoadGlyph(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src, ImWchar codepoint, ImFontGlyph* out_glyph, float* out_advance_x)
-{
-	ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData;
-	uint32_t glyph_index = FT_Get_Char_Index(bd_font_data->FtFace, codepoint);
-	if (glyph_index == 0)
-		return false;
-	
-	if (bd_font_data->BakedLastActivated != baked) // <-- could use id
-	{
-		// Activate current size
-		ImGui_ImplFreeType_FontSrcBakedData* bd_baked_data = (ImGui_ImplFreeType_FontSrcBakedData*)loader_data_for_baked_src;
-		FT_Activate_Size(bd_baked_data->FtSize);
-		bd_font_data->BakedLastActivated = baked;
-	}
-	
-	const FT_Glyph_Metrics* metrics = ImGui_ImplFreeType_LoadGlyph(bd_font_data, codepoint);
-	if (metrics == nullptr)
-		return false;
-	
-	FT_Face face = bd_font_data->FtFace;
-	FT_GlyphSlot slot = face->glyph;
-	const float rasterizer_density = src->RasterizerDensity * baked->RasterizerDensity;
-	float bitmap_x_scale = 1.0f;
-	float bitmap_y_scale = 1.0f;
-	if (((face->face_flags & FT_FACE_FLAG_FIXED_SIZES) != 0) && ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0) && ((bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Bitmap) != 0))
-	{
-		// FIXME: what if this just means invisible?
-		IM_ASSERT(bd_font_data->FtFace->size->metrics.x_ppem > 0);
-		IM_ASSERT(bd_font_data->FtFace->size->metrics.y_ppem > 0);
-		
-		// Scale fixed size bitmap to target size
-		bitmap_x_scale = baked->Size / bd_font_data->FtFace->size->metrics.x_ppem;
-		bitmap_y_scale = baked->Size / bd_font_data->FtFace->size->metrics.y_ppem;
-	}
-	
-	// Load metrics only mode
-	const float advance_x = ((slot->advance.x / FT_SCALEFACTOR) * bitmap_x_scale) / rasterizer_density;
-	if (out_advance_x != NULL)
-	{
-		IM_ASSERT(out_glyph == NULL);
-		*out_advance_x = advance_x;
-		return true;
-	}
-	
-	// Render glyph into a bitmap (currently held by FreeType)
-	FT_Render_Mode render_mode = (bd_font_data->UserFlags & ImGuiFreeTypeLoaderFlags_Monochrome) ? FT_RENDER_MODE_MONO : FT_RENDER_MODE_NORMAL;
-	FT_Error error = FT_Render_Glyph(slot, render_mode);
-	const FT_Bitmap* ft_bitmap = &slot->bitmap;
-	if (error != 0 || ft_bitmap == nullptr)
-		return false;
-	
-	const int bitmap_w = (int)ft_bitmap->width;
-	const int bitmap_h = (int)ft_bitmap->rows;
-	const bool is_visible = (bitmap_w != 0 && bitmap_h != 0);
-	
-	// Prepare glyph
-	out_glyph->Codepoint = codepoint;
-	out_glyph->AdvanceX = advance_x;
-	
-	// Pack and retrieve position inside texture atlas
-	if (is_visible)
-	{
-		const int w = (int)ImCeil(bitmap_w * bitmap_x_scale);
-		const int h = (int)ImCeil(bitmap_h * bitmap_y_scale);
-		const bool rescaling = h != bitmap_h || w != bitmap_w;
-		
-		ImFontAtlasRectId pack_id = ImFontAtlasPackAddRect(atlas, w, h);
-		if (pack_id == ImFontAtlasRectId_Invalid)
-		{
-			// Pathological out of memory case (TexMaxWidth/TexMaxHeight set too small?)
-			IM_ASSERT(pack_id != ImFontAtlasRectId_Invalid && "Out of texture memory.");
-			return false;
-		}
-		ImTextureRect* r = ImFontAtlasPackGetRect(atlas, pack_id);
-		
-		// Render pixels to our temporary buffer, while making sure we have space for an extra copy used during rescaling.
-		atlas->Builder->TempBuffer.resize(((rescaling ? bitmap_w * bitmap_h : 0) + w * h) * 4);
-		uint32_t* temp_buffer = (uint32_t*)atlas->Builder->TempBuffer.Data;
-		// Blit (and convert) into the first bitmap_w * bitmap_h * 4 bytes.
-		ImGui_ImplFreeType_BlitGlyph(ft_bitmap, temp_buffer, bitmap_w);
-		
-		if (rescaling)
-		{
-			uint32_t* dst_buffer = temp_buffer + bitmap_w * bitmap_h;
-			
-			// Perform rescale, from temp_buffer (bitmap_w * bitmap_h) to dst_buffer (w * h)
-			ImFontAtlasTextureBlockResize(temp_buffer, bitmap_w, bitmap_h, dst_buffer, w, h);
-			
-			// Redirect to rescaled part of the buffer
-			temp_buffer = dst_buffer;
-		}
-		
-		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 = 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;
-		
-		// Register glyph
-		float glyph_off_x = ImCeil((float)face->glyph->bitmap_left * bitmap_x_scale);
-		float glyph_off_y = ImCeil((float)-face->glyph->bitmap_top * bitmap_y_scale);
-		out_glyph->X0 = glyph_off_x * recip_h + font_off_x;
-		out_glyph->Y0 = glyph_off_y * recip_v + font_off_y;
-		out_glyph->X1 = (glyph_off_x + w) * recip_h + font_off_x;
-		out_glyph->Y1 = (glyph_off_y + h) * recip_v + font_off_y;
-		out_glyph->Visible = true;
-		out_glyph->Colored = (ft_bitmap->pixel_mode == FT_PIXEL_MODE_BGRA);
-		out_glyph->PackId = pack_id;
-		ImFontAtlasBakedSetFontGlyphBitmap(atlas, baked, src, out_glyph, r, (const unsigned char*)temp_buffer, ImTextureFormat_RGBA32, w * 4);
-	}
-	
-	return true;
-}
-
-static bool ImGui_ImplFreetype_FontSrcContainsGlyph(ImFontAtlas* atlas, ImFontConfig* src, ImWchar codepoint)
-{
-	IM_UNUSED(atlas);
-	ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData;
-	int glyph_index = FT_Get_Char_Index(bd_font_data->FtFace, codepoint);
-	return glyph_index != 0;
-}
-
-const ImFontLoader* ImGuiFreeType::GetFontLoader()
-{
-	static ImFontLoader loader;
-	loader.Name = "FreeType";
-	loader.LoaderInit = ImGui_ImplFreeType_LoaderInit;
-	loader.LoaderShutdown = ImGui_ImplFreeType_LoaderShutdown;
-	loader.FontSrcInit = ImGui_ImplFreeType_FontSrcInit;
-	loader.FontSrcDestroy = ImGui_ImplFreeType_FontSrcDestroy;
-	loader.FontSrcContainsGlyph = ImGui_ImplFreetype_FontSrcContainsGlyph;
-	loader.FontBakedInit = ImGui_ImplFreeType_FontBakedInit;
-	loader.FontBakedDestroy = ImGui_ImplFreeType_FontBakedDestroy;
-	loader.FontBakedLoadGlyph = ImGui_ImplFreeType_FontBakedLoadGlyph;
-	loader.FontBakedSrcLoaderDataSize = sizeof(ImGui_ImplFreeType_FontSrcBakedData);
-	return &loader;
-}
-
-void ImGuiFreeType::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
-{
-	GImGuiFreeTypeAllocFunc = alloc_func;
-	GImGuiFreeTypeFreeFunc = free_func;
-	GImGuiFreeTypeAllocatorUserData = user_data;
-}
-
-bool ImGuiFreeType::DebugEditFontLoaderFlags(unsigned int* p_font_loader_flags)
-{
-	bool edited = false;
-	edited |= ImGui::CheckboxFlags("NoHinting",    p_font_loader_flags, ImGuiFreeTypeLoaderFlags_NoHinting);
-	edited |= ImGui::CheckboxFlags("NoAutoHint",   p_font_loader_flags, ImGuiFreeTypeLoaderFlags_NoAutoHint);
-	edited |= ImGui::CheckboxFlags("ForceAutoHint",p_font_loader_flags, ImGuiFreeTypeLoaderFlags_ForceAutoHint);
-	edited |= ImGui::CheckboxFlags("LightHinting", p_font_loader_flags, ImGuiFreeTypeLoaderFlags_LightHinting);
-	edited |= ImGui::CheckboxFlags("MonoHinting",  p_font_loader_flags, ImGuiFreeTypeLoaderFlags_MonoHinting);
-	edited |= ImGui::CheckboxFlags("Bold",         p_font_loader_flags, ImGuiFreeTypeLoaderFlags_Bold);
-	edited |= ImGui::CheckboxFlags("Oblique",      p_font_loader_flags, ImGuiFreeTypeLoaderFlags_Oblique);
-	edited |= ImGui::CheckboxFlags("Monochrome",   p_font_loader_flags, ImGuiFreeTypeLoaderFlags_Monochrome);
-	edited |= ImGui::CheckboxFlags("LoadColor",    p_font_loader_flags, ImGuiFreeTypeLoaderFlags_LoadColor);
-	edited |= ImGui::CheckboxFlags("Bitmap",       p_font_loader_flags, ImGuiFreeTypeLoaderFlags_Bitmap);
-	return edited;
-}
-
-#ifdef IMGUI_ENABLE_FREETYPE_LUNASVG
-// For more details, see https://gitlab.freedesktop.org/freetype/freetype-demos/-/blob/master/src/rsvg-port.c
-// The original code from the demo is licensed under CeCILL-C Free Software License Agreement (https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/LICENSE.TXT)
-struct LunasvgPortState
-{
-	FT_Error            err = FT_Err_Ok;
-	lunasvg::Matrix     matrix;
-	std::unique_ptr<lunasvg::Document> svg = nullptr;
-};
-
-static FT_Error ImGuiLunasvgPortInit(FT_Pointer* _state)
-{
-	*_state = IM_NEW(LunasvgPortState)();
-	return FT_Err_Ok;
-}
-
-static void ImGuiLunasvgPortFree(FT_Pointer* _state)
-{
-	IM_DELETE(*(LunasvgPortState**)_state);
-}
-
-static FT_Error ImGuiLunasvgPortRender(FT_GlyphSlot slot, FT_Pointer* _state)
-{
-	LunasvgPortState* state = *(LunasvgPortState**)_state;
-	
-	// If there was an error while loading the svg in ImGuiLunasvgPortPresetSlot(), the renderer hook still get called, so just returns the error.
-	if (state->err != FT_Err_Ok)
-		return state->err;
-	
-	// rows is height, pitch (or stride) equals to width * sizeof(int32)
-	lunasvg::Bitmap bitmap((uint8_t*)slot->bitmap.buffer, slot->bitmap.width, slot->bitmap.rows, slot->bitmap.pitch);
-#if LUNASVG_VERSION_MAJOR >= 3
-	state->svg->render(bitmap, state->matrix); // state->matrix is already scaled and translated
-#else
-	state->svg->setMatrix(state->svg->matrix().identity()); // Reset the svg matrix to the default value
-	state->svg->render(bitmap, state->matrix);              // state->matrix is already scaled and translated
-#endif
-	state->err = FT_Err_Ok;
-	return state->err;
-}
-
-static FT_Error ImGuiLunasvgPortPresetSlot(FT_GlyphSlot slot, FT_Bool cache, FT_Pointer* _state)
-{
-	FT_SVG_Document   document = (FT_SVG_Document)slot->other;
-	LunasvgPortState* state = *(LunasvgPortState**)_state;
-	FT_Size_Metrics&  metrics = document->metrics;
-	
-	// This function is called twice, once in the FT_Load_Glyph() and another right before ImGuiLunasvgPortRender().
-	// If it's the latter, don't do anything because it's // already done in the former.
-	if (cache)
-		return state->err;
-	
-	state->svg = lunasvg::Document::loadFromData((const char*)document->svg_document, document->svg_document_length);
-	if (state->svg == nullptr)
-	{
-		state->err = FT_Err_Invalid_SVG_Document;
-		return state->err;
-	}
-	
-#if LUNASVG_VERSION_MAJOR >= 3
-	lunasvg::Box box = state->svg->boundingBox();
-#else
-	lunasvg::Box box = state->svg->box();
-#endif
-	double scale = std::min(metrics.x_ppem / box.w, metrics.y_ppem / box.h);
-	double xx = (double)document->transform.xx / (1 << 16);
-	double xy = -(double)document->transform.xy / (1 << 16);
-	double yx = -(double)document->transform.yx / (1 << 16);
-	double yy = (double)document->transform.yy / (1 << 16);
-	double x0 = (double)document->delta.x / 64 * box.w / metrics.x_ppem;
-	double y0 = -(double)document->delta.y / 64 * box.h / metrics.y_ppem;
-	
-#if LUNASVG_VERSION_MAJOR >= 3
-	// Scale, transform and pre-translate the matrix for the rendering step
-	state->matrix = lunasvg::Matrix::translated(-box.x, -box.y);
-	state->matrix.multiply(lunasvg::Matrix(xx, xy, yx, yy, x0, y0));
-	state->matrix.scale(scale, scale);
-	
-	// Apply updated transformation to the bounding box
-	box.transform(state->matrix);
-#else
-	// Scale and transform, we don't translate the svg yet
-	state->matrix.identity();
-	state->matrix.scale(scale, scale);
-	state->matrix.transform(xx, xy, yx, yy, x0, y0);
-	state->svg->setMatrix(state->matrix);
-	
-	// Pre-translate the matrix for the rendering step
-	state->matrix.translate(-box.x, -box.y);
-	
-	// Get the box again after the transformation
-	box = state->svg->box();
-#endif
-	
-	// Calculate the bitmap size
-	slot->bitmap_left = FT_Int(box.x);
-	slot->bitmap_top = FT_Int(-box.y);
-	slot->bitmap.rows = (unsigned int)(ImCeil((float)box.h));
-	slot->bitmap.width = (unsigned int)(ImCeil((float)box.w));
-	slot->bitmap.pitch = slot->bitmap.width * 4;
-	slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
-	
-	// Compute all the bearings and set them correctly. The outline is scaled already, we just need to use the bounding box.
-	double metrics_width = box.w;
-	double metrics_height = box.h;
-	double horiBearingX = box.x;
-	double horiBearingY = -box.y;
-	double vertBearingX = slot->metrics.horiBearingX / 64.0 - slot->metrics.horiAdvance / 64.0 / 2.0;
-	double vertBearingY = (slot->metrics.vertAdvance / 64.0 - slot->metrics.height / 64.0) / 2.0;
-	slot->metrics.width = FT_Pos(IM_ROUND(metrics_width * 64.0));   // Using IM_ROUND() assume width and height are positive
-	slot->metrics.height = FT_Pos(IM_ROUND(metrics_height * 64.0));
-	slot->metrics.horiBearingX = FT_Pos(horiBearingX * 64);
-	slot->metrics.horiBearingY = FT_Pos(horiBearingY * 64);
-	slot->metrics.vertBearingX = FT_Pos(vertBearingX * 64);
-	slot->metrics.vertBearingY = FT_Pos(vertBearingY * 64);
-	
-	if (slot->metrics.vertAdvance == 0)
-		slot->metrics.vertAdvance = FT_Pos(metrics_height * 1.2 * 64.0);
-	
-	state->err = FT_Err_Ok;
-	return state->err;
-}
-
-#endif // #ifdef IMGUI_ENABLE_FREETYPE_LUNASVG
-
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
-#endif // #ifndef IMGUI_DISABLE
@@ -1,83 +0,0 @@
-// dear imgui: FreeType font builder (used as a replacement for the stb_truetype builder)
-// (headers)
-
-#pragma once
-#include "imgui.h"      // IMGUI_API
-#ifndef IMGUI_DISABLE
-
-// Usage:
-// - Add '#define IMGUI_ENABLE_FREETYPE' in your imconfig to automatically enable support
-//   for imgui_freetype in imgui. It is equivalent to selecting the default loader with:
-//      io.Fonts->SetFontLoader(ImGuiFreeType::GetFontLoader())
-
-// Optional support for OpenType SVG fonts:
-// - Add '#define IMGUI_ENABLE_FREETYPE_PLUTOSVG' to use plutosvg (not provided). See #7927.
-// - Add '#define IMGUI_ENABLE_FREETYPE_LUNASVG' to use lunasvg (not provided). See #6591.
-
-// Forward declarations
-struct ImFontAtlas;
-struct ImFontLoader;
-
-// Hinting greatly impacts visuals (and glyph sizes).
-// - By default, hinting is enabled and the font's native hinter is preferred over the auto-hinter.
-// - When disabled, FreeType generates blurrier glyphs, more or less matches the stb_truetype.h
-// - The Default hinting mode usually looks good, but may distort glyphs in an unusual way.
-// - The Light hinting mode generates fuzzier glyphs but better matches Microsoft's rasterizer.
-// You can set those flags globally in ImFontAtlas::FontLoaderFlags
-// You can set those flags on a per font basis in ImFontConfig::FontLoaderFlags
-typedef unsigned int ImGuiFreeTypeLoaderFlags;
-enum ImGuiFreeTypeLoaderFlags_
-{
-	ImGuiFreeTypeLoaderFlags_NoHinting     = 1 << 0,   // Disable hinting. This generally generates 'blurrier' bitmap glyphs when the glyph are rendered in any of the anti-aliased modes.
-	ImGuiFreeTypeLoaderFlags_NoAutoHint    = 1 << 1,   // Disable auto-hinter.
-	ImGuiFreeTypeLoaderFlags_ForceAutoHint = 1 << 2,   // Indicates that the auto-hinter is preferred over the font's native hinter.
-	ImGuiFreeTypeLoaderFlags_LightHinting  = 1 << 3,   // A lighter hinting algorithm for gray-level modes. Many generated glyphs are fuzzier but better resemble their original shape. This is achieved by snapping glyphs to the pixel grid only vertically (Y-axis), as is done by Microsoft's ClearType and Adobe's proprietary font renderer. This preserves inter-glyph spacing in horizontal text.
-	ImGuiFreeTypeLoaderFlags_MonoHinting   = 1 << 4,   // Strong hinting algorithm that should only be used for monochrome output.
-	ImGuiFreeTypeLoaderFlags_Bold          = 1 << 5,   // Styling: Should we artificially embolden the font?
-	ImGuiFreeTypeLoaderFlags_Oblique       = 1 << 6,   // Styling: Should we slant the font, emulating italic style?
-	ImGuiFreeTypeLoaderFlags_Monochrome    = 1 << 7,   // Disable anti-aliasing. Combine this with MonoHinting for best results!
-	ImGuiFreeTypeLoaderFlags_LoadColor     = 1 << 8,   // Enable FreeType color-layered glyphs
-	ImGuiFreeTypeLoaderFlags_Bitmap        = 1 << 9,   // Enable FreeType bitmap glyphs
-	
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-	ImGuiFreeTypeBuilderFlags_NoHinting     = ImGuiFreeTypeLoaderFlags_NoHinting,
-	ImGuiFreeTypeBuilderFlags_NoAutoHint    = ImGuiFreeTypeLoaderFlags_NoAutoHint,
-	ImGuiFreeTypeBuilderFlags_ForceAutoHint = ImGuiFreeTypeLoaderFlags_ForceAutoHint,
-	ImGuiFreeTypeBuilderFlags_LightHinting  = ImGuiFreeTypeLoaderFlags_LightHinting,
-	ImGuiFreeTypeBuilderFlags_MonoHinting   = ImGuiFreeTypeLoaderFlags_MonoHinting,
-	ImGuiFreeTypeBuilderFlags_Bold          = ImGuiFreeTypeLoaderFlags_Bold,
-	ImGuiFreeTypeBuilderFlags_Oblique       = ImGuiFreeTypeLoaderFlags_Oblique,
-	ImGuiFreeTypeBuilderFlags_Monochrome    = ImGuiFreeTypeLoaderFlags_Monochrome,
-	ImGuiFreeTypeBuilderFlags_LoadColor     = ImGuiFreeTypeLoaderFlags_LoadColor,
-	ImGuiFreeTypeBuilderFlags_Bitmap        = ImGuiFreeTypeLoaderFlags_Bitmap,
-#endif
-};
-
-// Obsolete names (will be removed)
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-typedef ImGuiFreeTypeLoaderFlags_ ImGuiFreeTypeBuilderFlags_;
-#endif
-
-namespace ImGuiFreeType
-{
-// This is automatically assigned when using '#define IMGUI_ENABLE_FREETYPE'.
-// If you need to dynamically select between multiple builders:
-// - you can manually assign this builder with 'atlas->SetFontLoader(ImGuiFreeType::GetFontLoader())'
-// - prefer deep-copying this into your own ImFontLoader instance if you use hot-reloading that messes up static data.
-IMGUI_API const ImFontLoader*       GetFontLoader();
-
-// Override allocators. By default ImGuiFreeType will use IM_ALLOC()/IM_FREE()
-// However, as FreeType does lots of allocations we provide a way for the user to redirect it to a separate memory heap if desired.
-IMGUI_API void                      SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data = nullptr);
-
-// Display UI to edit ImFontAtlas::FontLoaderFlags (shared) or ImFontConfig::FontLoaderFlags (single source)
-IMGUI_API bool                      DebugEditFontLoaderFlags(ImGuiFreeTypeLoaderFlags* p_font_loader_flags);
-
-// Obsolete names (will be removed)
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-//IMGUI_API const ImFontBuilderIO* GetBuilderForFreeType(); // Renamed/changed in 1.92. Change 'io.Fonts->FontBuilderIO = ImGuiFreeType::GetBuilderForFreeType()' to 'io.Fonts->SetFontLoader(ImGuiFreeType::GetFontLoader())' if you need runtime selection.
-//static inline bool BuildFontAtlas(ImFontAtlas* atlas, unsigned int flags = 0) { atlas->FontBuilderIO = GetBuilderForFreeType(); atlas->FontLoaderFlags = flags; return atlas->Build(); } // Prefer using '#define IMGUI_ENABLE_FREETYPE'
-#endif
-}
-
-#endif // #ifndef IMGUI_DISABLE
@@ -31,7 +31,7 @@
 #endif
 #endif

-#if defined(_WIN32) && !defined(USE_LIBCDIO)   // libcdio has its equivalent version
+#ifdef _WIN32
 #undef fopen

 void *fopen_utf8(const char * filename, const char * mode)
@@ -1,149 +0,0 @@
-/* Copyright  (C) 2010-2020 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_path_io.c).
- * ---------------------------------------------------------------------------------------
- *
- * 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <sys/stat.h>
-
-#include <boolean.h>
-#include <file/file_path.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <retro_miscellaneous.h>
-#include <string/stdstring.h>
-#define VFS_FRONTEND
-#include <vfs/vfs_implementation.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h> /* stat() is defined here */
-#endif
-
-/* TODO/FIXME - globals */
-static retro_vfs_stat_t path_stat_cb   = retro_vfs_stat_impl;
-static retro_vfs_mkdir_t path_mkdir_cb = retro_vfs_mkdir_impl;
-
-void path_vfs_init(const struct retro_vfs_interface_info* vfs_info)
-{
-   const struct retro_vfs_interface* 
-      vfs_iface           = vfs_info->iface;
-
-   path_stat_cb           = retro_vfs_stat_impl;
-   path_mkdir_cb          = retro_vfs_mkdir_impl;
-
-   if (vfs_info->required_interface_version < PATH_REQUIRED_VFS_VERSION || !vfs_iface)
-      return;
-
-   path_stat_cb           = vfs_iface->stat;
-   path_mkdir_cb          = vfs_iface->mkdir;
-}
-
-int path_stat(const char *path)
-{
-   return path_stat_cb(path, NULL);
-}
-
-/**
- * path_is_directory:
- * @path               : path
- *
- * Checks if path is a directory.
- *
- * @return true if path is a directory, otherwise false.
- */
-bool path_is_directory(const char *path)
-{
-   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_DIRECTORY) != 0;
-}
-
-bool path_is_character_special(const char *path)
-{
-   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_CHARACTER_SPECIAL) != 0;
-}
-
-bool path_is_valid(const char *path)
-{
-   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_VALID) != 0;
-}
-
-int32_t path_get_size(const char *path)
-{
-   int32_t filesize = 0;
-   if (path_stat_cb(path, &filesize) != 0)
-      return filesize;
-
-   return -1;
-}
-
-/**
- * path_mkdir:
- * @dir                : directory
- *
- * Create directory on filesystem.
- * 
- * Recursive function.
- *
- * @return true if directory could be created, otherwise false.
- **/
-bool path_mkdir(const char *dir)
-{
-   bool norecurse     = false;
-   char     *basedir  = NULL;
-
-   if (!(dir && *dir))
-      return false;
-
-   /* Use heap. Real chance of stack 
-    * overflow if we recurse too hard. */
-   if (!(basedir = strdup(dir)))
-      return false;
-
-   path_parent_dir(basedir, strlen(basedir));
-
-   if (!*basedir || !strcmp(basedir, dir))
-   {
-      free(basedir);
-      return false;
-   }
-
-   if (     path_is_directory(basedir)
-         || path_mkdir(basedir))
-      norecurse = true;
-
-   free(basedir);
-
-   if (norecurse)
-   {
-      int ret = path_mkdir_cb(dir);
-
-      /* Don't treat this as an error. */
-      if (ret == -2 && path_is_directory(dir))
-         return true;
-      else if (ret == 0)
-         return true;
-   }
-   return false;
-}
@@ -3008,10 +3008,7 @@ static bool glsm_state_ctx_init(glsm_ctx_params_t *params)
      return false;

 #ifdef HAVE_OPENGLES
-   hw_render.context_type       = params->context_type != RETRO_HW_CONTEXT_NONE
-         ? params->context_type : RETRO_HW_CONTEXT_OPENGLES2;
-   hw_render.version_major      = params->major;
-   hw_render.version_minor      = params->minor;
+   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGLES2;
 #else
   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGL;
   if (params->context_type != RETRO_HW_CONTEXT_NONE)