Histogram zooming prototype.

2026-09-15 14:54:23 +00:00 · 2018-09-03 23:18:26 +02:00
667 changed files with 94795 additions and 415332 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -0,0 +1,19 @@
+version: '{build}'
+platform:
+  - x64
+image:
+  - Visual Studio 2017
+  - Ubuntu
+before_build:
+  - cmd: cd profiler\build\win32
+  - cmd: nuget restore
+  - cmd: cd ..\..\..
+build_script:
+  - cmd: msbuild .\update\build\win32\update.vcxproj
+  - cmd: msbuild .\profiler\build\win32\Tracy.vcxproj
+  - cmd: msbuild .\capture\build\win32\capture.vcxproj
+  - sh: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk2.0-dev
+  - sh: make -C update/build/unix debug release
+  - sh: make -C profiler/build/unix debug release
+  - sh: make -C capture/build/unix debug release
+test: off
--- a/.clang-format
+++ b/.clang-format
@@ -1,35 +0,0 @@
-# Empirical format config, based on observed style guide
-# Use this only as an help to fit the surrounding code style - don't reformat whole files at once
---
-BasedOnStyle: Microsoft
-AllowShortIfStatementsOnASingleLine: AllIfsAndElse
-AllowShortLoopsOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: All
-# AllowShortEnumsOnASingleLine: true # Broken for some reason, even in last versions of clang-format... So don't use it or it may change formating in the future.
-AllowShortLambdasOnASingleLine: All
-BreakConstructorInitializers: BeforeComma
-BreakStringLiterals: false
-SpaceAfterTemplateKeyword: false
-AlwaysBreakTemplateDeclarations: Yes
-# Allman seems to break lambda formatting for some reason with `ColumnLimit: 0`. See https://github.com/llvm/llvm-project/issues/50275
-# Even though it is supposed to have been fixed, issue still remains in 20.1.8. (and is very much present in 18.x which is the one shipped by VS2022 and VSCord clangd as of 2025-07-27)
-# Things work fine with `BasedOnStyle: Microsoft` so use that instead
-#BreakBeforeBraces: Allman 
-ColumnLimit: 0
-# We'd like to use LeftWithLastLine but it's only available in >=19.x
-#AlignEscapedNewlines: LeftWithLastLine
-AlignEscapedNewlines: Left
-FixNamespaceComments: false
-IndentPPDirectives: AfterHash
-IndentAccessModifiers: false
-AccessModifierOffset: -4
-LambdaBodyIndentation: OuterScope
-PPIndentWidth: 2
-IndentWidth: 4
-PointerAlignment: Left
-SpaceBeforeParens: Never
-SpacesInParentheses: true
-TabWidth: 4
-AlignTrailingComments:
-  Kind: Leave
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,66 +0,0 @@
---
-Checks:
-'
-	clang-diagnostic-*,
-	clang-analyzer-*,
-	bugprone-*,
-	google-*,
-	misc-*,
-	modernize-*,
-	performance-*,
-	readability-*,
-	-bugprone-easily-swappable-parameters,
-	-bugprone-implicit-widening-of-multiplication-result,
-	-bugprone-narrowing-conversions,
-	-bugprone-reserved-identifier,
-	-google-readability-braces-around-statements,
-	-google-readability-casting,
-	-google-readability-function-size,
-	-google-readability-todo,
-	-google-readability-namespace-comments,
-	-misc-confusable-identifiers,
-	-misc-no-recursion,
-	-misc-use-anonymous-namespace,
-	-misc-use-internal-linkage,
-	-modernize-avoid-c-arrays,
-	-modernize-deprecated-headers,
-	-modernize-use-default-member-init,
-	-modernize-use-designated-initializers,
-	-modernize-use-trailing-return-type,
-	-performance-no-int-to-ptr,
-	-readability-braces-around-statements,
-	-readability-else-after-return,
-	-readability-function-cognitive-complexity,
-	-readability-function-size,
-	-readability-identifier-length,
-	-readability-implicit-bool-conversion,
-	-readability-isolate-declaration,
-	-readability-magic-numbers,
-	-readability-math-missing-parentheses,
-	-readability-qualified-auto,
-	-readability-uppercase-literal-suffix
-'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-FormatStyle:     none
-CheckOptions:
-  llvm-else-after-return.WarnOnConditionVariables: 'false'
-  modernize-loop-convert.MinConfidence: reasonable
-  modernize-replace-auto-ptr.IncludeStyle: llvm
-  modernize-pass-by-value.IncludeStyle: llvm
-  google-readability-namespace-comments.ShortNamespaceLines: '10'
-  google-readability-namespace-comments.SpacesBeforeComments: '2'
-  cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: 'true'
-  google-readability-braces-around-statements.ShortStatementLines: '1'
-  cert-err33-c.CheckedFunctions: '::aligned_alloc;::asctime_s;::at_quick_exit;::atexit;::bsearch;::bsearch_s;::btowc;::c16rtomb;::c32rtomb;::calloc;::clock;::cnd_broadcast;::cnd_init;::cnd_signal;::cnd_timedwait;::cnd_wait;::ctime_s;::fclose;::fflush;::fgetc;::fgetpos;::fgets;::fgetwc;::fopen;::fopen_s;::fprintf;::fprintf_s;::fputc;::fputs;::fputwc;::fputws;::fread;::freopen;::freopen_s;::fscanf;::fscanf_s;::fseek;::fsetpos;::ftell;::fwprintf;::fwprintf_s;::fwrite;::fwscanf;::fwscanf_s;::getc;::getchar;::getenv;::getenv_s;::gets_s;::getwc;::getwchar;::gmtime;::gmtime_s;::localtime;::localtime_s;::malloc;::mbrtoc16;::mbrtoc32;::mbsrtowcs;::mbsrtowcs_s;::mbstowcs;::mbstowcs_s;::memchr;::mktime;::mtx_init;::mtx_lock;::mtx_timedlock;::mtx_trylock;::mtx_unlock;::printf_s;::putc;::putwc;::raise;::realloc;::remove;::rename;::scanf;::scanf_s;::setlocale;::setvbuf;::signal;::snprintf;::snprintf_s;::sprintf;::sprintf_s;::sscanf;::sscanf_s;::strchr;::strerror_s;::strftime;::strpbrk;::strrchr;::strstr;::strtod;::strtof;::strtoimax;::strtok;::strtok_s;::strtol;::strtold;::strtoll;::strtoul;::strtoull;::strtoumax;::strxfrm;::swprintf;::swprintf_s;::swscanf;::swscanf_s;::thrd_create;::thrd_detach;::thrd_join;::thrd_sleep;::time;::timespec_get;::tmpfile;::tmpfile_s;::tmpnam;::tmpnam_s;::tss_create;::tss_get;::tss_set;::ungetc;::ungetwc;::vfprintf;::vfprintf_s;::vfscanf;::vfscanf_s;::vfwprintf;::vfwprintf_s;::vfwscanf;::vfwscanf_s;::vprintf_s;::vscanf;::vscanf_s;::vsnprintf;::vsnprintf_s;::vsprintf;::vsprintf_s;::vsscanf;::vsscanf_s;::vswprintf;::vswprintf_s;::vswscanf;::vswscanf_s;::vwprintf_s;::vwscanf;::vwscanf_s;::wcrtomb;::wcschr;::wcsftime;::wcspbrk;::wcsrchr;::wcsrtombs;::wcsrtombs_s;::wcsstr;::wcstod;::wcstof;::wcstoimax;::wcstok;::wcstok_s;::wcstol;::wcstold;::wcstoll;::wcstombs;::wcstombs_s;::wcstoul;::wcstoull;::wcstoumax;::wcsxfrm;::wctob;::wctrans;::wctype;::wmemchr;::wprintf_s;::wscanf;::wscanf_s;'
-  modernize-loop-convert.MaxCopySize: '16'
-  cert-dcl16-c.NewSuffixes: 'L;LL;LU;LLU'
-  cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField: 'false'
-  cert-str34-c.DiagnoseSignedUnsignedCharComparisons: 'false'
-  modernize-use-nullptr.NullMacros: 'NULL'
-  llvm-qualified-auto.AddConstToQualified: 'false'
-  modernize-loop-convert.NamingStyle: CamelCase
-  llvm-else-after-return.WarnOnUnfixable: 'false'
-  google-readability-function-size.StatementThreshold: '800'
-...
-
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-github: wolfpld
--- a/.github/actions/test-tracy/action.yml
+++ b/.github/actions/test-tracy/action.yml
@@ -1,35 +0,0 @@
-name: 'Test Tracy'
-description: 'Build the Tracy test application with various cmake flag combinations'
-
-inputs:
-  extra_cmake_flags:
-    description: 'Additional cmake flags appended to each configure command (e.g. cross-compilation flags)'
-    required: false
-    default: ''
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Test application
-      shell: bash
-      run: |
-        # test compilation with different flags
-        # we clean the build folder to reset cached variables between runs
-        cmake -B tests/tracy/build -S tests/tracy -DCMAKE_BUILD_TYPE=Release ${{ inputs.extra_cmake_flags }}
-        cmake --build tests/tracy/build --parallel
-        cmake -E rm -rf tests/tracy/build
-
-        # same with TRACY_ON_DEMAND
-        cmake -B tests/tracy/build -S tests/tracy -DCMAKE_BUILD_TYPE=Release -DTRACY_ON_DEMAND=ON ${{ inputs.extra_cmake_flags }}
-        cmake --build tests/tracy/build --parallel
-        cmake -E rm -rf tests/tracy/build
-
-        # same with TRACY_MANUAL_LIFETIME
-        cmake -B tests/tracy/build -S tests/tracy -DCMAKE_BUILD_TYPE=Release -DTRACY_MANUAL_LIFETIME=ON ${{ inputs.extra_cmake_flags }}
-        cmake --build tests/tracy/build --parallel
-        cmake -E rm -rf tests/tracy/build
-
-        # same with TRACY_DEMANGLE
-        cmake -B tests/tracy/build -S tests/tracy -DCMAKE_BUILD_TYPE=Release -DTRACY_DEMANGLE=ON ${{ inputs.extra_cmake_flags }}
-        cmake --build tests/tracy/build --parallel
-        cmake -E rm -rf tests/tracy/build
--- a/.github/sponsor.png
+++ b/.github/sponsor.png
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,49 +0,0 @@
-name: android
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: android-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-
-jobs:
-  build-android:
-    runs-on: ubuntu-latest
-    container: archlinux:base-devel
-    steps:
-    - name: Install dependencies
-      run: pacman -Syu --noconfirm && pacman -S --noconfirm --needed cmake git ninja nodejs unzip
-    - name: Setup NDK
-      uses: nttld/setup-ndk@v1
-      id: setup-ndk
-      with:
-        ndk-version: r29
-    - run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Library v7
-      run: |
-        cmake -B build-v7 -DCMAKE_BUILD_TYPE=Release -DTRACY_ENABLE=ON -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a
-        cmake --build build-v7
-    - name: Library v8
-      run: |
-        cmake -B build-v8 -DCMAKE_BUILD_TYPE=Release -DTRACY_ENABLE=ON -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a
-        cmake --build build-v8
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -1,61 +0,0 @@
-name: appimage
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  workflow_call:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: appimage-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-  PANDOC_CACHE_DIR: ${{ github.workspace }}/pandoc-cache
-
-jobs:
-  build-appimage:
-    runs-on: ubuntu-latest
-    container: ubuntu:24.04
-    steps:
-    - name: Install dependencies
-      run: |
-        apt-get update
-        DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-          build-essential cmake ninja-build meson pkg-config git ca-certificates \
-          curl file desktop-file-utils nodejs patchelf \
-          libegl-dev libxkbcommon-dev libdbus-1-dev libssl-dev \
-          libffi-dev libexpat1-dev wayland-protocols
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Cache pandoc
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.PANDOC_CACHE_DIR }}
-        key: ${{ runner.os }}-pandoc-${{ hashFiles('cmake/manual.cmake') }}
-    - name: Cache wayland
-      uses: actions/cache@v4
-      with:
-        path: profiler/build-appimage/wayland
-        key: ${{ runner.os }}-wayland-${{ hashFiles('profiler/appimage/build.sh') }}
-    - name: Build AppImage
-      run: profiler/appimage/build.sh
-      env:
-        GIT_REV: ${{ github.sha }}
-    - uses: actions/upload-artifact@v4
-      with:
-        name: appimage
-        path: profiler/build-appimage/tracy-profiler-x86_64.AppImage
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -1,83 +0,0 @@
-name: emscripten
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: emscripten-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-  PANDOC_CACHE_DIR: ${{ github.workspace }}/pandoc-cache
-
-jobs:
-  build-emscripten:
-    runs-on: ubuntu-latest
-    container: archlinux:base-devel
-    steps:
-    - name: Install dependencies
-      run: pacman -Syu --noconfirm && pacman -S --noconfirm --needed cmake git unzip python ninja zstd nodejs
-    - name: Setup emscripten
-      uses: emscripten-core/setup-emsdk@v16
-      with:
-        version: 6.0.9
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Cache pandoc
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.PANDOC_CACHE_DIR }}
-        key: ${{ runner.os }}-pandoc-${{ hashFiles('cmake/manual.cmake') }}
-    - name: Profiler GUI
-      run: |
-        cmake -G Ninja -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=MinSizeRel -DGIT_REV=${{ github.sha }} -DCMAKE_TOOLCHAIN_FILE=${{env.EMSDK}}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
-        cmake --build profiler/build --parallel
-    - name: Compress artifacts
-      run: |
-        zstd -18 profiler/build/tracy-profiler.js profiler/build/tracy-profiler.wasm
-        gzip -9 profiler/build/tracy-profiler.js profiler/build/tracy-profiler.wasm
-    - name: Find Artifacts
-      id: find_artifacts
-      run: |
-        mkdir -p bin
-        cp profiler/build/index.html bin
-        cp profiler/build/favicon.svg bin
-        cp profiler/build/embed.tracy bin
-        cp profiler/build/tracy-profiler.js.gz bin
-        cp profiler/build/tracy-profiler.js.zst bin
-        cp profiler/build/tracy-profiler.wasm.gz bin
-        cp profiler/build/tracy-profiler.wasm.zst bin
-    - uses: actions/upload-artifact@v4
-      with:
-        name: emscripten
-        path: bin
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build-emscripten
-    if: github.ref == 'refs/heads/master'
-    steps:
-    - uses: actions/download-artifact@v4
-    - uses: wlixcc/SFTP-Deploy-Action@v1.2.4
-      with:
-        username: ${{ secrets.USERNAME }}
-        server: ${{ secrets.SERVER }}
-        port: ${{ secrets.PORT }}
-        ssh_private_key: ${{ secrets.PRIVATE_KEY }}
-        local_path: './emscripten/*'
-        remote_path: ${{ secrets.REMOTE_PATH }}
-        sftp_only: true
--- a/.github/workflows/latex.yml
+++ b/.github/workflows/latex.yml
@@ -1,33 +0,0 @@
-name: Manual
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  workflow_call:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: latex-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-manual:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Compile LaTeX
-      uses: xu-cheng/latex-action@v3
-      with:
-        working_directory: manual
-        root_file: tracy.tex
-    - uses: actions/upload-artifact@v4
-      with:
-        name: manual
-        path: manual/tracy.pdf
--- a/.github/workflows/linux-cli.yml
+++ b/.github/workflows/linux-cli.yml
@@ -1,79 +0,0 @@
-name: linux-cli
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  workflow_call:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: linux-cli-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-
-jobs:
-  build-linux-cli:
-    runs-on: ubuntu-latest
-    container: ubuntu:24.04
-    steps:
-    - name: Install dependencies
-      run: |
-        apt-get update
-        DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-          build-essential cmake git ca-certificates curl nodejs
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Build update
-      run: |
-        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build update/build --parallel
-    - name: Build capture
-      run: |
-        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build capture/build --parallel
-    - name: Build csvexport
-      run: |
-        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build csvexport/build --parallel
-    - name: Build import
-      run: |
-        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build import/build --parallel
-    - name: Build merge
-      run: |
-        cmake -B merge/build -S merge -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build merge/build --parallel
-    - name: Build monitor
-      run: |
-        cmake -B monitor/build -S monitor -DCMAKE_BUILD_TYPE=Release -DNO_ISA_EXTENSIONS=ON -DGIT_REV=${{ github.sha }}
-        cmake --build monitor/build --parallel
-    - name: Stage release files
-      run: |
-        mkdir -p linux-cli
-        cp update/build/tracy-update linux-cli/
-        cp capture/build/tracy-capture linux-cli/
-        cp capture/build/tracy-capture-daemon linux-cli/
-        cp csvexport/build/tracy-csvexport linux-cli/
-        cp import/build/tracy-import-chrome linux-cli/
-        cp import/build/tracy-import-fuchsia linux-cli/
-        cp merge/build/tracy-merge linux-cli/
-        cp monitor/build/tracy-monitor linux-cli/
-        strip linux-cli/tracy-*
-    - uses: actions/upload-artifact@v4
-      with:
-        name: linux-cli
-        path: linux-cli
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,114 +0,0 @@
-name: linux
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: linux-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-  PANDOC_CACHE_DIR: ${{ github.workspace }}/pandoc-cache
-
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    container: archlinux:base-devel
-    steps:
-    - name: Install dependencies
-      run: pacman -Syu --noconfirm && pacman -S --noconfirm --needed freetype2 debuginfod wayland dbus libxkbcommon libglvnd meson cmake git wayland-protocols nodejs lua clang sdl3_image python-jinja
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Cache pandoc
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.PANDOC_CACHE_DIR }}
-        key: ${{ runner.os }}-pandoc-${{ hashFiles('cmake/manual.cmake') }}
-    - name: Determine build parallelism
-      run: |
-        if [ "${ACT:-}" != "true" ] && [ "${FORGEJO_ACTIONS:-}" != "true" ]; then
-          echo "CMAKE_PARALLEL=--parallel 2" >> "$GITHUB_ENV"
-        else
-          echo "CMAKE_PARALLEL=--parallel" >> "$GITHUB_ENV"
-        fi
-    - name: Dyna example / clang
-      run: |
-        CC=clang CXX=clang++ cmake -B examples/dyna/build-clang -S examples/dyna -DCMAKE_BUILD_TYPE=Release
-        cmake --build examples/dyna/build-clang $CMAKE_PARALLEL
-    - name: Dyna example / gcc
-      run: |
-        CC=gcc CXX=g++ cmake -B examples/dyna/build-gcc -S examples/dyna -DCMAKE_BUILD_TYPE=Release
-        cmake --build examples/dyna/build-gcc $CMAKE_PARALLEL
-    - name: Profiler GUI
-      run: |
-        cmake -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build profiler/build $CMAKE_PARALLEL
-    - name: Update utility
-      run: |
-        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build update/build $CMAKE_PARALLEL
-    - name: Capture utility
-      run: |
-        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build capture/build $CMAKE_PARALLEL
-    - name: Csvexport utility
-      run: |
-        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build csvexport/build $CMAKE_PARALLEL
-    - name: Import utilities
-      run: |
-        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build import/build $CMAKE_PARALLEL
-    - name: Merge utility
-      run: |
-        cmake -B merge/build -S merge -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build merge/build $CMAKE_PARALLEL
-    - name: Monitor utility
-      run: |
-        cmake -B monitor/build -S monitor -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build monitor/build $CMAKE_PARALLEL
-    - name: Library (cmake)
-      run: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DTRACY_ENABLE=ON
-        cmake --build build $CMAKE_PARALLEL
-      env:
-        CMAKE_INSTALL_PREFIX: ${{ github.workspace }}/bin
-    - name: Library (meson)
-      run: |
-        meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib -Dtracy_enable=true build-meson
-        meson compile -C build-meson
-    - name: Test application
-      uses: ./.github/actions/test-tracy
-    - name: Find Artifacts
-      id: find_artifacts
-      run: |
-        mkdir -p bin
-        cp profiler/build/tracy-profiler bin
-        cp update/build/tracy-update bin
-        cp capture/build/tracy-capture bin
-        cp capture/build/tracy-capture-daemon bin
-        cp csvexport/build/tracy-csvexport bin
-        cp import/build/tracy-import-chrome bin
-        cp import/build/tracy-import-fuchsia bin
-        cp merge/build/tracy-merge bin
-        cp monitor/build/tracy-monitor bin
-        strip bin/tracy-*
-    - uses: actions/upload-artifact@v4
-      with:
-        name: arch-linux
-        path: bin
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,86 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  workflow_call:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: macos-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-  PANDOC_CACHE_DIR: ${{ github.workspace }}/pandoc-cache
-
-jobs:
-  build-macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Cache pandoc
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.PANDOC_CACHE_DIR }}
-        key: ${{ runner.os }}-pandoc-${{ hashFiles('cmake/manual.cmake') }}
-    - name: Install dependencies
-      run: brew install pkg-config meson
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - name: Build library
-      run: meson setup -Dtracy_enable=true build && meson compile -C build
-    - name: Test application
-      uses: ./.github/actions/test-tracy
-    - name: Build profiler
-      run: |
-        cmake -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=Release -DBUNDLE=ON -DGIT_REV=${{ github.sha }}
-        cmake --build profiler/build --parallel 2 --config Release
-    - name: Build update
-      run: |
-        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build update/build --parallel --config Release
-    - name: Build capture
-      run: |
-        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build capture/build --parallel --config Release
-    - name: Build csvexport
-      run: |
-        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build csvexport/build --parallel --config Release
-    - name: Build import
-      run: |
-        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build import/build --parallel --config Release
-    - name: Build merge
-      run: |
-        cmake -B merge/build -S merge -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build merge/build --parallel --config Release
-    - name: Package artifacts
-      run: |
-        mkdir -p bin
-        cp -r profiler/build/tracy-profiler.app bin
-        cp update/build/tracy-update bin
-        cp capture/build/tracy-capture bin
-        cp capture/build/tracy-capture-daemon bin
-        cp csvexport/build/tracy-csvexport bin
-        cp import/build/tracy-import-chrome bin
-        cp import/build/tracy-import-fuchsia bin
-        cp merge/build/tracy-merge bin
-        strip bin/tracy-profiler.app/Contents/MacOS/tracy-profiler
-        strip bin/tracy-update bin/tracy-capture bin/tracy-capture-daemon bin/tracy-csvexport bin/tracy-import-chrome bin/tracy-import-fuchsia bin/tracy-merge
-    - uses: actions/upload-artifact@v4
-      with:
-        name: macos
-        path: bin
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -1,68 +0,0 @@
-name: build-mingw
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: mingw-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-
-jobs:
-  build-mingw:
-    runs-on: ubuntu-latest
-    container: archlinux:base-devel
-    steps:
-    - name: Install dependencies
-      run: |
-        pacman -Syu --noconfirm
-        pacman -S --noconfirm --needed mingw-w64-gcc cmake git nodejs meson
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Build TracyClient
-      run: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DTRACY_ENABLE=ON \
-          -DCMAKE_SYSTEM_NAME=Windows \
-          -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
-          -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++
-        cmake --build build
-    - name: Library (meson)
-      run: |
-        cat > mingw-cross.txt << 'EOF'
-        [binaries]
-        c = '/usr/bin/x86_64-w64-mingw32-gcc'
-        cpp = '/usr/bin/x86_64-w64-mingw32-g++'
-        ar = '/usr/bin/x86_64-w64-mingw32-ar'
-        strip = '/usr/bin/x86_64-w64-mingw32-strip'
-
-        [host_machine]
-        system = 'windows'
-        cpu_family = 'x86_64'
-        cpu = 'x86_64'
-        endian = 'little'
-        EOF
-        meson setup build-meson --cross-file mingw-cross.txt -Ddefault_library=static -Dtracy_enable=true
-        meson compile -C build-meson
-    - name: Test application
-      uses: ./.github/actions/test-tracy
-      with:
-        extra_cmake_flags: >-
-          -DCMAKE_SYSTEM_NAME=Windows
-          -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
-          -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,65 +0,0 @@
-name: release
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: release-${{ github.event.release.tag_name }}
-  cancel-in-progress: false
-
-jobs:
-  release-build-windows:
-    uses: ./.github/workflows/windows.yml
-
-  release-build-macos:
-    uses: ./.github/workflows/macos.yml
-
-  release-build-manual:
-    uses: ./.github/workflows/latex.yml
-
-  release-build-appimage:
-    uses: ./.github/workflows/appimage.yml
-
-  release-build-linux-cli:
-    uses: ./.github/workflows/linux-cli.yml
-
-  attach-to-release:
-    needs: [release-build-windows, release-build-macos, release-build-manual, release-build-appimage, release-build-linux-cli]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/download-artifact@v4
-    - name: Create versioned Windows zip
-      run: |
-        VERSION="${{ github.event.release.tag_name }}"
-        VERSION_NO_V="${VERSION#v}"
-        cd windows
-        zip -r ../windows-$VERSION_NO_V.zip .
-    - name: Create versioned macOS zip
-      run: |
-        VERSION="${{ github.event.release.tag_name }}"
-        VERSION_NO_V="${VERSION#v}"
-        cd macos
-        chmod +x tracy-* tracy-profiler.app/Contents/MacOS/*
-        zip -r ../macos-$VERSION_NO_V.zip .
-    - name: Create versioned Linux zip
-      run: |
-        VERSION="${{ github.event.release.tag_name }}"
-        VERSION_NO_V="${VERSION#v}"
-        mkdir linux
-        cp appimage/* linux/
-        cp linux-cli/* linux/
-        cd linux
-        zip -r ../linux-$VERSION_NO_V.zip .
-    - uses: softprops/action-gh-release@v2
-      with:
-        files: |
-          windows-*.zip
-          macos-*.zip
-          linux-*.zip
-          manual/tracy.pdf
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,93 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  workflow_call:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: windows-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
-  PANDOC_CACHE_DIR: ${{ github.workspace }}/pandoc-cache
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Cache CPM packages
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CPM_SOURCE_CACHE }}
-        key: ${{ runner.os }}-cpm-${{ hashFiles('**/vendor.cmake', '**/CMakeLists.txt') }}
-        restore-keys: ${{ runner.os }}-cpm-
-    - name: Cache pandoc
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.PANDOC_CACHE_DIR }}
-        key: ${{ runner.os }}-pandoc-${{ hashFiles('cmake/manual.cmake') }}
-    - uses: microsoft/setup-msbuild@v2
-    - name: Trust git repo
-      run: git config --global --add safe.directory '*'
-    - name: Install meson
-      run: python -m pip install --upgrade meson
-    - name: Library (meson)
-      env:
-        CCACHE_DISABLE: '1'
-      run: |
-        $vs = & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-        foreach ($line in & cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" x64 && set") {
-          if ($line -match '^([^=]+)=(.*)$') { [Environment]::SetEnvironmentVariable($matches[1], $matches[2], 'Process') }
-        }
-        meson setup -Dtracy_enable=true build-meson
-        meson compile -C build-meson
-    - name: Test application
-      uses: ./.github/actions/test-tracy
-    - name: Build profiler
-      run: |
-        cmake -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build profiler/build --parallel 2 --config Release
-    - name: Build update
-      run: |
-        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build update/build --parallel --config Release
-    - name: Build capture
-      run: |
-        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build capture/build --parallel --config Release
-    - name: Build csvexport
-      run: |
-        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build csvexport/build --parallel --config Release
-    - name: Build import
-      run: |
-        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build import/build --parallel --config Release
-    - name: Build merge
-      run: |
-        cmake -B merge/build -S merge -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
-        cmake --build merge/build --parallel --config Release
-    - name: Package artifacts
-      run: |
-        mkdir bin
-        copy profiler\build\Release\tracy-profiler.exe bin
-        copy update\build\Release\tracy-update.exe bin
-        copy capture\build\Release\tracy-capture.exe bin
-        copy capture\build\Release\tracy-capture-daemon.exe bin
-        copy csvexport\build\Release\tracy-csvexport.exe bin
-        copy import\build\Release\tracy-import-chrome.exe bin
-        copy import\build\Release\tracy-import-fuchsia.exe bin
-        copy merge\build\Release\tracy-merge.exe bin
-    - uses: actions/upload-artifact@v4
-      with:
-        name: windows
-        path: bin
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,21 @@
 .vs
-_build
-_compiler
+*.opendb
+*.db
+*.vcxproj.user
+x64
+Release
+Debug
 *.d
 *.o
-*.so
 *.swp
-*.obj
 imgui.ini
-manual/t*.aux
-manual/t*.log
-manual/t*.out
-manual/t*.pdf
-manual/t*.synctex.gz
-manual/t*.toc
-manual/t*.bbl
-manual/t*.blg
-manual/t*.fdb_latexmk
-manual/t*.fls
-manual/tracy.md
-profiler/build-appimage
-.deps/
-.dirstamp
-/_*/**
-/**/__pycache__/**
-extra/tracy-build
-.cache
-.uv-cache/
-.venv/
-compile_commands.json
-examples/ToyPathTracer/Windows/TestCpu
-examples/ToyPathTracer/Windows/x64
-*.user
+test/tracy_test
+test/tracy_test.exe
+*/build/unix/*-*
+manual/tracy.aux
+manual/tracy.log
+manual/tracy.out
+manual/tracy.pdf
+manual/tracy.synctex.gz
+manual/tracy.toc
+profiler/build/win32/packages
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +0,0 @@
-<wolf@nereid.pl> <wolf.pld@gmail.com>
-<wolf@nereid.pl> <bartosz.taudul@game-lion.com>
--- a/.omp/AGENTS.md
+++ b/.omp/AGENTS.md
@@ -1,28 +0,0 @@
-# Working rules
-
-## Permissions and scope
-
- Answer questions; execute state changes only when explicitly instructed. Anything that changes state (files, git history, services, external systems) requires an explicit instruction in the current conversation. Never infer permission from context, momentum, or a previously similar instruction.
- Do exactly what was named. If you discover the same defect in a sibling, report it — do not fix it.
-
-## Code
-
- Follow the style conventions already present in the repository — observe the files you touch and their related ones (siblings in the same layer, neighbors with the same role) before writing, and deviate only when told.
- Comments carry only what is not inferable from the code and is not already stated in the commit message, e.g. contracts, platform divergences. No narration of what the code does.
- Do not follow architectural precedent merely because it exists. Follow it when it is valid; when it is invalid — copy-pasted logic, a wrong home for shared code, a workaround that outlived its reason — propose the improvement instead.
- Do not assume a library behaves identically across platforms and standard-library implementations; verify behavior on the toolchains the code actually ships with.
-
-## Verification
-
- Prove behavior, not just compilation: build the affected targets and run the changed path, including the failure paths. Label compile-only claims as such.
- Test non-trivial new logic before committing it; the first run of new code is where environment and API assumptions break.
- State verification limits explicitly (what could not be exercised, and why).
-
-## Commits
-
- Subject: one line, imperative, capitalized, ends with a period — like `Bump LZ4 to 1.10.0.`, `Use the system wayland-protocols package.`.
- Body: only genuine rationale, mechanism, or constraints; skip it when the change is self-evident from the diff. Never recap decision processes or alternatives considered.
- One logical change per commit. Never bundle unrelated edits.
- The rationale, mechanism, non-obvious constraints — belong in the commit message, not in code comments.
- Explain a pattern once, at its first occurrence; repeat occurrences at other sites state only what they do.
- No process narration ("this commit", "as discussed"), no references to the conversation.
--- a/.omp/skills/tracy-gui-verify/SKILL.md
+++ b/.omp/skills/tracy-gui-verify/SKILL.md
@@ -1,329 +0,0 @@
---
-name: tracy-gui-verify
-description: Build and drive the Tracy Profiler GUI headlessly via two routes: the emscripten (web) GUI in a headless browser with an instrumented harness, or the native GUI under X11. Use when developing or testing the profiler GUI.
---
-
-# Test the Tracy GUI headlessly
-
-Two routes run the profiler GUI on a display-less machine. Pick one per test goal:
-
-| | Route A — Web (emscripten) | Route B — Native (X11) |
-|---|---|---|
-|Display|Browser; no X11/Wayland/DISPLAY — the browser is the display server|Xvfb (virtual X server) + openbox (window manager)|
-|Input|Puppeteer mouse/keyboard|xdotool mouse/keyboard|
-|Ground truth|Instrumented harness (`debug_snapshot`/`debug_clear`) — app-side mouse/ID state|Screenshot diffs (PIL `ImageChops`) — no harness|
-|Can test|Loaded-trace GUI: toolbar, panels, targeting, DPI scaling|Live TCP connection to a client, native file dialogs (save/open), X11/GLFW input|
-|Cannot test|Live client (browser cannot open a TCP server), native file dialogs|No known GUI-level gap; verification precision is lower (no hit-test oracle)|
-|Prereqs|emsdk (`$EMSDK_DIR`, default `~/emsdk`), CPM cache|Xvfb, openbox, xdotool, ImageMagick (`import`), mesa swrast|
-
-# Route A — Web GUI (emscripten, headless browser)
-
-Build the emscripten profiler GUI into an instrumented temporary workspace, serve it, and drive it with the browser tool. The harness exports `debug_snapshot`/`debug_clear`, exposing the app-side mouse/ID state — the ground truth for targeting and verification, not screenshots.
-
-Constants marked M are workstation-dependent — re-verify them. Everything else is stable; do not re-derive it.
-
-## Setup
-
-```sh
-sh <this-skill-dir>/setup.sh            # workspace=/tmp/tracy-protocol
-# or: TRACY_WEB_WS=/elsewhere TRACY_WEB_REPO=<repo> sh setup.sh
-```
-
-`<this-skill-dir>` is the project-scoped `.omp/skills/tracy-gui-verify/` under the active project root — not a fixed home directory. If multiple copies exist (one per project that has used this skill), use the copy inside the repo being tested; `TRACY_WEB_REPO` controls which repo is copied into the workspace.
-
-The script does: fresh source copy (excludes `.git` and build dirs) → applies `harness.patch` (adds `debug_snapshot`/`debug_clear` exports + event/frame recording to the emscripten backend, in the COPY only) → configures → builds Release with the emsdk at `$EMSDK_DIR` (default `~/emsdk`) and the CPM cache at `~/.cache/cpm`.
-
-**Pitfall:** if the workspace is deleted while a `tracy-web` server is running, stop the hub process first — a stale server keeps the *deleted* cwd and silently returns empty responses while the port still accepts connections.
-
-**Pitfall:** a `tracy-web` that died in an earlier session leaves the daemon in `failed` state: `stop` only reports the old failure, and `start` keeps returning "Daemon tracy-web has unacknowledged completion notifications" while the port stays free. Drain the daemon with `hub op=logs name=tracy-web` (the log also shows the cause), then relaunch with `hub op=restart name=tracy-web` (retained spec). If the port is NOT free, a stale process owns it — often one serving an earlier (now-stale) build directory: the new `httpd.py` dies on the bind and your requests silently hit the old directory. Check `ss -tlnp | grep 8000` and kill the owner. After any start/restart, verify the server is actually serving: `curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8000/index.html` must return 200 — the daemon message is not proof of a server.
-
-**After editing the GUI in the repo:** copy the changed files into `$WS/src/` (same relative path), re-run `cmake --build $WS/build -j$(nproc)`, reload the page. If a change touches `profiler/src/BackendEmscripten.cpp` or `profiler/CMakeLists.txt`, the harness patch may no longer apply — re-apply it manually (keep the `Dbg*` harness section, the `DbgPushEvent`/`DbgPushFrame` calls in the mouse callbacks + `NewFrame`, and the two `debug_*` exports in `-sEXPORTED_FUNCTIONS`).
-
-## Serve + open + ready
-
-Server (long-running → `hub`):
-
-```
-hub op=start name=tracy-web application=python3 args=["$WS/build/httpd.py"]
-    cwd=$WS/build ready={port:8000} persist=true
-```
-
-`httpd.py` sends the COOP/COEP headers required for pthreads/SharedArrayBuffer — use it, not a bare http.server.
-
-Browser:
-
-```
-browser open url=http://127.0.0.1:8000/index.html viewport={width:1600,height:900}
-```
-
-**Ready signal** (in a `run` cell; `run` code executes in Node scope — page JS goes through `tab.evaluate`):
-
-```js
-let title = null;
-for (let i = 0; i < 360; i++) {
-  title = await tab.evaluate(() => document.title);
-  if (/ - Tracy Profiler/.test(title)) break;
-  await new Promise(r => setTimeout(r, 250));
-}
-```
-
-Title is `Tracy Profiler X.Y.Z` until the preloaded `embed.tracy` (DarkRL capture) finishes loading, then `<trace> (embed.tracy) - Tracy Profiler X.Y.Z` (`profiler/src/main.cpp` `SetWindowTitleCallback`). Wait ~1.5 s after, then confirm the app loop lives: `snap().frames.at(-1).tick > 0`.
-
-## Harness API (ground truth)
-
-```js
-const snap  = () => tab.evaluate(() => JSON.parse(Module.ccall('debug_snapshot','string',[],[])));
-const clear = () => tab.evaluate(() => Module.ccall('debug_clear','void',[],[]));
-```
-
-`snap()` → `{ dpr, innerW, innerH, bufW, bufH, rectL, rectT, rectW, rectH, title, cursor, frames:[…64], events:[…64] }` (newest last).
-
- `frames[]`: one sample **per rAF tick, including idle ticks**. `tick` = main-loop count (always advances), `f` = `ImGui::GetFrameCount()` (advances only when a frame actually renders — the idle gate, §Idle), `mx/my` = app mouse position, `md[3]` = mouse button states, `q` = pending input events, `wa` = `tracy::s_wasActive` at tick start, `hi`/`ai` = ImGui `HoveredId`/`ActiveId`.
- `events[]`: raw callback data as the app received it. `type` 0=move 1=down 2=up 3=enter 4=leave 5=wheel; `tx/ty` = Emscripten int `targetX/Y`; `ax/ay` = position passed to ImGui (`-1` for non-move); `t` = DOMHighResTimeStamp.
-
-## Coordinate mapping
-
-```
-appX = floor( trunc(cssX - rectL) * dpr )     // device px, what ImGui hit-tests
-cssX = appX / dpr                              // inverse for targeting
-screenshot_px = cssX * dpr
-```
-
-Chain: DOM `clientX` → Emscripten `targetX = int(clientX - (rect.left|0))` (`src/lib/libhtml5.js`, `EmscriptenMouseEvent.targetX` is an `int`) → Tracy `AddMousePosEvent(targetX * dpr, …)` (`BackendEmscripten.cpp`) → ImGui `ImFloor` (`imgui.cpp` `AddMousePosEvent`). Canvas fills the viewport, so `rectL/rectT` are 0 (re-read anyway).
-
-**M: `dpr` on this workstation's headless browser is 1.25** (canvas buffer 2000×1125 for a 1600×900 viewport; screenshots are captured at device px). Never assume 1. App positions come in multiples of `dpr`; verify targeting within ±1 px via `frames[].mx/my`.
-
-## Click protocol
-
-Click = move, press, refresh through the hold, release, verify — all against rendered frames. The idle gate (§Idle) renders only 3 frames per wake, and a hold with no mouse events at all refreshes nothing, so a fixed-wait down/up from a cold idle can be swallowed (both events received, zero frames rendered) or released after the wake budget expires. Issuing mouse moves while the button is down keeps the budget alive: a same-coord re-move is delivered (verified: it reaches the canvas handler, wakes the app, and a same-coord hold click straddles cleanly) and is the safest refresh — zero hover drift; a ±`dx` px wiggle works too, but must stay inside the hit area:
-
-```js
-async function click(cssX, cssY, holdMs = 400) {
-  await page.mouse.move(cssX, cssY);          // 1. ALWAYS move first
-  await new Promise(r => setTimeout(r, 150)); // 2. >= 1 rendered frame
-  const pre = await snap();
-  const pf = pre.frames.at(-1);
-  await clear();
-  await page.mouse.down();                    // 3. press
-  let df = null, hiDuring = null;
-  const t0 = Date.now();
-  while (Date.now() - t0 < holdMs) {
-    await new Promise(r => setTimeout(r, 70));
-    await page.mouse.move(cssX, cssY);        // 4. same-coord re-move refreshes the wake budget
-    const f = (await snap()).frames.at(-1);
-    if (f.md[0] === 1) { df ??= f.f; hiDuring = f.hi; }
-  }
-  await page.mouse.up();                      // 5. release
-  let uf = null;
-  for (let i = 0; i < 40; i++) {
-    await new Promise(r => setTimeout(r, 40));
-    const f = (await snap()).frames.at(-1);
-    if (f.md[0] === 0) { uf = f.f; break; }
-  }
-  await new Promise(r => setTimeout(r, 400));
-  const s = await snap();
-  const d = s.dpr, ex = Math.floor(Math.trunc(cssX - s.rectL) * d), ey = Math.floor(Math.trunc(cssY - s.rectT) * d);
-  return { hoverID: pf.hi, hiDuring, appPos: [pf.mx, pf.my], expected: [ex, ey],
-           straddle: { df, uf },
-           ok: df !== null && uf !== null && uf > df && hiDuring === pf.hi &&
-               Math.abs(pf.mx - ex) <= 1 && Math.abs(pf.my - ey) <= 1 };
-}
-```
-
-Rules:
-
-1. **Move before every click.** The emscripten mousemove handler is the only thing that sets the app mouse position; mousedown/mouseup only queue button state. Fresh page position is invalid (`-FLT_MAX`) — a click without a prior move activates nothing.
-2. **Press and release must each render** in separate frames with the item hovered (ImGui's `PressedOnClickRelease` — doc table at `imgui_widgets.cpp:489-497`; input trickling, `ConfigInputTrickleEventQueue`, defers a same-frame release). The same-coord refresh is what guarantees rendered frames across the hold from a cold idle.
-3. **Verify every click:** `ok: true` (position landed, press and release each rendered, hover held — `hiDuring === hoverID`), plus a screenshot diff as supplementary visual confirmation. Non-ImGui targets (timeline zone bars) have `hi = 0` by design — for those verify by screenshot, not hover.
-4. **Double-click trap:** two same-position clicks <300 ms apart = double-click (`MouseDoubleClickTime = 0.3 s`) → zoom/thread-info actions fire. Wait ≥350 ms between repeated clicks at one spot.
-5. **Drag:** move → down → (move + wait 70 ms)×n → up. **Wheel:** `page.mouse.wheel({ deltaY: ±500 })` after positioning. **Keys:** `page.keyboard.type(..., { delay: 50 })` after focusing the input by click; `page.keyboard.press('Enter')`.
-6. **Danger:** toolbar device x 10–32 (css 8–26) = red power button (leftmost toolbar icon, hover ID 3313137574), closes the trace view (back to "Get started"). Never click it unless intended.
-
-## Idle and power saving
-
-`main.cpp DrawContents` keeps an `activeFrames = 3` budget refreshed on any input event (`tracy::s_wasActive`), a connected client, view animation, or a queued input; exhausted → `sleep 16 ms` with **no `ImGui::NewFrame` and no GL draw** (canvas keeps the last frame). Expect ~97 % of ticks to skip rendering while idle.
-
- Clicks from a cold idle land only via the click protocol's hold refresh (§Click protocol) — a fixed-wait down/up can be swallowed by the idle gate (both events received, zero frames rendered). **Before interacting, assert `tick`/`f` is advancing**; a stalled main loop (initial trace parse, hidden tab) renders nothing and drops everything. During the initial load the cursor style is `wait`.
- `focusLostLimit` (reduce render rate on focus loss) is desktop-only; it does not exist in the emscripten path.
- `canvas.style.cursor` is **not** a hover oracle: this ImGui build sets the Hand cursor only in `TextLink`, not on buttons.
-
-## Targeting
-
-Screenshots never resolve targeting. Full-page shots arrive downscaled JPEG (1024 px wide for a 2000-px device buffer; the factor varies), and `page.screenshot({ clip })` returns a PNG at device scale — a W×H CSS clip returns W·dpr × H·dpr px (CSS = clip offset + px/dpr). Icon buttons are 15–25 device px wide, so visual estimates carry ±20 px error, enough to hit the neighboring button or a gap. Target from the app's own hit-testing — sweep the row and click the run's center:
-
-```js
-async function sweepRow(dpr, cssY, devFrom, devTo, step = 4) {
-  const ranges = []; let cur = null;
-  for (let dev = devFrom; dev <= devTo; dev += step) {
-    await page.mouse.move(dev / dpr, cssY);
-    await new Promise(r => setTimeout(r, 50));
-    const s = await snap();
-    const hi = s.frames[s.frames.length - 1].hi;
-    if (cur && hi === cur.id) cur.end = dev;
-    else { if (cur) ranges.push(cur); cur = { id: hi, start: dev, end: dev }; }
-  }
-  ranges.push(cur);
-  return ranges.filter(r => r.id !== 0 && r.end - r.start >= 4);
-}
-```
-
- Same non-zero `hi` across consecutive steps = one widget; `hi = 0` = gap. Click the run's center: `click((r.start + r.end) / 2 / dpr, cssY)`.
- **Layout is state-dependent:** docked panels (Statistics, Flame, …) resize the main window and shift the toolbar — **re-sweep after any state change.**
- **Close popups before sweeping:** while a popup is open, hovers outside the popup can read `hi = 0` even over live widgets (verified with ZoomPopup over the toolbar). Clicking a % option in ZoomPopup does not close the popup — click an empty area first.
- Hover IDs are stable across sessions (label hashes) — the map below holds for the default state (fresh load, no panels, 1600×900, dpr 1.25).
- Zoomed region shots (for correlating IDs with icons): `page.screenshot({clip})` returns a Buffer — write it with Node `fs`, then `read` the file:
-
-```js
-const fs = require('fs');
-const buf = await page.screenshot({ clip: { x: 0, y: 0, width: 720, height: 28 } });
-fs.writeFileSync('/tmp/toolbar-zoom.png', buf);
-```
-
-### Toolbar map — default state (device px; css = device/1.25; row y css 15)
-
-| device x | hover ID | function |
-|---|---|---|
-| 10–32 | 3313137574 | ⏻ power (red, leftmost) — **closes the trace view (DANGER)** |
-| 44–68 | 608241489 | ⚙ Options gear — opens the Options window (clickable; do not confuse with the power button) |
-| 81–185 | 2246346107 | 💬 Messages panel toggle |
-| 199–259 | 3177774389 | 🔍 Find zone toggle (search input hover ID 3637961452, css ~x 100–440, y ~90) |
-| 271–367 | 1419322276 | 📊 Statistics toggle |
-| 383–451 | 322727105 | 🔥 Flame graph toggle |
-| 463–551 | 37993378 | 💾 Memory graph toggle |
-| 567–667 | 2133895361 | ⚖ Compare toggle |
-| 679–735 | 1808024465 | ⌗ Info (trace information) toggle |
-| 751–775 | 2535445525 | 🛠 wrench → ToolsPopup (Playback, CPU data, Annotations, Limits, Wait stacks, Frame statistics) |
-| 791–811 | 3101356487 | 📖 book → User manual toggle |
-| 827–851 | 2335673581 | 🔍+ → ZoomPopup (50–300 % user scale) |
-| 864–888 | 1263603982 | ◀ previous frame — focuses the timeline on the previous frame (view range shrinks to the frame's timespan) |
-| ~890–1010 | 0 | frame set name + count text ("Frames: N") — LMB jumps to a specified frame (custom hit-test, like timeline zones) |
-| 1012–1036 | 2142681495 | ▶ next frame — focuses the timeline on the next frame (verified: view range 25.82 s → 203.38 ms) |
-| 1052–1072 | 2961929287 | ▼ frame set selection (switch the active frame set) |
-
-Button names and functions are documented in the user manual's *Control menu* section (`manual/tracy.md`, generated into the profiler build directory by the build, e.g. `build/profiler/manual/tracy.md`). The web build omits *Connection* (live capture only) and *Tracy Assist* (desktop only).
-
-## User scale (DPI zoom)
-
-The 🔍+ button (hover ID 2335673581) — *Display scale* in the user manual — opens a ZoomPopup with 50–300 % steps.
-In the web build this scales the UI **layout only**: fonts, `Style::ScaleAllSizes`, and window sizes (`main.cpp SetupDPIScale`, `scale = devicePixelRatio × userScale`). The canvas buffer and the mouse→app mapping stay at `devicePixelRatio` (`BackendEmscripten.cpp`) — hit regions become physically larger in the same coordinate space, targeting precision is unchanged, and the standard click protocol works as-is.
-
-Use it when small buttons are hard to hit or details are hard to read in screenshots. At 200 % every toolbar hit region is roughly 2× (verified: power 16→40 px, gear 25→50 px, Messages 105→190 px wide; row height 24→46 device px). The layout **reflows completely** at any scale — re-sweep after changing it and after setting it back. `userScale` is session-only unless Options → "Save UI scale" is on; a fresh page load starts at 100 %.
-
-## Limitations
-
- A *connected* live-streaming client cannot be tested in the web build (the browser GUI cannot open a TCP server). The embedded-trace GUI is the live-app proxy: real trace data, full GUI — for live-client behavior use Route B.
- `embed.tracy` (10 MB) is downloaded from share.nereid.pl at configure time — network needed once per fresh workspace; the file then lives in `$WS/build`.
-
-## References
-
-Sources for the behavior the rules above encode — consult them when re-verifying a constant or when a rule fails:
-
- `profiler/src/BackendEmscripten.cpp` — emscripten input handlers, canvas/dpr sizing, cursor mapping.
- `profiler/src/main.cpp:540-574` — idle gate (`activeFrames` budget).
- `profiler/src/profiler/TracyMouse.cpp` — per-frame click state cache.
- `profiler/CMakeLists.txt:334-353` — emscripten link options.
- ImGui 1.92.9b (vendored copy in the CPM cache, `~/.cache/cpm/imgui/`): `imgui_widgets.cpp:483-545` (click semantics table), `imgui.cpp:11278-11403` (event trickling), `imgui.cpp:1736` (trickle default on), `imgui.cpp:1992-2016` (AddMousePosEvent floor/dedup).
- Emscripten 5.0.7: `src/lib/libhtml5.js` (`fillMouseEventData`, `targetX = e.clientX - (rect.left|0)` into HEAP32), `system/include/emscripten/html5.h` (`EmscriptenMouseEvent.targetX` is `int`; `EmscriptenWheelEvent` embeds a `mouse` sub-struct).
- Upstream: imgui issue #4921 (new input event API — events spread over multiple frames), PR #2525 (same-frame click/release), issue #1992 (rapid down/up "soft clicks" dropped).
-
-# Route B — Native GUI (X11, headless)
-
-Run the native (GLFW) GUI on a virtual X server for what Route A cannot test: a live TCP connection to a client, the native file dialogs (save/open flows), and X11 input semantics. Stack: Xvfb + openbox + xdotool + ImageMagick `import`. Constants marked M were verified on this workstation (1280x800 screen, openbox, profiler window client area at (1,20)); re-verify after any screen/WM change, and always confirm against a screenshot before clicking.
-
-## Build
-
-```sh
-cmake -S profiler -B /tmp/prof-x11 -DCMAKE_BUILD_TYPE=Release -DLEGACY=ON -DGTK_FILESELECTOR=ON
-cmake --build /tmp/prof-x11 --target tracy-profiler -j$(nproc)
-```
-
- `LEGACY=ON` selects the X11 (GLFW) backend; the Linux default is Wayland.
- `GTK_FILESELECTOR=ON` routes NFD through GTK. **Without it** the default Linux NFD uses the XDG desktop portal and fails headless with the notification "File selector is not available".
- Verify after building: `ldd /tmp/prof-x11/tracy-profiler | grep -c gtk` ≥ 1.
-
-## Services
-
-```
-hub op=start name=xvfb application=Xvfb args=[":99","-screen","0","1280x800x24"]
-```
-
-Ready when `/tmp/.X11-unix/X99` exists — check the socket. (If you add `-nolisten tcp` to the Xvfb args, a TCP port readiness check cannot work; the UNIX socket is then the only listener.) Then:
-
-```sh
-DISPLAY=:99 nohup openbox >/dev/null 2>&1 &
-```
-
-**openbox is required.** Without a window manager the window lands at an arbitrary position, `xdotool windowactivate` fails ("WM claims not to support _NET_ACTIVE_WINDOW"), and keyboard focus has no owner. Under openbox the profiler window is placed deterministically (M: (1,20), 1278x775 on a 1280x800 screen).
-
-## Run
-
-```sh
-DISPLAY=:99 LIBGL_ALWAYS_SOFTWARE=1 nohup /tmp/prof-x11/tracy-profiler >gui.log 2>&1 &
-```
-
- `LIBGL_ALWAYS_SOFTWARE=1` — no GPU; mesa swrast renders.
- Window: `DISPLAY=:99 xdotool search --name "Tracy Profiler"` → `getwindowgeometry` for the origin; `windowactivate --sync` to focus.
- Live test client: `tracy-monitor -p $(pgrep -n sleep)` style — attach to a long-lived process; the in-process client listens on 8086 and advertises via UDP (discovery works headless; the client line appears under "Discovered clients").
-
-## Interaction rules
-
-1. **Verify every click with a screenshot diff** — `import -window root` before and after, then PIL `ImageChops.difference(a, b).getbbox()`: no (or irrelevant) bbox = the click missed. Expect at least one swallowed click; re-issue it and re-verify.
-2. Move before click; sleep ≥0.3 s between two clicks at the same spot (ImGui double-click threshold is 0.3 s).
-3. Keyboard (`xdotool key`) is reliable once openbox owns focus.
-4. First launch only: an achievements prompt appears bottom-right — click "No" (M: 725,585). The choice persists in the Tracy config; later launches skip it.
-5. A stale "Client not ready / another server" notification means the client was replaced underneath the GUI — click **Reconnect** (M: 738,574); there is no automatic retry.
-
-## Coordinates (M: screen px, 1280x800, window at (1,20))
-
-|Target|Coords|
-|---|---|
-|Get started → Connect|101,227|
-|Get started → wrench (About panel)|317,120|
-|Connection popup → Save trace…|64,202|
-|Connection popup → Reconnect|738,574|
-|GTK save dialog → Save button|1195,773|
-|GTK overwrite confirmation → Replace|790,482|
-|Tracy save-confirmation → Save trace|757,540|
-
-Directly clicked and verified: Connect, Save trace…, GTK Save, Replace, and the save-confirmation button. Derived as the verified window-relative offset translated to the openbox window origin (confirm on first use): wrench, Reconnect, achievements "No".
-
-The Get-started panel, connection popup, and the two confirmation panels keep fixed offsets inside the profiler window; the GTK dialogs are separate top-level windows sized to the screen. Derive any missing coordinate from a screenshot rather than guessing.
-
-## Save flow (end-to-end)
-
-1. Start the client, click **Connect** (the GUI never auto-connects).
-2. The connection popup opens automatically on connect; click **Save trace…**.
-3. GTK dialog: the Name entry is focused and the last-used directory is preselected; `xdotool type --delay 30 <name>`; click **Save** (1195,773).
-4. Existing target file → a separate overwrite-confirmation window appears; click **Replace** (790,482).
-5. Tracy's own confirmation panel appears (shows the final `Path:`); click its **Save trace** (757,540).
-6. Verify the file (below).
-
-## File and connection checks
-
- Live connection: `ss -tnp | grep 8086` shows `ESTAB` between `tracy-profiler` and the client process; the window title becomes `<program> @ <date> - Tracy Profiler X.Y.Z`.
- Saved `.tracy`: first 4 bytes = `74 72 FD 50`; `tail -c +11 file | zstd -t` → `premature end` means the frame decodes fully (expected — the cut falls past the final frame into trailing metadata); `unsupported format` means a bad offset or a non-trace file.
- No `file.tmp` may remain after a completed save; a save killed mid-write leaves the previous file intact (the GUI writes through `SafeFileWrite`, tmp + rename-on-commit).
- Video evidence while interacting: `ffmpeg -f x11grab -video_size 1280x800 -i :99 -t N -c:v libx264 out.mp4` (background it; it records the whole interaction).
-
-## Limitations
-
- No debug harness — the screenshot diff is the only oracle; targeting is coordinate-from-screenshot, slower and coarser than Route A's hit-test sweeps.
- The verified coordinates are tied to the M constants (1280x800 screen, openbox default theme, 100 % UI scale); re-derive from a screenshot if any of them changes.
- The GTK dialogs are separate top-level windows whose layout follows the system GTK theme.
-
-## Teardown
-
-```sh
-pkill -f prof-x11; pkill -f tracy-monitor
-pkill -f "sleep 600"          # the test target from §Run — adjust to what you started
-pkill openbox
-# hub op=stop name=xvfb
-```
-
-## References
-
- `profiler/src/BackendGlfw.cpp` — X11/GLFW input handlers (mouse/keyboard → ImGui).
- `profiler/CMakeLists.txt:5-7` — `NO_FILESELECTOR`, `GTK_FILESELECTOR`, `LEGACY` (X11 vs default Wayland) options.
- `cmake/vendor.cmake:222-242` — NFD packaging: `NFD_PORTAL` on by default on Linux, the `GTK_FILESELECTOR` switch, the `nfd-xdg-foreign-v2.patch`.
- `server/TracySafeFileWrite.hpp` — the GUI save's tmp + rename-on-commit (the invariants in §File and connection checks).
- NFD (btzy/nativefiledialog-extended, pinned in `cmake/vendor.cmake`) — the GTK dialog behavior (Name entry focus, last-directory memory, overwrite confirmation).
--- a/.omp/skills/tracy-gui-verify/harness.patch
+++ b/.omp/skills/tracy-gui-verify/harness.patch
@@ -1,221 +0,0 @@
-diff -r a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt
--- a/profiler/CMakeLists.txt
-+++ b/profiler/CMakeLists.txt
-@@ -340,7 +340,7 @@
-         -sMAXIMUM_MEMORY=4gb
-         -sSTACK_SIZE=1048576
-         -sPTHREAD_POOL_SIZE=8
-        -sEXPORTED_FUNCTIONS=_main,_nativeOpenFile,_tracy_paste_clipboard
-+        -sEXPORTED_FUNCTIONS=_main,_nativeOpenFile,_tracy_paste_clipboard,_debug_snapshot,_debug_clear
-         -sEXPORTED_RUNTIME_METHODS=ccall
-         -sENVIRONMENT=web,worker
-         --preload-file embed.tracy
-diff -r a/profiler/src/BackendEmscripten.cpp b/profiler/src/BackendEmscripten.cpp
--- a/profiler/src/BackendEmscripten.cpp
-+++ b/profiler/src/BackendEmscripten.cpp
-@@ -1,6 +1,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <cstdarg>
-+#include <algorithm>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
- #include <GLES2/gl2.h>
-@@ -10,7 +12,146 @@
- #include "Backend.hpp"
- #include "RunQueue.hpp"
- #include "profiler/TracyImGui.hpp"
-+#include "imgui_internal.h"
- 
-+// ================= DEBUG HARNESS (temporary copy, not for upstream) =================
-+struct DbgEvent
-+{
-+    int type;    // 0=move 1=down 2=up 3=enter 4=leave 5=wheel
-+    int button;
-+    int targetX;
-+    int targetY;
-+    double appX; // what was passed to ImGui (targetX * dpr), -1 if n/a
-+    double appY;
-+    double t;    // DOMHighResTimeStamp
-+    int wheelX;
-+    int wheelY;
-+};
-+struct DbgFrame
-+{
-+    double t;
-+    int tick;        // emscripten main-loop tick count (rAF)
-+    int imguiFrame;  // ImGui::GetFrameCount()
-+    float mx, my;    // io.MousePos
-+    int md0, md1, md2;
-+    int queue;       // pending ImGui input events
-+    int wasActive;   // tracy::s_wasActive at tick start
-+    unsigned hi;     // ImGui hovered item ID
-+    unsigned ai;     // ImGui active item ID
-+};
-+static DbgEvent s_dbgEvents[512];
-+static int s_dbgEventHead = 0, s_dbgEventN = 0;
-+static DbgFrame s_dbgFrames[512];
-+static int s_dbgFrameHead = 0, s_dbgFrameN = 0;
-+static int s_dbgTick = 0;
-+
-+static void DbgPushEvent( int type, int button, int tx, int ty, double ax, double ay, double t, int wx = 0, int wy = 0 )
-+{
-+    auto& e = s_dbgEvents[s_dbgEventHead];
-+    e.type = type; e.button = button; e.targetX = tx; e.targetY = ty;
-+    e.appX = ax; e.appY = ay; e.t = t; e.wheelX = wx; e.wheelY = wy;
-+    s_dbgEventHead = ( s_dbgEventHead + 1 ) % 512;
-+    if ( s_dbgEventN < 512 ) s_dbgEventN++;
-+}
-+
-+static void DbgPushFrame()
-+{
-+    auto& f = s_dbgFrames[s_dbgFrameHead];
-+    auto& io = ImGui::GetIO();
-+    f.t = EM_ASM_DOUBLE( { return performance.now(); } );
-+    f.tick = s_dbgTick;
-+    f.imguiFrame = ImGui::GetFrameCount();
-+    f.mx = io.MousePos.x; f.my = io.MousePos.y;
-+    f.md0 = io.MouseDown[0]; f.md1 = io.MouseDown[1]; f.md2 = io.MouseDown[2];
-+    auto ctx = ImGui::GetCurrentContext();
-+    f.queue = ctx ? int( ctx->InputEventsQueue.Size ) : -1;
-+    f.wasActive = tracy::s_wasActive;
-+    f.hi = ctx ? ctx->HoveredId : 0;
-+    f.ai = ctx ? ctx->ActiveId : 0;
-+    s_dbgFrameHead = ( s_dbgFrameHead + 1 ) % 512;
-+    if ( s_dbgFrameN < 512 ) s_dbgFrameN++;
-+}
-+
-+extern "C" EMSCRIPTEN_KEEPALIVE void debug_clear()
-+{
-+    s_dbgEventHead = s_dbgEventN = s_dbgFrameHead = s_dbgFrameN = 0;
-+}
-+
-+// Escape a C string for embedding in a JSON string literal (", \, control chars).
-+static void JsonEscape( char* out, size_t outsz, const char* in )
-+{
-+    size_t o = 0;
-+    for( const unsigned char* p = ( const unsigned char* )in; *p; p++ )
-+    {
-+        if ( *p == '"' || *p == '\\' )
-+        {
-+            if ( o + 2 >= outsz ) break;
-+            out[o++] = '\\';
-+            out[o++] = char( *p );
-+        }
-+        else if ( *p < 0x20 )
-+        {
-+            if ( o + 6 >= outsz ) break;
-+            o += size_t( snprintf( out + o, outsz - o, "\\u%04x", *p ) );
-+        }
-+        else
-+        {
-+            if ( o + 1 >= outsz ) break;
-+            out[o++] = char( *p );
-+        }
-+    }
-+    out[o] = 0;
-+}
-+
-+extern "C" EMSCRIPTEN_KEEPALIVE const char* debug_snapshot()
-+{
-+    static char buf[512 * 1024];
-+    size_t off = 0;
-+    auto put = [ & ]( const char* fmt, ... )
-+    {
-+        if ( off + 1 >= sizeof( buf ) ) return;
-+        va_list args;
-+        va_start( args, fmt );
-+        int n = vsnprintf( buf + off, sizeof( buf ) - off - 1, fmt, args );
-+        va_end( args );
-+        if ( n > 0 ) off = std::min( off + size_t( n ), sizeof( buf ) - 1 );
-+    };
-+    const auto dpr = EM_ASM_DOUBLE( { return window.devicePixelRatio; } );
-+    const auto innerW = EM_ASM_INT( { return window.innerWidth; } );
-+    const auto innerH = EM_ASM_INT( { return window.innerHeight; } );
-+    const auto bufW = EM_ASM_INT( { return document.getElementById( 'canvas' ).width; } );
-+    const auto bufH = EM_ASM_INT( { return document.getElementById( 'canvas' ).height; } );
-+    const auto rectL = EM_ASM_DOUBLE( { var r = document.getElementById( 'canvas' ).getBoundingClientRect(); return r.left; } );
-+    const auto rectT = EM_ASM_DOUBLE( { var r = document.getElementById( 'canvas' ).getBoundingClientRect(); return r.top; } );
-+    const auto rectW = EM_ASM_DOUBLE( { var r = document.getElementById( 'canvas' ).getBoundingClientRect(); return r.width; } );
-+    const auto rectH = EM_ASM_DOUBLE( { var r = document.getElementById( 'canvas' ).getBoundingClientRect(); return r.height; } );
-+    char title[256];
-+    EM_ASM( { stringToUTF8( document.title, $0, 256 ); }, title );
-+    char cursor[64];
-+    EM_ASM( { stringToUTF8( document.getElementById( 'canvas' ).style.cursor || "", $0, 64 ); }, cursor );
-+    char title_e[1536];
-+    char cursor_e[384];
-+    JsonEscape( title_e, sizeof( title_e ), title );
-+    JsonEscape( cursor_e, sizeof( cursor_e ), cursor );
-+    put( "{\"dpr\":%.6f,\"innerW\":%d,\"innerH\":%d,\"bufW\":%d,\"bufH\":%d,\"rectL\":%.3f,\"rectT\":%.3f,\"rectW\":%.3f,\"rectH\":%.3f,\"title\":\"%s\",\"cursor\":\"%s\",\"frames\":[", dpr, innerW, innerH, bufW, bufH, rectL, rectT, rectW, rectH, title_e, cursor_e );
-+    const int fn = std::min( s_dbgFrameN, 64 );
-+    for ( int i = 0; i < fn; i++ )
-+    {
-+        auto& f = s_dbgFrames[ ( s_dbgFrameHead - fn + i + 512 ) % 512 ];
-+        put( "%s{\"t\":%.3f,\"tick\":%d,\"f\":%d,\"mx\":%.1f,\"my\":%.1f,\"md\":[%d,%d,%d],\"q\":%d,\"wa\":%d,\"hi\":%u,\"ai\":%u}", i ? "," : "", f.t, f.tick, f.imguiFrame, f.mx, f.my, f.md0, f.md1, f.md2, f.queue, f.wasActive, f.hi, f.ai );
-+    }
-+    put( "],\"events\":[");
-+    const int en = std::min( s_dbgEventN, 64 );
-+    for ( int i = 0; i < en; i++ )
-+    {
-+        auto& e = s_dbgEvents[ ( s_dbgEventHead - en + i + 512 ) % 512 ];
-+        put( "%s{\"type\":%d,\"btn\":%d,\"tx\":%d,\"ty\":%d,\"ax\":%.3f,\"ay\":%.3f,\"t\":%.3f,\"wx\":%d,\"wy\":%d}", i ? "," : "", e.type, e.button, e.targetX, e.targetY, e.appX, e.appY, e.t, e.wheelX, e.wheelY );
-+    }
-+    put( "]}");
-+    buf[off] = 0;
-+    return buf;
-+}
-+
- static std::function<void()> s_redraw;
- static std::function<void(float)> s_scaleChanged;
- static std::function<int(void)> s_isBusy;
-@@ -223,32 +364,38 @@
-     emscripten_set_mousedown_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent* e, void* ) -> EM_BOOL {
-         ImGui::GetIO().AddMouseButtonEvent( e->button == 0 ? 0 : 3 - e->button, true );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 1, e->button, e->targetX, e->targetY, -1, -1, e->timestamp );
-         return EM_TRUE;
-     } );
-     emscripten_set_mouseup_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent* e, void* ) -> EM_BOOL {
-         ImGui::GetIO().AddMouseButtonEvent( e->button == 0 ? 0 : 3 - e->button, false );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 2, e->button, e->targetX, e->targetY, -1, -1, e->timestamp );
-         return EM_TRUE;
-     } );
-     emscripten_set_mousemove_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent* e, void* ) -> EM_BOOL {
-         const auto scale = EM_ASM_DOUBLE( { return window.devicePixelRatio; } );
-         ImGui::GetIO().AddMousePosEvent( e->targetX * scale, e->targetY * scale );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 0, -1, e->targetX, e->targetY, e->targetX * scale, e->targetY * scale, e->timestamp );
-         return EM_TRUE;
-     } );
-    emscripten_set_mouseleave_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent*, void* ) -> EM_BOOL {
-+    emscripten_set_mouseleave_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent* e, void* ) -> EM_BOOL {
-         ImGui::GetIO().AddFocusEvent( false );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 4, -1, e->targetX, e->targetY, -1, -1, e->timestamp );
-         return EM_TRUE;
-     } );
-    emscripten_set_mouseenter_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent*, void* ) -> EM_BOOL {
-+    emscripten_set_mouseenter_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenMouseEvent* e, void* ) -> EM_BOOL {
-         ImGui::GetIO().AddFocusEvent( true );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 3, -1, e->targetX, e->targetY, -1, -1, e->timestamp );
-         return EM_TRUE;
-     } );
-     emscripten_set_wheel_callback( "#canvas", nullptr, EM_TRUE, []( int, const EmscriptenWheelEvent* e, void* ) -> EM_BOOL {
-         ImGui::GetIO().AddMouseWheelEvent( e->deltaX * -0.05, e->deltaY * -0.05 );
-         tracy::s_wasActive = true;
-+        DbgPushEvent( 5, -1, e->mouse.targetX, e->mouse.targetY, -1, -1, e->mouse.timestamp, int( e->deltaX ), int( e->deltaY ) );
-         return EM_TRUE;
-     } );
-     emscripten_set_keydown_callback( EMSCRIPTEN_EVENT_TARGET_WINDOW, nullptr, EM_TRUE, [] ( int, const EmscriptenKeyboardEvent* e, void* ) -> EM_BOOL {
-@@ -298,6 +445,8 @@
- 
- void Backend::NewFrame( int& w, int& h )
- {
-+    s_dbgTick++;
-+    DbgPushFrame();
-     const auto scale = GetDpiScale();
-     if( scale != s_prevScale )
-     {
--- a/.omp/skills/tracy-gui-verify/setup.sh
+++ b/.omp/skills/tracy-gui-verify/setup.sh
@@ -1,102 +0,0 @@
-#!/bin/sh
-# setup.sh - build the instrumented Tracy web GUI workspace (see SKILL.md).
-#
-# Usage:
-#   sh setup.sh
-#   TRACY_WEB_WS=/custom/ws TRACY_WEB_REPO=<repo> sh setup.sh
-#
-# Idempotent: reuses an existing source copy and build dir, skips
-# already-applied harness patch hunks, rebuilds.
-set -e
-
-WS="${TRACY_WEB_WS:-/tmp/tracy-protocol}"
-# The skill is project-scoped: <repo>/.omp/skills/tracy-gui-verify/
-SKILL_DIR=$(cd "$(dirname "$0")" && pwd)
-if [ -n "$TRACY_WEB_REPO" ]; then
-	REPO="$TRACY_WEB_REPO"
-else
-	REPO=$(cd "$SKILL_DIR/../../.." 2>/dev/null && pwd) || REPO=""
-fi
-EMSDK="${EMSDK_DIR:-$HOME/emsdk}"
-
-[ -x "$EMSDK/emsdk" ] || { echo "error: emsdk not found at $EMSDK (set EMSDK_DIR)" >&2; exit 1; }
-[ -f "$REPO/profiler/CMakeLists.txt" ] || { echo "error: not a Tracy repo: '$REPO' (set TRACY_WEB_REPO)" >&2; exit 1; }
-
-. "$EMSDK/emsdk_env.sh" >/dev/null 2>&1 || true
-command -v emcc >/dev/null || { echo "error: emcc not on PATH after emsdk_env.sh" >&2; exit 1; }
-
-if [ ! -f "$WS/src/profiler/CMakeLists.txt" ]; then
-	echo "[setup] fresh source copy -> $WS/src (from $REPO)"
-	mkdir -p "$WS/src"
-	# -C applies to both archive creation and extraction; exclude all build dirs
-	tar -C "$REPO" \
-		--exclude=.git \
-		--exclude='*/build*' \
-		-cf - . | tar -xf - -C "$WS/src"
-else
-	echo "[setup] reusing source copy in $WS/src (copy changed repo files into it first)"
-fi
-
-# The harness is fully in place iff each patch hunk's signature line is present.
-# patch --forward skips a whole file once its first hunk is detected as already
-# applied, so a failed later hunk is invisible in patch's output and exit code —
-# verify the content instead of trusting either.
-harness_complete()
-{
-	grep -q '_debug_snapshot' "$WS/src/profiler/CMakeLists.txt" \
-	&& grep -qF 'EMSCRIPTEN_KEEPALIVE const char* debug_snapshot' "$WS/src/profiler/src/BackendEmscripten.cpp" \
-	&& grep -qF 'DbgPushEvent( 1,' "$WS/src/profiler/src/BackendEmscripten.cpp" \
-	&& grep -qF 's_dbgTick++;' "$WS/src/profiler/src/BackendEmscripten.cpp"
-}
-
-echo "[setup] applying instrumentation harness"
-if harness_complete; then
-	echo "[setup] harness already applied"
-	rm -f "$WS/src/profiler/CMakeLists.txt.rej" "$WS/src/profiler/src/BackendEmscripten.cpp.rej"
-else
-	rm -f "$WS/src/profiler/CMakeLists.txt.rej" "$WS/src/profiler/src/BackendEmscripten.cpp.rej"
-	patch -p1 -d "$WS/src" --forward --no-backup-if-mismatch < "$SKILL_DIR/harness.patch" \
-		|| {
-			if harness_complete; then
-				# mixed run: some hunks already present (skipped), the rest applied
-				rm -f "$WS/src/profiler/CMakeLists.txt.rej" "$WS/src/profiler/src/BackendEmscripten.cpp.rej"
-			else
-				rej=$(ls "$WS/src/profiler/CMakeLists.txt.rej" "$WS/src/profiler/src/BackendEmscripten.cpp.rej" 2>/dev/null || true)
-				if [ -n "$rej" ]; then
-					kept="The unapplied hunks are kept in:
-$(printf '%s\n' $rej | sed 's/^/  /')"
-				else
-					kept="No .rej files were produced (fatal patch error); the patch output above is the only evidence."
-				fi
-				cat >&2 <<EOF
-error: harness patch did not fully apply — $WS/src has drifted from the repo.
-$kept
-Do not build from this workspace. Either re-apply the harness by hand
-(SKILL.md, "After editing the GUI in the repo"), or start fresh:
-  rm -rf $WS && sh <this-skill-dir>/setup.sh
-EOF
-				exit 1
-			fi
-		}
-fi
-
-if [ ! -f "$WS/build/CMakeCache.txt" ]; then
-	echo "[setup] configuring"
-	cmake -S "$WS/src/profiler" -B "$WS/build" \
-		-DCMAKE_TOOLCHAIN_FILE="$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCPM_SOURCE_CACHE="$HOME/.cache/cpm"
-fi
-
-echo "[setup] building (first full build ~3-5 min, incremental ~30 s)"
-cmake --build "$WS/build" -j "$(nproc)"
-
-cat <<EOF
-[setup] done.
-  workspace : $WS
-  repo      : $REPO
-  emcc      : $(emcc --version | sed -n 1p)
-  serve     : hub op=start name=tracy-web application=python3 args=[$WS/build/httpd.py] cwd=$WS/build ready={port:8000} persist=true
-  open      : browser open url=http://127.0.0.1:8000/index.html viewport={width:1600,height:900}
-  ready     : document.title matches / - Tracy Profiler/ (see SKILL.md)
-EOF
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +0,0 @@
-{
-    "recommendations": [
-        "llvm-vs-code-extensions.vscode-clangd",
-        "vadimcn.vscode-lldb",
-        "ms-vscode.cmake-tools"
-    ]
-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,13 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch",
-            "type": "lldb",
-            "request": "launch",
-            "program": "${command:cmake.launchTargetPath}",
-            "args": [],
-            "cwd": "${workspaceFolder}"
-        }
-    ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,20 +0,0 @@
-{
-    "cmake.sourceDirectory": [
-        "${workspaceFolder}/profiler",
-        "${workspaceFolder}/capture",
-        "${workspaceFolder}/csvexport",
-        "${workspaceFolder}/import",
-        "${workspaceFolder}/merge",
-        "${workspaceFolder}/update",
-        "${workspaceFolder}/tests/tracy",
-        "${workspaceFolder}",
-    ],
-    "cmake.buildDirectory": "${sourceDirectory}/build",
-    "cmake.autoSelectActiveFolder": false,
-    "cmake.options.advanced": {
-        "folder": { "statusBarVisibility": "visible" },
-        "variant": { "statusBarVisibility": "compact" }
-    },
-    "cmake.copyCompileCommands": "${workspaceFolder}/compile_commands.json",
-    "lldb.launch.initCommands": ["command script import ${workspaceRoot}/extra/natvis.py"],
-}
--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+Bartosz Taudul <wolf.pld@gmail.com>
+Kamil Klimek <kamil.klimek@sharkbits.com>
+Bartosz Szreder <zgredder@gmail.com>
+Arvid Gerstmann <dev@arvid-g.de>
+Rokas Kupstys <rokups@zoho.com>
+Till Rathmann <till.rathmann@gmx.de>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,297 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-# Run version helper script
-include(cmake/version.cmake)
-
-project(Tracy LANGUAGES CXX VERSION ${TRACY_VERSION_STRING})
-
-file(GENERATE OUTPUT .gitignore CONTENT "*")
-
-if(${BUILD_SHARED_LIBS})
-    set(DEFAULT_STATIC OFF)
-else()
-    set(DEFAULT_STATIC ON)
-endif()
-
-option(TRACY_STATIC "Whether to build Tracy as a static library" ${DEFAULT_STATIC})
-option(TRACY_Fortran "Build Fortran bindings" OFF)
-option(TRACY_LTO "Enable Link-Time optimization" OFF)
-
-if(TRACY_Fortran)
-  enable_language(Fortran)
-  set(CMAKE_Fortran_VERSION 2003)
-endif()
-
-if(TRACY_LTO OR CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT LTO_SUPPORTED)
-    if(NOT LTO_SUPPORTED)
-        message(WARNING "LTO is not supported!")
-    endif()
-else()
-    set(LTO_SUPPORTED OFF)
-endif()
-
-find_package(Threads REQUIRED)
-find_package(rocprofiler-sdk PATHS "/opt/rocm/lib/cmake")
-
-set(TRACY_PUBLIC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/public)
-
-if(LTO_SUPPORTED)
-    set(TRACY_VISIBILITY "OBJECT")
-elseif(TRACY_STATIC)
-    set(TRACY_VISIBILITY "STATIC")
-else()
-    set(TRACY_VISIBILITY "SHARED")
-endif()
-
-add_library(TracyClient ${TRACY_VISIBILITY} "${TRACY_PUBLIC_DIR}/TracyClient.cpp")
-target_compile_features(TracyClient PUBLIC cxx_std_11)
-set_target_properties(TracyClient PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${LTO_SUPPORTED})
-target_include_directories(TracyClient SYSTEM PUBLIC
-    $<BUILD_INTERFACE:${TRACY_PUBLIC_DIR}>
-    $<INSTALL_INTERFACE:include/tracy>)
-target_link_libraries(
-    TracyClient
-    PUBLIC
-        Threads::Threads
-        ${CMAKE_DL_LIBS}
-)
-if(rocprofiler-sdk_FOUND)
-    target_compile_definitions(TracyClient PUBLIC TRACY_ROCPROF)
-    target_link_libraries(TracyClient PUBLIC rocprofiler-sdk::rocprofiler-sdk)
-endif()
-
-if(TRACY_Fortran)
-    add_library(TracyClientF90 ${TRACY_VISIBILITY} "${TRACY_PUBLIC_DIR}/TracyClient.F90")
-    target_include_directories(TracyClientF90 PUBLIC
-        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
-        $<INSTALL_INTERFACE:include/tracy>)
-    target_link_libraries(
-        TracyClientF90
-        PUBLIC
-            TracyClient
-    )
-    set_target_properties(TracyClientF90 PROPERTIES Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}
-                                                    INTERPROCEDURAL_OPTIMIZATION ${LTO_SUPPORTED})
-endif()
-
-# Public dependency on some libraries required when using Mingw
-if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU|Clang")
-    target_link_libraries(TracyClient PUBLIC ws2_32 dbghelp secur32)
-    target_compile_definitions(TracyClient PUBLIC WINVER=0x0A00 _WIN32_WINNT=0x0A00)
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED)
-    target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY})
-endif()
-
-if(TRACY_LIBUNWIND_BACKTRACE)
-    include(FindPkgConfig)
-    pkg_check_modules(unwind REQUIRED libunwind)
-    target_include_directories(TracyClient INTERFACE ${unwind_INCLUDE_DIRS})
-    target_link_libraries(TracyClient INTERFACE ${unwind_LINK_LIBRARIES})
-endif()
-
-if(TRACY_DEBUGINFOD)
-    include(FindPkgConfig)
-    pkg_check_modules(debuginfod REQUIRED libdebuginfod)
-    target_include_directories(TracyClient INTERFACE ${debuginfod_INCLUDE_DIRS})
-    target_link_libraries(TracyClient INTERFACE ${debuginfod_LINK_LIBRARIES})
-endif()
-
-add_library(Tracy::TracyClient ALIAS TracyClient)
-if(TRACY_Fortran)
-    add_library(Tracy::TracyClient_Fortran ALIAS TracyClientF90)
-endif()
-
-include(cmake/options.cmake)
-
-set_option(TRACY_ENABLE "Enable profiling" OFF TracyClient)
-set_option(TRACY_ON_DEMAND "On-demand profiling" OFF TracyClient)
-set_option_value(TRACY_CALLSTACK "Override the callstack collection depth for tracy zones" "" TracyClient)
-set_option_value_as_string(TRACY_PLATFORM_HEADER "Path to a header providing TRACY_HAS_CUSTOM_* hooks for an unsupported platform" "" TracyClient)
-set_option(TRACY_NO_CALLSTACK "Disable all callstack related functionality" OFF TracyClient)
-set_option(TRACY_NO_CALLSTACK_INLINES "Disables the inline functions in callstacks" OFF TracyClient)
-set_option(TRACY_ONLY_LOCALHOST "Only listen on the localhost interface" OFF TracyClient)
-set_option(TRACY_NO_BROADCAST "Disable client discovery by broadcast to local network" OFF TracyClient)
-set_option(TRACY_ONLY_IPV4 "Tracy will only accept connections on IPv4 addresses (disable IPv6)" OFF TracyClient)
-set_option(TRACY_NO_CODE_TRANSFER "Disable collection of source code" OFF TracyClient)
-set_option(TRACY_NO_CONTEXT_SWITCH "Disable capture of context switches" OFF TracyClient)
-set_option(TRACY_NO_EXIT "Client executable does not exit until all profile data is sent to server" OFF TracyClient)
-set_option(TRACY_NO_SAMPLING "Disable call stack sampling" OFF TracyClient)
-set_option(TRACY_NO_WAIT_STACKS "Disable capture of context switch call stacks" OFF TracyClient)
-set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF TracyClient)
-set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF TracyClient)
-set_option(TRACY_NO_FRAME_IMAGE "Disable the frame image support and its thread" OFF TracyClient)
-set_option(TRACY_NO_SYSTEM_TRACING "Disable systrace sampling" OFF TracyClient)
-set_option(TRACY_PATCHABLE_NOPSLEDS "Enable nopsleds for efficient patching by system-level tools (e.g. rr)" OFF TracyClient)
-set_option(TRACY_MANUAL_LIFETIME "Enable the manual lifetime management of the profile" OFF TracyClient)
-set_option(TRACY_FIBERS "Enable fibers support" OFF TracyClient)
-set_option(TRACY_NO_CRASH_HANDLER "Disable crash handling" OFF TracyClient)
-set_option(TRACY_TIMER_FALLBACK "Use lower resolution timers" OFF TracyClient)
-set_option(TRACY_DISALLOW_HW_TIMER "Disallow hardware timer (may be useful on VMs). Requires TRACY_TIMER_FALLBACK=ON" OFF TracyClient)
-set_option(TRACY_LIBUNWIND_BACKTRACE "Use libunwind backtracing where supported" OFF TracyClient)
-set_option(TRACY_SYMBOL_OFFLINE_RESOLVE "Instead of full runtime symbol resolution, only resolve the image path and offset to enable offline symbol resolution" OFF TracyClient)
-set_option(TRACY_LIBBACKTRACE_ELF_DYNLOAD_SUPPORT "Enable libbacktrace to support dynamically loaded elfs in symbol resolution resolution after the first symbol resolve operation" OFF TracyClient)
-set_option(TRACY_DEBUGINFOD "Enable debuginfod support" OFF TracyClient)
-set_option(TRACY_IGNORE_MEMORY_FAULTS "Ignore instrumentation errors from memory free events that do not have a matching allocation, or from repeated allocations of the same address" OFF TracyClient)
-set_option(TRACY_OPENGL_AUTO_CALIBRATION "Periodically recalibrate OpenGL GPU/CPU clock drift (forces a CPU/GPU sync each time)" OFF TracyClient)
-
-# advanced
-set_option(TRACY_VERBOSE "[advanced] Verbose output from the profiler" OFF TracyClient)
-mark_as_advanced(TRACY_VERBOSE)
-set_option(TRACY_NO_INTERNAL_MESSAGE "[advanced] Prevent the profiler from logging messages" OFF TracyClient)
-mark_as_advanced(TRACY_NO_INTERNAL_MESSAGE)
-set_option(TRACY_DEMANGLE "[advanced] Don't use default demangling function - You'll need to provide your own" OFF TracyClient)
-mark_as_advanced(TRACY_DEMANGLE)
-if(rocprofiler-sdk_FOUND)
-    set_option(TRACY_ROCPROF_CALIBRATION "[advanced] Use continuous calibration of the Rocprof GPU time." OFF TracyClient)
-    mark_as_advanced(TRACY_ROCPROF_CALIBRATION)
-endif()
-
-# handle incompatible combinations
-if(TRACY_DISALLOW_HW_TIMER AND NOT TRACY_TIMER_FALLBACK)
-    message(FATAL_ERROR "TRACY_DISALLOW_HW_TIMER can not be activated with disabled TRACY_TIMER_FALLBACK")
-endif()
-
-if(NOT TRACY_STATIC)
-    target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS)
-    target_compile_definitions(TracyClient PUBLIC TRACY_IMPORTS)
-endif()
-
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
-
-set_target_properties(TracyClient PROPERTIES VERSION ${PROJECT_VERSION})
-if(TRACY_Fortran)
-    set_target_properties(TracyClientF90 PROPERTIES VERSION ${PROJECT_VERSION})
-endif()
-
-set(tracy_includes
-    ${TRACY_PUBLIC_DIR}/tracy/TracyC.h
-    ${TRACY_PUBLIC_DIR}/tracy/Tracy.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyCUDA.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyD3D11.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyD3D12.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyLua.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyMetal.hmm
-    ${TRACY_PUBLIC_DIR}/tracy/TracyOpenCL.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyOpenGL.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyVulkan.hpp
-    ${TRACY_PUBLIC_DIR}/tracy/TracyWebGPU.hpp)
-
-set(client_includes
-    ${TRACY_PUBLIC_DIR}/client/tracy_concurrentqueue.h
-    ${TRACY_PUBLIC_DIR}/client/tracy_rpmalloc.hpp
-    ${TRACY_PUBLIC_DIR}/client/tracy_SPSCQueue.h
-    ${TRACY_PUBLIC_DIR}/client/TracyKCore.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyArmCpuTable.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyCallstack.h
-    ${TRACY_PUBLIC_DIR}/client/TracyCallstack.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyCpuid.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyDebug.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyDxt1.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyFastVector.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyLock.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyMangle.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyProfiler.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyRingBuffer.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyScoped.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyStringHelpers.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracySysPower.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracySysTime.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracySysTrace.hpp
-    ${TRACY_PUBLIC_DIR}/client/TracyThread.hpp)
-
-set(common_includes
-    ${TRACY_PUBLIC_DIR}/common/tracy_lz4.hpp
-    ${TRACY_PUBLIC_DIR}/common/tracy_lz4hc.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyAlign.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyAlloc.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyApi.h
-    ${TRACY_PUBLIC_DIR}/common/TracyAssert.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyColor.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyForceInline.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyFormat.h
-    ${TRACY_PUBLIC_DIR}/common/TracyMutex.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyProtocol.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyQueue.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracySocket.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyStackFrames.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyString.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracySystem.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyTaggedUserlandAddress.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyVersion.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyWinFamily.hpp
-    ${TRACY_PUBLIC_DIR}/common/TracyYield.hpp)
-
-install(TARGETS TracyClient
-        EXPORT TracyConfig
-        RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-        LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-        ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-        COMPONENT lib)
-if(TRACY_Fortran)
-    install(TARGETS TracyClientF90
-            EXPORT TracyConfig
-            RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-            LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-            ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<IF:$<CONFIG:Release>,,$<CONFIG>>
-            COMPONENT lib)
-endif()
-# Export targets to build tree root
-export(TARGETS TracyClient
-       NAMESPACE Tracy::
-       FILE ${CMAKE_BINARY_DIR}/TracyTargets.cmake)
-if(TRACY_Fortran)
-    export(TARGETS TracyClientF90
-           NAMESPACE Tracy::
-           APPEND
-           FILE ${CMAKE_BINARY_DIR}/TracyTargets.cmake)
-endif()
-install(FILES ${tracy_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/tracy)
-install(FILES ${client_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/client)
-install(FILES ${common_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/common)
-if(TRACY_Fortran)
-    if(${CMAKE_Fortran_COMPILER_ID} MATCHES "Cray")
-        install(FILES ${PROJECT_BINARY_DIR}/TRACY.mod
-                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy)
-    else()
-        install(FILES ${PROJECT_BINARY_DIR}/tracy.mod
-                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy)
-    endif()
-endif()
-install(EXPORT TracyConfig
-        NAMESPACE Tracy::
-        FILE TracyTargets.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-include(CMakePackageConfigHelpers)
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-        "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake"
-        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-write_basic_package_version_file(
-        "${CMAKE_CURRENT_BINARY_DIR}/TracyConfigVersion.cmake"
-        COMPATIBILITY SameMinorVersion)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TracyConfigVersion.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-
-option(TRACY_CLIENT_PYTHON "Whether to build Tracy python client library" OFF)
-
-if(TRACY_CLIENT_PYTHON)
-    if(TRACY_STATIC)
-        message(FATAL_ERROR "Python-bindings require a shared client library")
-    endif()
-
-    add_subdirectory(python)
-endif()
-
-if(PROJECT_IS_TOP_LEVEL)
-    set(CMAKE_COLOR_DIAGNOSTICS ON)
-endif()
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -1,8 +0,0 @@
-@PACKAGE_INIT@
-
-set(TRACY_VERSION_STRING "@TRACY_VERSION_STRING@")
-
-include(CMakeFindDependencyMacro)
-find_dependency(Threads REQUIRED)
-
-include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake")
--- a/FAQ.md
+++ b/FAQ.md
@@ -0,0 +1,77 @@
+# A quick tracy FAQ
+
+### I already use VTune/perf/Very Sleepy/callgrind/MSVC profiler.
+
+These are statistical profilers, which can be used to find hot spots in the code. This is very useful, but it won't show you the underlying reason for semi-random frame stutter that may occur every couple of seconds.
+
+### You can use Telemetry for that.
+
+Telemetry license costs about 8000 $ per year. Tracy is open source software. Telemetry doesn't have Lua bindings.
+
+### You can use the free Brofiler. Crytek does use it, so it has to be good.
+
+After a cursory look at the Brofiler code I can tell that the timer resolution there is at 300 ns. Tracy can achieve 5 ns timer resolution. Brofiler event logging infrastructure seems to be over-engineered. Brofiler can't track lock contention, nor does it have Lua bindings.
+
+### So tracy is supposedly faster?
+
+My measurements show that logging a single zone with tracy takes only 15 ns. In theory, if the program was doing nothing else, tracy should be able to log 66 million zones per second.
+
+### Bullshit, RAD is advertising that they are able only to log about a million zones, over the network nevertheless: "Capture over a million timing zones per second in real-time!"
+
+Tracy can perform network transfer of 15 million zones per second. Should the client and server be on separate machines, this number will be even higher, but you will need more than a gigabit link to achieve the maximum throughput. [Click here for a video of a max-throughput capture.](https://www.youtube.com/watch?v=DSMIHShKGAc)
+
+### Can I connect to my application at any time and start profiling at this moment?
+
+By default no, all events are registered from the beginning of program execution and are waiting in a queue. There's a separate on-demand mode, enabled by using a `TRACY_ON_DEMAND` macro.
+
+### Am I seeing correctly that the profiler allocates one gigabyte of memory per second?
+
+Only in extreme cases. Normal usage has much lower memory pressure.
+
+### Why do you do magic with the static initialization order? Everyone says that's a bad practice.
+
+It allows tracking construction of static objects and memory allocations performed before main() is entered.
+
+### There's no support for consoles.
+
+Welp. But there's mobile support.
+
+### I do need console support.
+
+The code is open. Write your own, then send a patch.
+
+### I don't believe you can capture a zone in 15 ns. Show me the code!
+
+Following is the annotated assembly code (generated from C++ sources) that's responsible for logging start of the zone:
+
+```
+call        qword ptr [__imp_GetCurrentThreadId]
+mov         r14d,eax
+mov         qword ptr [rsp+0F0h],r14        // save thread id for later use
+mov         r12d,10h
+mov         rax,qword ptr gs:[58h]          // TLS
+mov         r15,qword ptr [rax]             // queue address
+mov         rdi,qword ptr [r12+r15]         // data address
+mov         rbp,qword ptr [rdi+20h]         // buffer counter
+mov         rbx,rbp
+and         ebx,7Fh                         // 128 item buffer
+jne         Application::InnerLoop+66h --+
+mov         rdx,rbp                      |
+mov         rcx,rdi                      |
+call        enqueue_begin_alloc          |  // reclaim/alloc next buffer
+shl         rbx,5  <---------------------+  // buffer items are 32 bytes
+add         rbx,qword ptr [rdi+40h]
+mov         byte ptr [rbx],4                // queue item type
+rdtscp
+mov         dword ptr [rbx+19h],ecx         // cpu id
+shl         rdx,20h
+or          rax,rdx                         // 64 bit timestamp
+mov         qword ptr [rbx+1],rax
+mov         qword ptr [rbx+9],r14           // thread id
+lea         rax,[__tracy_source_location]   // static struct address
+mov         qword ptr [rbx+11h],rax
+lea         rax,[rbp+1]                     // increment buffer counter
+mov         qword ptr [rdi+20h],rax
+```
+
+There's also a second code block, for the end of the zone. It's similar, but a bit smaller, as it can use some of the variables that were retrieved above.
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
-Tracy Profiler (https://github.com/wolfpld/tracy) is licensed under the
+Tracy Profiler (https://bitbucket.org/wolfpld/tracy) is licensed under the
 3-clause BSD license.

-Copyright (c) 2017-2026, Bartosz Taudul <wolf@nereid.pl>
+Copyright (c) 2017-2018, Bartosz Taudul <wolf.pld@gmail.com>
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/1541
+++ b/1541
--- a/README.md
+++ b/README.md
@@ -1,28 +1,68 @@
 # Tracy Profiler

-[![Sponsor](.github/sponsor.png)](https://github.com/sponsors/wolfpld/)
+[![Build status](https://ci.appveyor.com/api/projects/status/968a88arq06gm3el/branch/master?svg=true)](https://ci.appveyor.com/project/wolfpld/tracy/branch/master)

-### A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
-
-Tracy supports profiling CPU (Direct support is provided for C, C++, Lua, Python and Fortran integration. At the same time, third-party bindings to many other languages exist on the internet, such as [Rust](https://github.com/nagisa/rust_tracy_client), [Zig](https://github.com/tealsnow/zig-tracy), [C#](https://github.com/clibequilibrium/Tracy-CSharp), [OCaml](https://github.com/imandra-ai/ocaml-tracy), [Odin](https://github.com/oskarnp/odin-tracy), etc.), GPU (All major graphics/compute APIs: OpenGL, Vulkan, Direct3D 11/12, Metal, OpenCL, CUDA, WebGPU.), memory allocations, locks, context switches, automatically attribute screenshots to captured frames, and much more.
-
- [Documentation](https://github.com/wolfpld/tracy/releases/latest/download/tracy.pdf) for usage and build process instructions
- [Releases](https://github.com/wolfpld/tracy/releases) containing the documentation (`tracy.pdf`) and compiled Windows x64 binaries (`Tracy-<version>.7z`) as assets
- [Changelog](NEWS)
- [Interactive demo](https://tracy.nereid.pl/)
+Tracy is a real time, nanosecond resolution frame profiler that can be used for remote or embedded telemetry of your application. It can profile CPU (C++, Lua), GPU (OpenGL, Vulkan) and memory. It also can display locks held by threads and their interactions with each other.

 ![](doc/profiler.png)

-![](doc/profiler2.png)
+Tracy requires compiler support for C++11, Thread Local Storage and a way to workaround static initialization order fiasco. There are no other requirements. The following platforms are confirmed to be working (this is not a complete list):

-![](doc/profiler3.png)
+- Windows (x86, x64)
+- Linux (x86, x64, ARM, ARM64)
+- Android (ARM, x86)
+- FreeBSD (x64)
+- Cygwin (x64)
+- WSL (x64)
+- OSX (x64)

-[An Introduction to Tracy Profiler in C++ - Marcos Slomp - CppCon 2023](https://youtu.be/ghXk3Bk5F2U?t=37)
+The following compilers are supported:
+
+- MSVC
+- gcc
+- clang

 [Introduction to Tracy Profiler v0.2](https://www.youtube.com/watch?v=fB5B46lbapc)  
-[New features in Tracy Profiler v0.3](https://www.youtube.com/watch?v=3SXpDpDh2Uo)  
-[New features in Tracy Profiler v0.4](https://www.youtube.com/watch?v=eAkgkaO8B9o)  
-[New features in Tracy Profiler v0.5](https://www.youtube.com/watch?v=P6E7qLMmzTQ)  
-[New features in Tracy Profiler v0.6](https://www.youtube.com/watch?v=uJkrFgriuOo)  
-[New features in Tracy Profiler v0.7](https://www.youtube.com/watch?v=_hU7vw00MZ4)  
-[New features in Tracy Profiler v0.8](https://www.youtube.com/watch?v=30wpRpHTTag)
+[New features in Tracy Profiler v0.3](https://www.youtube.com/watch?v=3SXpDpDh2Uo)
+
+[A quick FAQ.](FAQ.md)  
+[List of changes.](NEWS)
+
+### High-level overview
+
+![](doc/design.svg)
+
+Tracy is split into client and server side. The client side collects events using a high-efficiency queue and awaits for an incoming connection. The server part connects to client and receives collected data from the client, which is then reconstructed into a viewable timeline. The transfer is performed using a TCP connection.
+
+### Performance impact
+
+To check how much slowdown is introduced by using Tracy, I have profiled [etcpak](https://bitbucket.org/wolfpld/etcpak), which is the fastest ETC texture compression utility there is. I used an 8192×8192 test image as input data and instrumented everything down to the 4×4 pixel block compression function (that's 4 million blocks to compress). It should be noted that Tracy needs to calibrate its internal timers at each run. This introduces a delay of 115 ms (on my machine), which is negligible when doing lengthy profiling runs, but it skews the results of etcpak timing. The following times have this delay subtracted, to give focus on zone collection impact, which is the thing that really matters here.
+
+|                        Scenario                       |  Zones  | Clean run | Profiling run | Difference |
+|-------------------------------------------------------|---------|-----------|---------------|------------|
+| Compression of an image to ETC1 format                | 4194568 |    0.94 s |       1.003 s |   +0.063 s |
+| Compression of an image to ETC2 format, with mip-maps | 5592822 |   1.034 s |       1.119 s |   +0.085 s |
+
+In both scenarios the per-zone time cost is at ~15 ns. This is in line with the measured 8 ns single event collection time (each zone has to report start and end event).
+
+## Usage instructions
+
+The user manual for Tracy is available [at the following address](https://bitbucket.org/wolfpld/tracy/downloads/tracy.pdf). It provides information about the integration process, required code markup and so on.
+
+## Features
+
+#### Marking locks
+
+![](doc/locks.png)
+
+#### Plotting data
+
+![](doc/plot.png)
+
+#### Message log
+
+![](doc/messages.png)
+
+#### Approximation of capture cost
+
+![](doc/cost.png)
--- a/Tracy.hpp
+++ b/Tracy.hpp
@@ -0,0 +1,126 @@
+#ifndef __TRACY_HPP__
+#define __TRACY_HPP__
+
+#include "common/TracyColor.hpp"
+#include "common/TracySystem.hpp"
+
+#ifndef TRACY_ENABLE
+
+#define ZoneNamed(x,y)
+#define ZoneNamedN(x,y,z)
+#define ZoneNamedC(x,y,z)
+#define ZoneNamedNC(x,y,z,w)
+
+#define ZoneScoped
+#define ZoneScopedN(x)
+#define ZoneScopedC(x)
+#define ZoneScopedNC(x,y)
+
+#define ZoneText(x,y)
+#define ZoneName(x,y)
+
+#define FrameMark
+#define FrameMarkNamed(x)
+#define FrameMarkStart(x)
+#define FrameMarkEnd(x)
+
+#define TracyLockable( type, varname ) type varname;
+#define TracyLockableN( type, varname, desc ) type varname;
+#define TracySharedLockable( type, varname ) type varname;
+#define TracySharedLockableN( type, varname, desc ) type varname;
+#define LockableBase( type ) type
+#define SharedLockableBase( type ) type
+#define LockMark(x) (void)x;
+
+#define TracyPlot(x,y)
+
+#define TracyMessage(x,y)
+#define TracyMessageL(x)
+
+#define TracyAlloc(x,y)
+#define TracyFree(x)
+
+#define ZoneNamedS(x,y,z)
+#define ZoneNamedNS(x,y,z,w)
+#define ZoneNamedCS(x,y,z,w)
+#define ZoneNamedNCS(x,y,z,w,a)
+
+#define ZoneScopedS(x)
+#define ZoneScopedNS(x,y)
+#define ZoneScopedCS(x,y)
+#define ZoneScopedNCS(x,y,z)
+
+#define TracyAllocS(x,y,z)
+#define TracyFreeS(x,y)
+
+#else
+
+#include "client/TracyLock.hpp"
+#include "client/TracyProfiler.hpp"
+#include "client/TracyScoped.hpp"
+
+#define ZoneNamed( varname, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), active );
+#define ZoneNamedN( varname, name, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), active );
+#define ZoneNamedC( varname, color, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), active );
+#define ZoneNamedNC( varname, name, color, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), active );
+
+#define ZoneScoped ZoneNamed( ___tracy_scoped_zone, true )
+#define ZoneScopedN( name ) ZoneNamedN( ___tracy_scoped_zone, name, true )
+#define ZoneScopedC( color ) ZoneNamedC( ___tracy_scoped_zone, color, true )
+#define ZoneScopedNC( name, color ) ZoneNamedNC( ___tracy_scoped_zone, name, color, true )
+
+#define ZoneText( txt, size ) ___tracy_scoped_zone.Text( txt, size );
+#define ZoneName( txt, size ) ___tracy_scoped_zone.Name( txt, size );
+
+#define FrameMark tracy::Profiler::SendFrameMark();
+#define FrameMarkNamed( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsg );
+#define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart );
+#define FrameMarkEnd( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgEnd );
+
+#define TracyLockable( type, varname ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
+#define TracyLockableN( type, varname, desc ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() };
+#define TracySharedLockable( type, varname ) tracy::SharedLockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
+#define TracySharedLockableN( type, varname, desc ) tracy::SharedLockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() };
+#define LockableBase( type ) tracy::Lockable<type>
+#define SharedLockableBase( type ) tracy::SharedLockable<type>
+#define LockMark( varname ) static const tracy::SourceLocationData __tracy_lock_location_##varname { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; varname.Mark( &__tracy_lock_location_##varname );
+
+#define TracyPlot( name, val ) tracy::Profiler::PlotData( name, val );
+
+#define TracyMessage( txt, size ) tracy::Profiler::Message( txt, size );
+#define TracyMessageL( txt ) tracy::Profiler::Message( txt );
+
+#define TracyAlloc( ptr, size ) tracy::Profiler::MemAlloc( ptr, size );
+#define TracyFree( ptr ) tracy::Profiler::MemFree( ptr );
+
+#ifdef TRACY_HAS_CALLSTACK
+#  define ZoneNamedS( varname, depth, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
+#  define ZoneNamedNS( varname, name, depth, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
+#  define ZoneNamedCS( varname, color, depth, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
+#  define ZoneNamedNCS( varname, name, color, depth, active ) static const tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
+
+#  define ZoneScopedS( depth ) ZoneNamedS( ___tracy_scoped_zone, depth, true )
+#  define ZoneScopedNS( name, depth ) ZoneNamedNS( ___tracy_scoped_zone, name, depth, true )
+#  define ZoneScopedCS( color, depth ) ZoneNamedCS( ___tracy_scoped_zone, color, depth, true )
+#  define ZoneScopedNCS( name, color, depth ) ZoneNamedNCS( ___tracy_scoped_zone, name, color depth, true )
+
+#  define TracyAllocS( ptr, size, depth ) tracy::Profiler::MemAllocCallstack( ptr, size, depth );
+#  define TracyFreeS( ptr, depth ) tracy::Profiler::MemFreeCallstack( ptr, depth );
+#else
+#  define ZoneNamedS( varname, depth, active ) ZoneNamed( varname, active )
+#  define ZoneNamedNS( varname, name, depth, active ) ZoneNamedN( varname, name, active )
+#  define ZoneNamedCS( varname, color, depth, active ) ZoneNamedC( varname, color, active )
+#  define ZoneNamedNCS( varname, name, color, depth, active ) ZoneNamedNC( varname, name, color, active )
+
+#  define ZoneScopedS( depth ) ZoneScoped
+#  define ZoneScopedNS( name, depth ) ZoneScopedN( name )
+#  define ZoneScopedCS( color, depth ) ZoneScopedC( color )
+#  define ZoneScopedNCS( name, color, depth ) ZoneScopedNC( name, color )
+
+#  define TracyAllocS( ptr, size, depth ) TracyAlloc( ptr, size )
+#  define TracyFreeS( ptr, depth ) TracyFree( ptr )
+#endif
+
+#endif
+
+#endif
--- a/public/TracyClient.cpp
+++ b/public/TracyClient.cpp
@@ -15,33 +15,15 @@

 #ifdef TRACY_ENABLE

-#ifdef _MSC_VER
-#  pragma warning(push, 0)
-#endif
-
-#include "common/tracy_lz4.cpp"
 #include "client/TracyProfiler.cpp"
 #include "client/TracyCallstack.cpp"
-#include "client/TracySysPower.cpp"
-#include "client/TracySysTime.cpp"
-#include "client/TracySysTrace.cpp"
+#include "common/tracy_lz4.cpp"
 #include "common/TracySocket.cpp"
-#ifndef TRACY_HAS_CUSTOM_ALLOCATOR
 #include "client/tracy_rpmalloc.cpp"
-#endif
-#include "client/TracyDxt1.cpp"
-#include "client/TracyAlloc.cpp"
-#include "client/TracyOverride.cpp"
-#include "client/TracyKCore.cpp"

-#ifdef TRACY_ROCPROF
-#  include "client/TracyRocprof.cpp"
-#endif
 #ifdef _MSC_VER
 #  pragma comment(lib, "ws2_32.lib")
-#  pragma comment(lib, "advapi32.lib")
-#  pragma comment(lib, "user32.lib")
-#  pragma warning(pop)
+#  pragma comment(lib, "dbghelp.lib")
 #endif

 #endif
--- a/TracyClientDLL.cpp
+++ b/TracyClientDLL.cpp
@@ -0,0 +1,73 @@
+//
+//          Tracy profiler
+//         ----------------
+//
+// On multi-DLL projects compile and
+// link with this source file (and none
+// other) in the executable and in
+// DLLs / shared objects that link to
+// the main DLL.
+//
+
+// Define TRACY_ENABLE to enable profiler.
+
+#include "common/TracySystem.cpp"
+
+#ifdef TRACY_ENABLE
+
+#include "client/TracyProfiler.hpp"
+#include "client/concurrentqueue.h"
+
+#include "common/TracyQueue.hpp"
+
+namespace tracy
+{
+#ifdef _MSC_VER
+#  define DLL_IMPORT __declspec(dllimport)
+#else
+#  define DLL_IMPORT
+#endif
+
+    DLL_IMPORT moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* get_token();
+    DLL_IMPORT void*(*get_rpmalloc())(size_t size);
+    DLL_IMPORT void(*get_rpfree())(void* ptr);
+    DLL_IMPORT Profiler& get_profiler();
+
+#if defined TRACY_HW_TIMER && __ARM_ARCH >= 6
+    DLL_IMPORT int64_t(*get_GetTimeImpl())();
+
+    int64_t(*GetTimeImpl)() = get_GetTimeImpl();
+#endif
+
+#ifdef TRACY_COLLECT_THREAD_NAMES
+    DLL_IMPORT std::atomic<ThreadNameData*>& get_threadNameData();
+    DLL_IMPORT void(*get_rpmalloc_thread_initialize())();
+
+    std::atomic<ThreadNameData*>& s_threadNameData = get_threadNameData();
+    void(*rpmalloc_thread_initialize_fpt)() = get_rpmalloc_thread_initialize();
+
+    void rpmalloc_thread_initialize(void)
+    {
+        rpmalloc_thread_initialize_fpt();
+    }
+#endif
+
+    static void*(*rpmalloc_fpt)(size_t size) = get_rpmalloc();
+    static void(*rpfree_fpt)(void* ptr) = get_rpfree();
+
+    RPMALLOC_RESTRICT void* rpmalloc(size_t size)
+    {
+        return rpmalloc_fpt(size);
+    }
+
+    void rpfree(void* ptr)
+    {
+        rpfree_fpt(ptr);
+    }
+
+    Profiler& s_profiler = get_profiler();
+
+    thread_local ProducerWrapper s_token { get_token() };
+}
+
+#endif
--- a/TracyLua.hpp
+++ b/TracyLua.hpp
@@ -0,0 +1,376 @@
+#ifndef __TRACYLUA_HPP__
+#define __TRACYLUA_HPP__
+
+// Include this file after you include lua headers.
+
+#ifndef TRACY_ENABLE
+
+#include <string.h>
+
+namespace tracy
+{
+
+namespace detail
+{
+static inline int noop( lua_State* L ) { return 0; }
+}
+
+static inline void LuaRegister( lua_State* L )
+{
+    lua_newtable( L );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "ZoneBegin" );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "ZoneBeginN" );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "ZoneEnd" );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "ZoneText" );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "ZoneName" );
+    lua_pushcfunction( L, detail::noop );
+    lua_setfield( L, -2, "Message" );
+    lua_setglobal( L, "tracy" );
+}
+
+static inline char* FindEnd( char* ptr )
+{
+    unsigned int cnt = 1;
+    while( cnt != 0 )
+    {
+        if( *ptr == '(' ) cnt++;
+        else if( *ptr == ')' ) cnt--;
+        ptr++;
+    }
+    return ptr;
+}
+
+static inline void LuaRemove( char* script )
+{
+    while( *script )
+    {
+        if( strncmp( script, "tracy.", 6 ) == 0 )
+        {
+            if( strncmp( script + 6, "Zone", 4 ) == 0 )
+            {
+                if( strncmp( script + 10, "End()", 5 ) == 0 )
+                {
+                    memset( script, ' ', 15 );
+                    script += 15;
+                }
+                else if( strncmp( script + 10, "Begin()", 7 ) == 0 )
+                {
+                    memset( script, ' ', 17 );
+                    script += 17;
+                }
+                else if( strncmp( script + 10, "Text(", 5 ) == 0 )
+                {
+                    auto end = FindEnd( script + 15 );
+                    memset( script, ' ', end - script );
+                    script = end;
+                }
+                else if( strncmp( script + 10, "Name(", 5 ) == 0 )
+                {
+                    auto end = FindEnd( script + 15 );
+                    memset( script, ' ', end - script );
+                    script = end;
+                }
+                else if( strncmp( script + 10, "BeginN(", 7 ) == 0 )
+                {
+                    auto end = FindEnd( script + 17 );
+                    memset( script, ' ', end - script );
+                    script = end;
+                }
+                else
+                {
+                    script += 10;
+                }
+            }
+            else if( strncmp( script + 6, "Message(", 8 ) == 0 )
+            {
+                auto end = FindEnd( script + 14 );
+                memset( script, ' ', end - script );
+                script = end;
+            }
+            else
+            {
+                script += 6;
+            }
+        }
+        else
+        {
+            script++;
+        }
+    }
+}
+
+}
+
+#else
+
+#include <assert.h>
+
+#include "common/TracyColor.hpp"
+#include "common/TracyAlign.hpp"
+#include "common/TracySystem.hpp"
+#include "client/TracyProfiler.hpp"
+
+namespace tracy
+{
+
+#ifdef TRACY_ON_DEMAND
+extern thread_local LuaZoneState s_luaZoneState;
+#endif
+
+namespace detail
+{
+
+static inline int LuaZoneBegin( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    const auto zoneCnt = s_luaZoneState.counter++;
+    if( zoneCnt != 0 && !s_luaZoneState.active ) return 0;
+    s_luaZoneState.active = s_profiler.IsConnected();
+    if( !s_luaZoneState.active ) return 0;
+#endif
+
+    const uint32_t color = Color::DeepSkyBlue3;
+
+    lua_Debug dbg;
+    lua_getstack( L, 1, &dbg );
+    lua_getinfo( L, "Snl", &dbg );
+
+    const uint32_t line = dbg.currentline;
+    const auto func = dbg.name ? dbg.name : dbg.short_src;
+    const auto fsz = strlen( func );
+    const auto ssz = strlen( dbg.source );
+
+    // Data layout:
+    //  4b  payload size
+    //  4b  color
+    //  4b  source line
+    //  fsz function name
+    //  1b  null terminator
+    //  ssz source file name
+    //  1b  null terminator
+    const uint32_t sz = uint32_t( 4 + 4 + 4 + fsz + 1 + ssz + 1 );
+    auto ptr = (char*)tracy_malloc( sz );
+    memcpy( ptr, &sz, 4 );
+    memcpy( ptr + 4, &color, 4 );
+    memcpy( ptr + 8, &line, 4 );
+    memcpy( ptr + 12, func, fsz+1 );
+    memcpy( ptr + 12 + fsz + 1, dbg.source, ssz + 1 );
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc );
+#ifdef TRACY_RDTSCP_OPT
+    MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) );
+#else
+    uint32_t cpu;
+    MemWrite( &item->zoneBegin.time, Profiler::GetTime( cpu ) );
+    MemWrite( &item->zoneBegin.cpu, cpu );
+#endif
+    MemWrite( &item->zoneBegin.thread, GetThreadHandle() );
+    MemWrite( &item->zoneBegin.srcloc, (uint64_t)ptr );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+static inline int LuaZoneBeginN( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    const auto zoneCnt = s_luaZoneState.counter++;
+    if( zoneCnt != 0 && !s_luaZoneState.active ) return 0;
+    s_luaZoneState.active = s_profiler.IsConnected();
+    if( !s_luaZoneState.active ) return 0;
+#endif
+
+    const uint32_t color = Color::DeepSkyBlue3;
+
+    lua_Debug dbg;
+    lua_getstack( L, 1, &dbg );
+    lua_getinfo( L, "Snl", &dbg );
+
+    const uint32_t line = dbg.currentline;
+    const auto func = dbg.name ? dbg.name : dbg.short_src;
+    size_t nsz;
+    const auto name = lua_tolstring( L, 1, &nsz );
+    const auto fsz = strlen( func );
+    const auto ssz = strlen( dbg.source );
+
+    // Data layout:
+    //  4b  payload size
+    //  4b  color
+    //  4b  source line
+    //  fsz function name
+    //  1b  null terminator
+    //  ssz source file name
+    //  1b  null terminator
+    //  nsz zone name
+    const uint32_t sz = uint32_t( 4 + 4 + 4 + fsz + 1 + ssz + 1 + nsz );
+    auto ptr = (char*)tracy_malloc( sz );
+    memcpy( ptr, &sz, 4 );
+    memcpy( ptr + 4, &color, 4 );
+    memcpy( ptr + 8, &line, 4 );
+    memcpy( ptr + 12, func, fsz+1 );
+    memcpy( ptr + 12 + fsz + 1, dbg.source, ssz + 1 );
+    memcpy( ptr + 12 + fsz + 1 + ssz + 1, name, nsz );
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc );
+#ifdef TRACY_RDTSCP_OPT
+    MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) );
+#else
+    uint32_t cpu;
+    MemWrite( &item->zoneBegin.time, Profiler::GetTime( cpu ) );
+    MemWrite( &item->zoneBegin.cpu, cpu );
+#endif
+    MemWrite( &item->zoneBegin.thread, GetThreadHandle() );
+    MemWrite( &item->zoneBegin.srcloc, (uint64_t)ptr );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+static inline int LuaZoneEnd( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    assert( s_luaZoneState.counter != 0 );
+    s_luaZoneState.counter--;
+    if( !s_luaZoneState.active ) return 0;
+    if( !s_profiler.IsConnected() )
+    {
+        s_luaZoneState.active = false;
+        return 0;
+    }
+#endif
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::ZoneEnd );
+#ifdef TRACY_RDTSCP_OPT
+    MemWrite( &item->zoneEnd.time, Profiler::GetTime( item->zoneEnd.cpu ) );
+#else
+    uint32_t cpu;
+    MemWrite( &item->zoneEnd.time, Profiler::GetTime( cpu ) );
+    MemWrite( &item->zoneEnd.cpu, cpu );
+#endif
+    MemWrite( &item->zoneEnd.thread, GetThreadHandle() );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+static inline int LuaZoneText( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    if( !s_luaZoneState.active ) return 0;
+    if( !s_profiler.IsConnected() )
+    {
+        s_luaZoneState.active = false;
+        return 0;
+    }
+#endif
+
+    auto txt = lua_tostring( L, 1 );
+    const auto size = strlen( txt );
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto ptr = (char*)tracy_malloc( size+1 );
+    memcpy( ptr, txt, size );
+    ptr[size] = '\0';
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::ZoneText );
+    MemWrite( &item->zoneText.thread, GetThreadHandle() );
+    MemWrite( &item->zoneText.text, (uint64_t)ptr );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+static inline int LuaZoneName( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    if( !s_luaZoneState.active ) return 0;
+    if( !s_profiler.IsConnected() )
+    {
+        s_luaZoneState.active = false;
+        return 0;
+    }
+#endif
+
+    auto txt = lua_tostring( L, 1 );
+    const auto size = strlen( txt );
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto ptr = (char*)tracy_malloc( size+1 );
+    memcpy( ptr, txt, size );
+    ptr[size] = '\0';
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::ZoneName );
+    MemWrite( &item->zoneText.thread, GetThreadHandle() );
+    MemWrite( &item->zoneText.text, (uint64_t)ptr );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+static inline int LuaMessage( lua_State* L )
+{
+#ifdef TRACY_ON_DEMAND
+    if( !s_profiler.IsConnected() ) return 0;
+#endif
+
+    auto txt = lua_tostring( L, 1 );
+    const auto size = strlen( txt );
+
+    Magic magic;
+    auto& token = s_token.ptr;
+    auto ptr = (char*)tracy_malloc( size+1 );
+    memcpy( ptr, txt, size );
+    ptr[size] = '\0';
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+    MemWrite( &item->hdr.type, QueueType::Message );
+    MemWrite( &item->message.time, Profiler::GetTime() );
+    MemWrite( &item->message.thread, GetThreadHandle() );
+    MemWrite( &item->message.text, (uint64_t)ptr );
+    tail.store( magic + 1, std::memory_order_release );
+    return 0;
+}
+
+}
+
+static inline void LuaRegister( lua_State* L )
+{
+    lua_newtable( L );
+    lua_pushcfunction( L, detail::LuaZoneBegin );
+    lua_setfield( L, -2, "ZoneBegin" );
+    lua_pushcfunction( L, detail::LuaZoneBeginN );
+    lua_setfield( L, -2, "ZoneBeginN" );
+    lua_pushcfunction( L, detail::LuaZoneEnd );
+    lua_setfield( L, -2, "ZoneEnd" );
+    lua_pushcfunction( L, detail::LuaZoneText );
+    lua_setfield( L, -2, "ZoneText" );
+    lua_pushcfunction( L, detail::LuaZoneName );
+    lua_setfield( L, -2, "ZoneName" );
+    lua_pushcfunction( L, detail::LuaMessage );
+    lua_setfield( L, -2, "Message" );
+    lua_setglobal( L, "tracy" );
+}
+
+static inline void LuaRemove( char* script ) {}
+
+}
+
+#endif
+
+#endif
--- a/TracyOpenGL.hpp
+++ b/TracyOpenGL.hpp
@@ -0,0 +1,265 @@
+#ifndef __TRACYOPENGL_HPP__
+#define __TRACYOPENGL_HPP__
+
+// Include this file after you include OpenGL 3.2 headers.
+
+#if !defined TRACY_ENABLE || defined __APPLE__
+
+#define TracyGpuContext
+#define TracyGpuNamedZone(x,y)
+#define TracyGpuNamedZoneC(x,y,z)
+#define TracyGpuZone(x)
+#define TracyGpuZoneC(x,y)
+#define TracyGpuCollect
+
+#define TracyGpuNamedZoneS(x,y,z)
+#define TracyGpuNamedZoneCS(x,y,z,w)
+#define TracyGpuZoneS(x,y)
+#define TracyGpuZoneCS(x,y,z)
+
+#else
+
+#include <atomic>
+#include <assert.h>
+#include <stdlib.h>
+
+#include "Tracy.hpp"
+#include "client/TracyProfiler.hpp"
+#include "client/TracyCallstack.hpp"
+#include "common/TracyAlign.hpp"
+#include "common/TracyAlloc.hpp"
+
+#define TracyGpuContext tracy::s_gpuCtx.ptr = (tracy::GpuCtx*)tracy::tracy_malloc( sizeof( tracy::GpuCtx ) ); new(tracy::s_gpuCtx.ptr) tracy::GpuCtx;
+#define TracyGpuNamedZone( varname, name ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::GpuCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__) );
+#define TracyGpuNamedZoneC( varname, name, color ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::GpuCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__) );
+#define TracyGpuZone( name ) TracyGpuNamedZone( ___tracy_gpu_zone, name )
+#define TracyGpuZoneC( name, color ) TracyGpuNamedZoneC( ___tracy_gpu_zone, name, color )
+#define TracyGpuCollect tracy::s_gpuCtx.ptr->Collect();
+
+#ifdef TRACY_HAS_CALLSTACK
+#  define TracyGpuNamedZoneS( varname, name, depth ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::GpuCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), depth );
+#  define TracyGpuNamedZoneCS( varname, name, color, depth ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::GpuCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), depth );
+#  define TracyGpuZoneS( name, depth ) TracyGpuNamedZoneS( ___tracy_gpu_zone, name, depth )
+#  define TracyGpuZoneCS( name, color, depth ) TracyGpuNamedZoneCS( ___tracy_gpu_zone, name, color, depth )
+#else
+#  define TracyGpuNamedZoneS( varname, name, depth ) TracyGpuNamedZone( varname, name )
+#  define TracyGpuNamedZoneCS( varname, name, color, depth ) TracyGpuNamedZoneC( varname, name, color )
+#  define TracyGpuZoneS( name, depth ) TracyGpuZone( name )
+#  define TracyGpuZoneCS( name, color, depth ) TracyGpuZoneC( name, color )
+#endif
+
+namespace tracy
+{
+
+extern std::atomic<uint8_t> s_gpuCtxCounter;
+
+class GpuCtx
+{
+    friend class GpuCtxScope;
+
+    enum { QueryCount = 64 * 1024 };
+
+public:
+    GpuCtx()
+        : m_context( s_gpuCtxCounter.fetch_add( 1, std::memory_order_relaxed ) )
+        , m_head( 0 )
+        , m_tail( 0 )
+    {
+        assert( m_context != 255 );
+
+        glGenQueries( QueryCount, m_query );
+
+        int64_t tgpu;
+        glGetInteger64v( GL_TIMESTAMP, &tgpu );
+        int64_t tcpu = Profiler::GetTime();
+
+        GLint bits;
+        glGetQueryiv( GL_TIMESTAMP, GL_QUERY_COUNTER_BITS, &bits );
+
+        const float period = 1.f;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuNewContext );
+        MemWrite( &item->gpuNewContext.cpuTime, tcpu );
+        MemWrite( &item->gpuNewContext.gpuTime, tgpu );
+        MemWrite( &item->gpuNewContext.thread, GetThreadHandle() );
+        MemWrite( &item->gpuNewContext.period, period );
+        MemWrite( &item->gpuNewContext.context, m_context );
+        MemWrite( &item->gpuNewContext.accuracyBits, (uint8_t)bits );
+
+#ifdef TRACY_ON_DEMAND
+        s_profiler.DeferItem( *item );
+#endif
+
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    void Collect()
+    {
+        ZoneScopedC( Color::Red4 );
+
+        if( m_tail == m_head ) return;
+
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() )
+        {
+            m_head = m_tail = 0;
+            return;
+        }
+#endif
+
+        auto start = m_tail;
+        auto end = m_head + QueryCount;
+        auto cnt = ( end - start ) % QueryCount;
+        while( cnt > 1 )
+        {
+            auto mid = start + cnt / 2;
+            GLint available;
+            glGetQueryObjectiv( m_query[mid % QueryCount], GL_QUERY_RESULT_AVAILABLE, &available );
+            if( available )
+            {
+                start = mid;
+            }
+            else
+            {
+                end = mid;
+            }
+            cnt = ( end - start ) % QueryCount;
+        }
+
+        start %= QueryCount;
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+
+        while( m_tail != start )
+        {
+            uint64_t time;
+            glGetQueryObjectui64v( m_query[m_tail], GL_QUERY_RESULT, &time );
+
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::GpuTime );
+            MemWrite( &item->gpuTime.gpuTime, (int64_t)time );
+            MemWrite( &item->gpuTime.queryId, (uint16_t)m_tail );
+            MemWrite( &item->gpuTime.context, m_context );
+            tail.store( magic + 1, std::memory_order_release );
+            m_tail = ( m_tail + 1 ) % QueryCount;
+        }
+    }
+
+private:
+    tracy_force_inline unsigned int NextQueryId()
+    {
+        const auto id = m_head;
+        m_head = ( m_head + 1 ) % QueryCount;
+        assert( m_head != m_tail );
+        return id;
+    }
+
+    tracy_force_inline unsigned int TranslateOpenGlQueryId( unsigned int id )
+    {
+        return m_query[id];
+    }
+
+    tracy_force_inline uint8_t GetId() const
+    {
+        return m_context;
+    }
+
+    unsigned int m_query[QueryCount];
+    uint8_t m_context;
+
+    unsigned int m_head;
+    unsigned int m_tail;
+};
+
+extern thread_local GpuCtxWrapper s_gpuCtx;
+
+class GpuCtxScope
+{
+public:
+    tracy_force_inline GpuCtxScope( const SourceLocationData* srcloc )
+#ifdef TRACY_ON_DEMAND
+        : m_active( s_profiler.IsConnected() )
+#endif
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        const auto queryId = s_gpuCtx.ptr->NextQueryId();
+        glQueryCounter( s_gpuCtx.ptr->TranslateOpenGlQueryId( queryId ), GL_TIMESTAMP );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneBegin );
+        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)srcloc );
+        memset( &item->gpuZoneBegin.thread, 0, sizeof( item->gpuZoneBegin.thread ) );
+        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneBegin.context, s_gpuCtx.ptr->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline GpuCtxScope( const SourceLocationData* srcloc, int depth )
+#ifdef TRACY_ON_DEMAND
+        : m_active( s_profiler.IsConnected() )
+#endif
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        const auto queryId = s_gpuCtx.ptr->NextQueryId();
+        glQueryCounter( s_gpuCtx.ptr->TranslateOpenGlQueryId( queryId ), GL_TIMESTAMP );
+
+        const auto thread = GetThreadHandle();
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstack );
+        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)srcloc );
+        MemWrite( &item->gpuZoneBegin.thread, thread );
+        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneBegin.context, s_gpuCtx.ptr->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+
+        s_profiler.SendCallstack( depth, thread );
+    }
+
+    tracy_force_inline ~GpuCtxScope()
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        const auto queryId = s_gpuCtx.ptr->NextQueryId();
+        glQueryCounter( s_gpuCtx.ptr->TranslateOpenGlQueryId( queryId ), GL_TIMESTAMP );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneEnd );
+        MemWrite( &item->gpuZoneEnd.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneEnd.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneEnd.context, s_gpuCtx.ptr->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+private:
+#ifdef TRACY_ON_DEMAND
+    const bool m_active;
+#endif
+};
+
+}
+
+#endif
+
+#endif
--- a/TracyVulkan.hpp
+++ b/TracyVulkan.hpp
@@ -0,0 +1,305 @@
+#ifndef __TRACYVULKAN_HPP__
+#define __TRACYVULKAN_HPP__
+
+#if !defined TRACY_ENABLE
+
+#define TracyVkContext(x,y,z,w)
+#define TracyVkDestroy
+#define TracyVkNamedZone(x,y,z)
+#define TracyVkNamedZoneC(x,y,z,w)
+#define TracyVkZone(x,y)
+#define TracyVkZoneC(x,y,z)
+#define TracyVkCollect(x)
+
+#define TracyVkNamedZoneS(x,y,z,w)
+#define TracyVkNamedZoneCS(x,y,z,w,v)
+#define TracyVkZoneS(x,y,z)
+#define TracyVkZoneCS(x,y,z,w)
+
+#else
+
+#include <assert.h>
+#include <stdlib.h>
+#include <vulkan/vulkan.h>
+#include "Tracy.hpp"
+#include "client/TracyProfiler.hpp"
+#include "client/TracyCallstack.hpp"
+
+#define TracyVkContext( physdev, device, queue, cmdbuf ) tracy::s_vkCtx.ptr = (tracy::VkCtx*)tracy::tracy_malloc( sizeof( tracy::VkCtx ) ); new(tracy::s_vkCtx.ptr) tracy::VkCtx( physdev, device, queue, cmdbuf );
+#define TracyVkDestroy tracy::s_vkCtx.ptr->~VkCtx(); tracy::tracy_free( tracy::s_vkCtx.ptr ); tracy::s_vkCtx.ptr = nullptr;
+#define TracyVkNamedZone( varname, cmdbuf, name ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::VkCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf );
+#define TracyVkNamedZoneC( varname, cmdbuf, name, color ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::VkCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf );
+#define TracyVkZone( cmdbuf, name ) TracyVkNamedZone( ___tracy_gpu_zone, cmdbuf, name )
+#define TracyVkZoneC( cmdbuf, name, color ) TracyVkNamedZoneC( ___tracy_gpu_zone, cmdbuf, name, color )
+#define TracyVkCollect( cmdbuf ) tracy::s_vkCtx.ptr->Collect( cmdbuf );
+
+#ifdef TRACY_HAS_CALLSTACK
+#  define TracyVkNamedZoneS( varname, cmdbuf, name, depth ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::VkCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, depth );
+#  define TracyVkNamedZoneCS( varname, cmdbuf, name, color, depth ) static const tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::VkCtxScope varname( &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, depth );
+#  define TracyVkZoneS( cmdbuf, name, depth ) TracyVkNamedZoneS( ___tracy_gpu_zone, cmdbuf, name, depth )
+#  define TracyVkZoneCS( cmdbuf, name, color, depth ) TracyVkNamedZoneCS( ___tracy_gpu_zone, cmdbuf, name, color, depth )
+#else
+#  define TracyVkNamedZoneS( varname, cmdbuf, name, depth ) TracyVkNamedZone( varname, cmdbuf, name )
+#  define TracyVkNamedZoneCS( varname, cmdbuf, name, color, depth ) TracyVkNamedZoneC( varname, cmdbuf, name, color )
+#  define TracyVkZoneS( cmdbuf, name, depth ) TracyVkZone( cmdbuf, name )
+#  define TracyVkZoneCS( cmdbuf, name, color, depth ) TracyVkZoneC( cmdbuf, name, color )
+#endif
+
+namespace tracy
+{
+
+extern std::atomic<uint8_t> s_gpuCtxCounter;
+
+class VkCtx
+{
+    friend class VkCtxScope;
+
+    enum { QueryCount = 64 * 1024 };
+
+public:
+    VkCtx( VkPhysicalDevice physdev, VkDevice device, VkQueue queue, VkCommandBuffer cmdbuf )
+        : m_device( device )
+        , m_queue( queue )
+        , m_context( s_gpuCtxCounter.fetch_add( 1, std::memory_order_relaxed ) )
+        , m_head( 0 )
+        , m_tail( 0 )
+        , m_oldCnt( 0 )
+    {
+        assert( m_context != 255 );
+
+        VkPhysicalDeviceProperties prop;
+        vkGetPhysicalDeviceProperties( physdev, &prop );
+        const float period = prop.limits.timestampPeriod;
+
+        VkQueryPoolCreateInfo poolInfo = {};
+        poolInfo.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
+        poolInfo.queryCount = QueryCount;
+        poolInfo.queryType = VK_QUERY_TYPE_TIMESTAMP;
+        vkCreateQueryPool( device, &poolInfo, nullptr, &m_query );
+
+        VkCommandBufferBeginInfo beginInfo = {};
+        beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+        beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+
+        VkSubmitInfo submitInfo = {};
+        submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+        submitInfo.commandBufferCount = 1;
+        submitInfo.pCommandBuffers = &cmdbuf;
+
+        vkBeginCommandBuffer( cmdbuf, &beginInfo );
+        vkCmdResetQueryPool( cmdbuf, m_query, 0, QueryCount );
+        vkEndCommandBuffer( cmdbuf );
+        vkQueueSubmit( queue, 1, &submitInfo, VK_NULL_HANDLE );
+        vkQueueWaitIdle( queue );
+
+        vkBeginCommandBuffer( cmdbuf, &beginInfo );
+        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, m_query, 0 );
+        vkEndCommandBuffer( cmdbuf );
+        vkQueueSubmit( queue, 1, &submitInfo, VK_NULL_HANDLE );
+        vkQueueWaitIdle( queue );
+
+        int64_t tcpu = Profiler::GetTime();
+        int64_t tgpu;
+        vkGetQueryPoolResults( device, m_query, 0, 1, sizeof( tgpu ), &tgpu, sizeof( tgpu ), VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT );
+
+        vkBeginCommandBuffer( cmdbuf, &beginInfo );
+        vkCmdResetQueryPool( cmdbuf, m_query, 0, 1 );
+        vkEndCommandBuffer( cmdbuf );
+        vkQueueSubmit( queue, 1, &submitInfo, VK_NULL_HANDLE );
+        vkQueueWaitIdle( queue );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuNewContext );
+        MemWrite( &item->gpuNewContext.cpuTime, tcpu );
+        MemWrite( &item->gpuNewContext.gpuTime, tgpu );
+        memset( &item->gpuNewContext.thread, 0, sizeof( item->gpuNewContext.thread ) );
+        MemWrite( &item->gpuNewContext.period, period );
+        MemWrite( &item->gpuNewContext.context, m_context );
+        MemWrite( &item->gpuNewContext.accuracyBits, uint8_t( 0 ) );
+
+#ifdef TRACY_ON_DEMAND
+        s_profiler.DeferItem( *item );
+#endif
+
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    ~VkCtx()
+    {
+        vkDestroyQueryPool( m_device, m_query, nullptr );
+    }
+
+    void Collect( VkCommandBuffer cmdbuf )
+    {
+        ZoneScopedC( Color::Red4 );
+
+        if( m_tail == m_head ) return;
+
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() )
+        {
+            vkCmdResetQueryPool( cmdbuf, m_query, 0, QueryCount );
+            m_head = m_tail = 0;
+            return;
+        }
+#endif
+
+        unsigned int cnt;
+        if( m_oldCnt != 0 )
+        {
+            cnt = m_oldCnt;
+            m_oldCnt = 0;
+        }
+        else
+        {
+            cnt = m_head < m_tail ? QueryCount - m_tail : m_head - m_tail;
+        }
+
+        int64_t res[QueryCount];
+        if( vkGetQueryPoolResults( m_device, m_query, m_tail, cnt, sizeof( res ), res, sizeof( *res ), VK_QUERY_RESULT_64_BIT ) == VK_NOT_READY )
+        {
+            m_oldCnt = cnt;
+            return;
+        }
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+
+        for( unsigned int idx=0; idx<cnt; idx++ )
+        {
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::GpuTime );
+            MemWrite( &item->gpuTime.gpuTime, res[idx] );
+            MemWrite( &item->gpuTime.queryId, uint16_t( m_tail + idx ) );
+            MemWrite( &item->gpuTime.context, m_context );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        vkCmdResetQueryPool( cmdbuf, m_query, m_tail, cnt );
+
+        m_tail += cnt;
+        if( m_tail == QueryCount ) m_tail = 0;
+    }
+
+private:
+    tracy_force_inline unsigned int NextQueryId()
+    {
+        const auto id = m_head;
+        m_head = ( m_head + 1 ) % QueryCount;
+        assert( m_head != m_tail );
+        return id;
+    }
+
+    tracy_force_inline uint8_t GetId() const
+    {
+        return m_context;
+    }
+
+    VkDevice m_device;
+    VkQueue m_queue;
+    VkQueryPool m_query;
+    uint8_t m_context;
+
+    unsigned int m_head;
+    unsigned int m_tail;
+    unsigned int m_oldCnt;
+};
+
+extern VkCtxWrapper s_vkCtx;
+
+class VkCtxScope
+{
+public:
+    tracy_force_inline VkCtxScope( const SourceLocationData* srcloc, VkCommandBuffer cmdbuf )
+        : m_cmdbuf( cmdbuf )
+#ifdef TRACY_ON_DEMAND
+        , m_active( s_profiler.IsConnected() )
+#endif
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        auto ctx = s_vkCtx.ptr;
+        const auto queryId = ctx->NextQueryId();
+        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, ctx->m_query, queryId );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneBegin );
+        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)srcloc );
+        MemWrite( &item->gpuZoneBegin.thread, GetThreadHandle() );
+        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline VkCtxScope( const SourceLocationData* srcloc, VkCommandBuffer cmdbuf, int depth )
+        : m_cmdbuf( cmdbuf )
+#ifdef TRACY_ON_DEMAND
+        , m_active( s_profiler.IsConnected() )
+#endif
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        const auto thread = GetThreadHandle();
+
+        auto ctx = s_vkCtx.ptr;
+        const auto queryId = ctx->NextQueryId();
+        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, ctx->m_query, queryId );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstack );
+        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)srcloc );
+        MemWrite( &item->gpuZoneBegin.thread, thread );
+        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+
+        s_profiler.SendCallstack( depth, thread );
+    }
+
+    tracy_force_inline ~VkCtxScope()
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !m_active ) return;
+#endif
+        auto ctx = s_vkCtx.ptr;
+        const auto queryId = ctx->NextQueryId();
+        vkCmdWriteTimestamp( m_cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, ctx->m_query, queryId );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::GpuZoneEnd );
+        MemWrite( &item->gpuZoneEnd.cpuTime, Profiler::GetTime() );
+        MemWrite( &item->gpuZoneEnd.queryId, uint16_t( queryId ) );
+        MemWrite( &item->gpuZoneEnd.context, ctx->GetId() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+private:
+    VkCommandBuffer m_cmdbuf;
+
+#ifdef TRACY_ON_DEMAND
+    const bool m_active;
+#endif
+};
+
+}
+
+#endif
+
+#endif
--- a/capture/CMakeLists.txt
+++ b/capture/CMakeLists.txt
@@ -1,36 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-set(NO_STATISTICS ON)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
-
-set(CMAKE_CXX_STANDARD 20)
-
-project(
-    tracy-capture
-    LANGUAGES C CXX
-    VERSION ${TRACY_VERSION_STRING}
-)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/GitRef.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/util.cmake)
-
-set(PROGRAM_FILES
-    src/capture.cpp
-)
-
-add_executable(${PROJECT_NAME} ${PROGRAM_FILES})
-add_git_ref(${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyUtil TracyGetOpt)
-set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
-
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-add_executable(tracy-capture-daemon src/capturedaemon.cpp)
-add_git_ref(tracy-capture-daemon)
-target_link_libraries(tracy-capture-daemon PRIVATE TracyServer TracyUtil TracyGetOpt)
-
-install(TARGETS tracy-capture-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/capture/CMakePresets.json
+++ b/capture/CMakePresets.json
@@ -1,31 +0,0 @@
-{
-  "version": 10,
-  "configurePresets": [
-    {
-      "name": "common",
-      "hidden": true,
-      "binaryDir": "${sourceDir}/build-${presetName}",
-      "generator": "Ninja",
-      "cacheVariables": {
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-      }
-    },
-    {
-      "name": "debug",
-      "displayName": "Debug configuration",
-      "inherits": "common",
-      "binaryDir": "${sourceDir}/build",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "release",
-      "displayName": "Release configuration",
-      "inherits": "common",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    }
-  ]
-}
--- a/capture/build/unix/Makefile
+++ b/capture/build/unix/Makefile
@@ -0,0 +1,12 @@
+all: debug
+
+debug:
+	@+make -f debug.mk all
+
+release:
+	@+make -f release.mk all
+
+clean:
+	@+make -f build.mk clean
+
+.PHONY: all clean debug release
--- a/capture/build/unix/build.mk
+++ b/capture/build/unix/build.mk
@@ -0,0 +1,55 @@
+CFLAGS +=
+CXXFLAGS := $(CFLAGS) -std=gnu++17
+DEFINES += -DTRACY_NO_STATISTICS
+INCLUDES :=
+LIBS := -lpthread
+PROJECT := capture
+IMAGE := $(PROJECT)-$(BUILD)
+
+FILTER :=
+
+BASE := $(shell egrep 'ClCompile.*cpp"' ../win32/$(PROJECT).vcxproj | sed -e 's/.*\"\(.*\)\".*/\1/' | sed -e 's@\\@/@g')
+BASE2 := $(shell egrep 'ClCompile.*c"' ../win32/$(PROJECT).vcxproj | sed -e 's/.*\"\(.*\)\".*/\1/' | sed -e 's@\\@/@g')
+
+SRC := $(filter-out $(FILTER),$(BASE))
+SRC2 := $(filter-out $(FILTER),$(BASE2))
+
+OBJDIRBASE := obj/$(BUILD)
+OBJDIR := $(OBJDIRBASE)/o/o/o
+
+OBJ := $(addprefix $(OBJDIR)/,$(SRC:%.cpp=%.o))
+OBJ2 := $(addprefix $(OBJDIR)/,$(SRC2:%.c=%.o))
+
+all: $(IMAGE)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@
+
+$(OBJDIR)/%.d : %.cpp
+	@echo Resolving dependencies of $<
+	@mkdir -p $(@D)
+	@$(CXX) -MM $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< > $@.$$$$; \
+	sed 's,.*\.o[ :]*,$(OBJDIR)/$(<:.cpp=.o) $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+$(OBJDIR)/%.o: %.c
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+$(OBJDIR)/%.d : %.c
+	@echo Resolving dependencies of $<
+	@mkdir -p $(@D)
+	@$(CC) -MM $(INCLUDES) $(CFLAGS) $(DEFINES) $< > $@.$$$$; \
+	sed 's,.*\.o[ :]*,$(OBJDIR)/$(<:.c=.o) $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+$(IMAGE): $(OBJ) $(OBJ2)
+	$(CXX) $(CXXFLAGS) $(DEFINES) $(OBJ) $(OBJ2) $(LIBS) -o $@
+
+ifneq "$(MAKECMDGOALS)" "clean"
+-include $(addprefix $(OBJDIR)/,$(SRC:.cpp=.d)) %(addprefix $(OBJDIR)/,$(SRC2:.c=.d))
+endif
+
+clean:
+	rm -rf $(OBJDIRBASE) $(IMAGE)*
+
+.PHONY: clean all
--- a/capture/build/unix/debug.mk
+++ b/capture/build/unix/debug.mk
@@ -0,0 +1,11 @@
+ARCH := $(shell uname -m)
+
+CFLAGS := -g3 -Wall
+DEFINES := -DDEBUG
+BUILD := debug
+
+ifeq ($(ARCH),x86_64)
+CFLAGS += -msse4.1
+endif
+
+include build.mk
--- a/capture/build/unix/release.mk
+++ b/capture/build/unix/release.mk
@@ -0,0 +1,11 @@
+ARCH := $(shell uname -m)
+
+CFLAGS := -O3 -s -fomit-frame-pointer
+DEFINES := -DNDEBUG
+BUILD := release
+
+ifeq ($(ARCH),x86_64)
+CFLAGS += -msse4.1
+endif
+
+include build.mk
--- a/capture/build/win32/capture.sln
+++ b/capture/build/win32/capture.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2002
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capture", "capture.vcxproj", "{447D58BF-94CD-4469-BB90-549C05D03E00}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{447D58BF-94CD-4469-BB90-549C05D03E00}.Debug|x64.ActiveCfg = Debug|x64
+		{447D58BF-94CD-4469-BB90-549C05D03E00}.Debug|x64.Build.0 = Debug|x64
+		{447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.ActiveCfg = Release|x64
+		{447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E51386C-43EA-44AC-9F24-AFAFE4D63ADE}
+	EndGlobalSection
+EndGlobal
--- a/capture/build/win32/capture.vcxproj
+++ b/capture/build/win32/capture.vcxproj
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{447D58BF-94CD-4469-BB90-549C05D03E00}</ProjectGuid>
+    <RootNamespace>capture</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\TracySocket.cpp" />
+    <ClCompile Include="..\..\..\common\TracySystem.cpp" />
+    <ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
+    <ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
+    <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
+    <ClCompile Include="..\..\..\server\TracyWorker.cpp" />
+    <ClCompile Include="..\..\src\capture.cpp" />
+    <ClCompile Include="..\..\src\getopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\common\TracyAlign.hpp" />
+    <ClInclude Include="..\..\..\common\TracyAlloc.hpp" />
+    <ClInclude Include="..\..\..\common\TracyColor.hpp" />
+    <ClInclude Include="..\..\..\common\TracyForceInline.hpp" />
+    <ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
+    <ClInclude Include="..\..\..\common\TracyQueue.hpp" />
+    <ClInclude Include="..\..\..\common\TracySocket.hpp" />
+    <ClInclude Include="..\..\..\common\TracySystem.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h" />
+    <ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_sema.h" />
+    <ClInclude Include="..\..\..\server\TracyCharUtil.hpp" />
+    <ClInclude Include="..\..\..\server\TracyEvent.hpp" />
+    <ClInclude Include="..\..\..\server\TracyFileWrite.hpp" />
+    <ClInclude Include="..\..\..\server\TracyMemory.hpp" />
+    <ClInclude Include="..\..\..\server\TracyPopcnt.hpp" />
+    <ClInclude Include="..\..\..\server\TracySlab.hpp" />
+    <ClInclude Include="..\..\..\server\TracyVector.hpp" />
+    <ClInclude Include="..\..\..\server\TracyWorker.hpp" />
+    <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp" />
+    <ClInclude Include="..\..\src\getopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/capture/build/win32/capture.vcxproj.filters
+++ b/capture/build/win32/capture.vcxproj.filters
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{729c80ee-4d26-4a5e-8f1f-6c075783eb56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="server">
+      <UniqueIdentifier>{cf23ef7b-7694-4154-830b-00cf053350ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{e39d3623-47cd-4752-8da9-3ea324f964c1}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\tracy_lz4.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\TracySocket.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\TracySystem.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\server\TracyMemory.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\server\TracyWorker.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\capture.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\getopt.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\tracy_lz4hc.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\common\tracy_lz4.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyAlloc.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyColor.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyForceInline.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyProtocol.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyQueue.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracySocket.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracySystem.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyCharUtil.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyEvent.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyFileWrite.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyMemory.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyPopcnt.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracySlab.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyVector.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\server\TracyWorker.hpp">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\getopt.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\TracyAlign.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_sema.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp">
+      <Filter>common</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
--- a/capture/src/capture.cpp
+++ b/capture/src/capture.cpp
@@ -1,49 +1,104 @@
 #ifdef _WIN32
 #  include <windows.h>
-#else
-#  include <unistd.h>
 #endif

-#include <atomic>
 #include <chrono>
 #include <inttypes.h>
-#include <signal.h>
+#include <mutex>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

 #include "../../server/TracyFileWrite.hpp"
-#include "../../server/TracyPrint.hpp"
-#include "../../server/TracySysUtil.hpp"
+#include "../../server/TracyMemory.hpp"
 #include "../../server/TracyWorker.hpp"
-#include "../../public/common/TracyVersion.hpp"
-#include "GitRef.hpp"
-#include "CaptureFileBackup.hpp"
-#include "CaptureConsole.hpp"
+#include "getopt.h"

-#include "CaptureOutput.hpp"
-
-#ifdef _WIN32
-#  include "../../getopt/getopt.h"
-#endif
-
-
-// This atomic is written by a signal handler (SigInt). Traditionally that would
-// have had to be `volatile sig_atomic_t`, and annoyingly, `bool` was
-// technically not allowed there, even though in practice it would work.
-// The good thing with C++11 atomics is that we can use atomic<bool> instead
-// here and be on the actually supported path.
-static std::atomic<bool> s_disconnect { false };
-
-void SigInt( int )
+static const char* TimeToString( int64_t ns )
 {
-    s_disconnect.store(true, std::memory_order_relaxed);
+    enum { Pool = 8 };
+    static char bufpool[Pool][64];
+    static int bufsel = 0;
+    char* buf = bufpool[bufsel];
+    bufsel = ( bufsel + 1 ) % Pool;
+
+    const char* sign = "";
+    if( ns < 0 )
+    {
+        sign = "-";
+        ns = -ns;
+    }
+
+    if( ns < 1000 )
+    {
+        sprintf( buf, "%s%" PRIi64 " ns", sign, ns );
+    }
+    else if( ns < 1000ll * 1000 )
+    {
+        sprintf( buf, "%s%.2f us", sign, ns / 1000. );
+    }
+    else if( ns < 1000ll * 1000 * 1000 )
+    {
+        sprintf( buf, "%s%.2f ms", sign, ns / ( 1000. * 1000. ) );
+    }
+    else if( ns < 1000ll * 1000 * 1000 * 60 )
+    {
+        sprintf( buf, "%s%.2f s", sign, ns / ( 1000. * 1000. * 1000. ) );
+    }
+    else
+    {
+        const auto m = int64_t( ns / ( 1000ll * 1000 * 1000 * 60 ) );
+        const auto s = int64_t( ns - m * ( 1000ll * 1000 * 1000 * 60 ) );
+        sprintf( buf, "%s%" PRIi64 ":%04.1f", sign, m, s / ( 1000. * 1000. * 1000. ) );
+    }
+    return buf;
 }

-[[noreturn]] void Usage()
+static const char* RealToString( double val, bool separator )
 {
-    printf( "tracy-capture %i.%i.%i / %s\n\n", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch, tracy::GitRef );
-    printf( "Usage: capture -o output.tracy [-a address] [-p port] [-f] [-s seconds] [-m memlimit]\n" );
+    enum { Pool = 8 };
+    static char bufpool[Pool][64];
+    static int bufsel = 0;
+    char* buf = bufpool[bufsel];
+    bufsel = ( bufsel + 1 ) % Pool;
+
+    sprintf( buf, "%f", val );
+    auto ptr = buf;
+    if( *ptr == '-' ) ptr++;
+
+    const auto vbegin = ptr;
+
+    if( separator )
+    {
+        while( *ptr != '\0' && *ptr != ',' && *ptr != '.' ) ptr++;
+        auto end = ptr;
+        while( *end != '\0' ) end++;
+        auto sz = end - ptr;
+
+        while( ptr - vbegin > 3 )
+        {
+            ptr -= 3;
+            memmove( ptr+1, ptr, sz );
+            *ptr = ',';
+            sz += 4;
+        }
+    }
+
+    while( *ptr != '\0' && *ptr != ',' && *ptr != '.' ) ptr++;
+
+    if( *ptr == '\0' ) return buf;
+    while( *ptr != '\0' ) ptr++;
+    ptr--;
+    while( *ptr == '0' && *ptr != ',' && *ptr != '.' ) ptr--;
+    if( *ptr != '.' && *ptr != ',' ) ptr++;
+    *ptr = '\0';
+    return buf;
+}
+
+
+void Usage()
+{
+    printf( "Usage: capture -a address -o output.tracy\n" );
    exit( 1 );
 }

@@ -57,17 +112,11 @@ int main( int argc, char** argv )
    }
 #endif

-    InitTerminalDetection();
-
-    bool overwrite = false;
-    const char* address = "127.0.0.1";
+    const char* address = nullptr;
    const char* output = nullptr;
-    int port = 8086;
-    int seconds = -1;
-    int64_t memoryLimit = -1;

    int c;
-    while( ( c = getopt( argc, argv, "a:o:p:fs:m:" ) ) != -1 )
+    while( ( c = getopt( argc, argv, "a:o:" ) ) != -1 )
    {
        switch( c )
        {
@@ -77,18 +126,6 @@ int main( int argc, char** argv )
        case 'o':
            output = optarg;
            break;
-        case 'p':
-            port = atoi( optarg );
-            break;
-        case 'f':
-            overwrite = true;
-            break;
-        case 's':
-            seconds = atoi(optarg);
-            break;
-        case 'm':
-            memoryLimit = std::clamp( atoll( optarg ), 1ll, 999ll ) * tracy::GetPhysicalMemorySize() / 100;
-            break;
        default:
            Usage();
            break;
@@ -97,82 +134,46 @@ int main( int argc, char** argv )

    if( !address || !output ) Usage();

-    const char* prepError = nullptr;
-    const auto prep = tracy::PrepareOutputFile( output, overwrite, &prepError );
-    if( prep == tracy::OutputPrep::Exists )
-    {
-        printf( "Output file %s already exists! Use -f to force overwrite.\n", output );
-        return 4;
-    }
-    if( prep == tracy::OutputPrep::Unusable )
-    {
-        printf( "Cannot use output file: %s!\n", prepError );
-        return 5;
-    }
-
-    printf( "Connecting to %s:%i...", address, port );
+    printf( "Connecting to %s...", address );
    fflush( stdout );
-    tracy::Worker worker( address, port, memoryLimit );
-    int result = WaitForConnection( worker );
-    if( result != 0 ) return result;
-    printf( "\nTimer resolution: %s\n", tracy::TimeToString( worker.GetResolution() ) );
+    tracy::Worker worker( address );
+    while( !worker.HasData() ) std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
+    printf( "\nQueue delay: %s\nTimer resolution: %s\n", TimeToString( worker.GetDelay() ), TimeToString( worker.GetResolution() ) );

-#ifdef _WIN32
-    signal( SIGINT, SigInt );
-#else
-    struct sigaction sigint, oldsigint;
-    memset( &sigint, 0, sizeof( sigint ) );
-    sigint.sa_handler = SigInt;
-    sigaction( SIGINT, &sigint, &oldsigint );
-#endif
+    auto& lock = worker.GetMbpsDataLock();

-    const auto firstTime = worker.GetFirstTime();
-
-    const auto t0 = std::chrono::high_resolution_clock::now();
    while( worker.IsConnected() )
    {
-        if( s_disconnect.load( std::memory_order_relaxed ) )
-        {
-            worker.Disconnect();
-            s_disconnect.store(false, std::memory_order_relaxed );
-            while( worker.IsConnected() ) std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
-            break;
-        }
+        lock.lock();
+        const auto mbps = worker.GetMbpsData().back();
+        const auto compRatio = worker.GetCompRatio();
+        lock.unlock();

-        PrintCaptureProgress( worker, firstTime, memoryLimit );
+        if( mbps < 0.1f )
+        {
+            printf( "\33[2K\r\033[36;1m%7.2f Kbps", mbps * 1000.f );
+        }
+        else
+        {
+            printf( "\33[2K\r\033[36;1m%7.2f Mbps", mbps );
+        }
+        printf( " \033[0m| Ratio: \033[36;1m%5.1f%% \033[0m| Real: \033[33;1m%7.2f Mbps \033[0m| Mem: \033[31;1m%.2f MB\033[0m", compRatio * 100.f, mbps / compRatio, tracy::memUsage.load( std::memory_order_relaxed ) / ( 1024.f * 1024.f ) );
+        fflush( stdout );

        std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
-        if( seconds != -1 )
-        {
-            const auto dur = std::chrono::high_resolution_clock::now() - t0;
-            if( std::chrono::duration_cast<std::chrono::seconds>(dur).count() >= seconds )
-            {
-                s_disconnect.store(true, std::memory_order_relaxed );
-            }
-        }
    }
-    const auto t1 = std::chrono::high_resolution_clock::now();

-    PrintWorkerFailure( worker );
-
-    printf( "\nFrames: %" PRIu64 "\nTime span: %s\nZones: %s\nElapsed time: %s\nSaving trace...",
-        worker.GetFrameCount( *worker.GetFramesBase() ), tracy::TimeToString( worker.GetLastTime() - firstTime ), tracy::RealToString( worker.GetZoneCount() ),
-        tracy::TimeToString( std::chrono::duration_cast<std::chrono::nanoseconds>( t1 - t0 ).count() ) );
+    printf( "\nFrames: %" PRIu64 "\nTime span: %s\nZones: %s\nSaving trace...", worker.GetFrameCount( *worker.GetFramesBase() ), TimeToString( worker.GetLastTime() - worker.GetTimeBegin() ), RealToString( worker.GetZoneCount(), true ) );
    fflush( stdout );
-    auto f = std::unique_ptr<tracy::FileWrite>( tracy::FileWrite::Open( output, tracy::FileCompression::Zstd, 3, 4 ) );
+    auto f = std::unique_ptr<tracy::FileWrite>( tracy::FileWrite::Open( output ) );
    if( f )
    {
-        worker.Write( *f, false );
-        AnsiPrintf( ANSI_GREEN ANSI_BOLD, " done!\n" );
-        f->Finish();
-        const auto stats = f->GetCompressionStatistics();
-        printf( "Trace size %s (%.2f%% ratio)\n", tracy::MemSizeToString( stats.second ), 100.f * stats.second / stats.first );
-        tracy::DiscardOutputBackup();
+        worker.Write( *f );
+        printf( " \033[32;1mdone!\033[0m\n" );
    }
    else
    {
-        AnsiPrintf( ANSI_RED ANSI_BOLD, " failed!\n");
-        tracy::RestoreOutputBackup();
+        printf( " \033[31;1failed!\033[0m\n" );
    }

    return 0;
--- a/capture/src/capturedaemon.cpp
+++ b/capture/src/capturedaemon.cpp
@@ -1,505 +0,0 @@
-#ifdef _WIN32
-#  include <process.h>
-#  include <windows.h>
-#else
-#  include <unistd.h>
-#endif
-
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <fcntl.h>
-#include <filesystem>
-#include <map>
-#include <mutex>
-#include <signal.h>
-#include <string>
-#include <thread>
-#include <unordered_set>
-#include <vector>
-
-#include "../../getopt/getopt.h"
-#include "../../public/common/TracySocket.hpp"
-#include "../../public/common/TracyVersion.hpp"
-#include "../../server/TracyBroadcast.hpp"
-#include "../../server/TracyFileWrite.hpp"
-#include "../../server/TracyMemory.hpp"
-#include "../../server/TracyPrint.hpp"
-#include "../../server/TracySysUtil.hpp"
-#include "../../server/TracyWorker.hpp"
-#include "GitRef.hpp"
-
-#include "CaptureConsole.hpp"
-#include "CaptureOutput.hpp"
-
-static std::atomic<bool> g_shutdown{false};
-static std::mutex g_clientsMutex;
-static uint16_t g_listenPort = 8086;
-static std::string g_filterName;
-static int g_filterPort = 0;
-static int64_t g_memoryLimit = -1;
-static std::string g_lockFile;
-
-void SigInt( int )
-{
-    g_shutdown.store( true, std::memory_order_relaxed );
-}
-
-static void RemoveLockFile()
-{
-    std::error_code ec;
-    std::filesystem::remove( g_lockFile, ec );
-}
-
-static long ReadLockPid( const std::string& path )
-{
-    FILE* in = fopen( path.c_str(), "r" );
-    if( !in ) return -1;
-    long pid = -1;
-    const int result = fscanf( in, "%li", &pid );
-    fclose( in );
-    return ( result == 1 && pid > 0 ) ? pid : -1;
-}
-
-struct ClientStats
-{
-    std::atomic<float> mbps{0};
-    std::atomic<int64_t> txBytes{0};
-    std::atomic<int64_t> memUsage{0};
-    std::atomic<int64_t> firstTime{-1};
-};
-
-struct ClientSession
-{
-    std::string id;
-    std::string programName;
-    std::string address;
-    uint16_t port;
-    std::string outputFile;
-    std::thread thread;
-    std::atomic<bool> active{true};
-    std::atomic<bool> finished{false};
-    ClientStats stats;
-    std::atomic<uint64_t> fileSize{0};
-};
-
-static std::map<std::string, ClientSession*> g_clients;
-static std::unordered_set<std::string> g_outputFiles;
-
-[[noreturn]] void Usage()
-{
-    printf( "tracy-capture-daemon %i.%i.%i / %s\n\n", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch, tracy::GitRef );
-    printf( "Usage: tracy-capture-daemon -o <output_dir> [options]\n\n" );
-    printf( "Options:\n" );
-    printf( "  -o, --output <dir>       Output directory (required)\n" );
-    printf( "  -p, --port <port>        UDP listen port (default: 8086)\n" );
-    printf( "  -m, --memory <limit>     Memory limit per client as %% of system RAM\n" );
-    printf( "  --filter-name <pattern>  Only capture clients matching program name\n" );
-    printf( "  --filter-port <port>     Only capture clients with specific data port\n" );
-    printf( "  -h, --help               Show this help\n" );
-    printf( "  -V, --version            Show version information\n" );
-    exit( 1 );
-}
-
-std::string SanitizeName( const std::string& name )
-{
-    std::string result;
-    for( char c : name )
-    {
-        if( ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) || ( c >= '0' && c <= '9' ) || c == '_' || c == '-' )
-        {
-            result += c;
-        }
-        else if( c == ' ' || c == '\t' )
-        {
-            result += '_';
-        }
-    }
-    if( result.empty() ) result = "unknown";
-    return result;
-}
-
-std::string GenerateOutputFilename( const std::string& outputDir, const std::string& programName, const std::string& address, uint16_t port )
-{
-    std::string base = SanitizeName( programName ) + "_" + address + "_" + std::to_string( port );
-    std::string candidate = base + ".tracy";
-    std::string path = outputDir + "/" + candidate;
-    
-    int idx = 0;
-    while( g_outputFiles.count( path ) || std::filesystem::exists( path ) )
-    {
-        idx++;
-        candidate = base + "_" + std::to_string( idx ) + ".tracy";
-        path = outputDir + "/" + candidate;
-    }
-    
-    g_outputFiles.insert( path );
-    return path;
-}
-
-bool MatchesFilters( const tracy::BroadcastMessage& msg )
-{
-    if( !g_filterName.empty() )
-    {
-        if( strstr( msg.programName, g_filterName.c_str() ) == nullptr )
-        {
-            return false;
-        }
-    }
-    if( g_filterPort > 0 && msg.listenPort != g_filterPort )
-    {
-        return false;
-    }
-    return true;
-}
-
-void CaptureThread( ClientSession* session, const std::string& address, uint16_t port, int64_t memoryLimit, const std::string& outputFile )
-{
-    printf( "Connecting to %s:%u...\n", address.c_str(), port );
-    fflush( stdout );
-    
-    tracy::Worker worker( address.c_str(), port, memoryLimit );
-    
-    int result = WaitForConnection( worker );
-    if( result != 0 )
-    {
-        session->active = false;
-        session->finished = true;
-        return;
-    }
-    
-    printf( "Connected to %s (%s:%u)\n", session->programName.c_str(), address.c_str(), port );
-    
-    int64_t firstTime = worker.GetFirstTime();
-    session->stats.firstTime = firstTime;
-    
-    while( session->active && worker.IsConnected() )
-    {
-        auto& lock = worker.GetMbpsDataLock();
-        lock.lock();
-        const auto& mbpsData = worker.GetMbpsData();
-        if( !mbpsData.empty() )
-        {
-            session->stats.mbps = mbpsData.back();
-            session->stats.txBytes = worker.GetDataTransferred();
-        }
-        lock.unlock();
-        session->stats.memUsage = tracy::memUsage.load( std::memory_order_relaxed );
-        
-        std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
-    }
-
-    if( worker.IsConnected() )
-    {
-        worker.Disconnect();
-        while( worker.IsConnected() ) std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
-    }
-
-    printf( "\nSaving %s...", outputFile.c_str() );
-    fflush( stdout );
-    
-    auto file = std::unique_ptr<tracy::FileWrite>( tracy::FileWrite::Open( outputFile.c_str(), tracy::FileCompression::Zstd, 3, 4 ) );
-    if( file )
-    {
-        worker.Write( *file, false );
-        file->Finish();
-        auto stats = file->GetCompressionStatistics();
-        session->fileSize = stats.second;
-        AnsiPrintf( ANSI_GREEN ANSI_BOLD, " done!\n" );
-    }
-    else
-    {
-        AnsiPrintf( ANSI_RED ANSI_BOLD, " failed!\n" );
-    }
-    
-    session->finished = true;
-    session->active = false;
-}
-
-void RefreshDisplay( const std::string& listenAddr )
-{
-    if( !IsTerminal() ) return;
-    
-    printf( "\033[H\033[J" );
-    
-    size_t clientCount = 0;
-    {
-        std::lock_guard<std::mutex> lock( g_clientsMutex );
-        clientCount = g_clients.size();
-    }
-    
-    printf( "[%zu client%s] Listening on %s:%u... Press Ctrl+C to stop\n\n", clientCount, clientCount == 1 ? "" : "s", listenAddr.c_str(), g_listenPort );
-    
-    int idx = 1;
-    float totalMbps = 0;
-    int64_t totalTx = 0;
-    int64_t totalMem = 0;
-    
-    {
-        std::lock_guard<std::mutex> lock( g_clientsMutex );
-        for( auto& [id, session] : g_clients )
-        {
-            printf( "  [%d] %s @ %s:%u    ", idx, session->programName.c_str(), session->address.c_str(), session->port );
-            
-            if( session->finished )
-            {
-                printf( "finished (" );
-                printf( "%s", tracy::MemSizeToString( session->fileSize.load() ) );
-                printf( ")" );
-            }
-            else if( session->active )
-            {
-                float mbps = session->stats.mbps.load();
-                int64_t tx = session->stats.txBytes.load();
-                int64_t mem = session->stats.memUsage.load();
-                int64_t firstTime = session->stats.firstTime.load();
-                
-                printf( "%.1f Mbps | %s | %s", mbps, tracy::MemSizeToString( tx ), tracy::MemSizeToString( mem ) );
-                
-                totalMbps += mbps;
-                totalTx += tx;
-                totalMem += mem;
-            }
-            else
-            {
-                printf( "connecting..." );
-            }
-            printf( "\n" );
-            idx++;
-        }
-    }
-    
-    printf( "\nTotal: %.1f Mbps | %s | Mem: %s", totalMbps, tracy::MemSizeToString( totalTx ), tracy::MemSizeToString( totalMem ) );
-    fflush( stdout );
-}
-
-void PrintSummary()
-{
-    printf( "\n\n=== Capture Summary ===\n" );
-    
-    std::lock_guard<std::mutex> lock( g_clientsMutex );
-    int idx = 1;
-    int64_t totalSize = 0;
-    
-    for( auto& [id, session] : g_clients )
-    {
-        int64_t size = session->fileSize.load();
-        totalSize += size;
-        printf( "  [%d] %s @ %s:%u -> %s (%s)\n", idx++, session->programName.c_str(), session->address.c_str(), session->port, session->outputFile.c_str(), tracy::MemSizeToString( size ) );
-    }
-    
-    printf( "\nTotal: %zu files, %s\n", g_clients.size(), tracy::MemSizeToString( totalSize ) );
-}
-
-int main( int argc, char** argv )
-{
-#ifdef _WIN32
-    if( !AttachConsole( ATTACH_PARENT_PROCESS ) )
-    {
-        AllocConsole();
-        SetConsoleMode( GetStdHandle( STD_OUTPUT_HANDLE ), 0x07 );
-    }
-#endif
-    
-    std::string outputDir;
-    
-    static struct option longOptions[] = {
-        { "output", required_argument, nullptr, 'o' },
-        { "port", required_argument, nullptr, 'p' },
-        { "memory", required_argument, nullptr, 'm' },
-        { "filter-name", required_argument, nullptr, 1 },
-        { "filter-port", required_argument, nullptr, 2 },
-        { "help", no_argument, nullptr, 'h' },
-        { "version", no_argument, nullptr, 'V' },
-        { nullptr, 0, nullptr, 0 }
-    };
-    
-    int c;
-    while( ( c = getopt_long( argc, argv, "o:p:m:hV", longOptions, nullptr ) ) != -1 )
-    {
-        switch( c )
-        {
-        case 'o':
-            outputDir = optarg;
-            break;
-        case 'p':
-            g_listenPort = atoi( optarg );
-            break;
-        case 'm':
-            g_memoryLimit = std::clamp( atoll( optarg ), 1ll, 999ll ) * tracy::GetPhysicalMemorySize() / 100;
-            break;
-        case 1:
-            g_filterName = optarg;
-            break;
-        case 2:
-            g_filterPort = atoi( optarg );
-            break;
-        case 'h':
-            Usage();
-            break;
-        case 'V':
-            printf( "tracy-capture-daemon %i.%i.%i / %s\n", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch, tracy::GitRef );
-            exit( 0 );
-        default:
-            Usage();
-            break;
-        }
-    }
-    
-    if( outputDir.empty() )
-    {
-        fprintf( stderr, "Error: Output directory is required (-o)\n\n" );
-        Usage();
-    }
-    
-    std::filesystem::create_directories( outputDir );
-    
-    InitTerminalDetection();
-#ifndef _WIN32
-    g_lockFile = outputDir + "/.tracy-capture-daemon.lock";
-    {
-        int lockFd = -1;
-        for( int attempt = 0; attempt < 5; attempt++ )
-        {
-            lockFd = open( g_lockFile.c_str(), O_CREAT | O_EXCL | O_WRONLY, 0644 );
-            if( lockFd >= 0 ) break;
-            if( errno != EEXIST )
-            {
-                fprintf( stderr, "Error: Cannot create the lock file %s: %s\n", g_lockFile.c_str(), strerror( errno ) );
-                return 1;
-            }
-            const long owner = ReadLockPid( g_lockFile );
-            if( owner <= 0 )
-            {
-                fprintf( stderr, "Error: The lock file %s has no readable owner PID; remove it by hand if no daemon is running\n", g_lockFile.c_str() );
-                return 1;
-            }
-            // EPERM: the process exists under another user; treat it as alive.
-            if( kill( owner, 0 ) == 0 || errno == EPERM )
-            {
-                fprintf( stderr, "Error: Another capture daemon (pid %ld) is already using the output directory %s\n", owner, outputDir.c_str() );
-                return 1;
-            }
-            std::error_code ec;
-            std::filesystem::remove( g_lockFile, ec );
-        }
-        if( lockFd < 0 )
-        {
-            fprintf( stderr, "Error: Another capture daemon is already using the output directory %s\n", outputDir.c_str() );
-            return 1;
-        }
-        const std::string pid = std::to_string( getpid() );
-        write( lockFd, pid.c_str(), pid.size() );
-        close( lockFd );
-    }
-    atexit( RemoveLockFile );
-#endif
-#ifdef _WIN32
-    signal( SIGINT, SigInt );
-#else
-    struct sigaction sigint, oldsigint;
-    memset( &sigint, 0, sizeof( sigint ) );
-    sigint.sa_handler = SigInt;
-    sigaction( SIGINT, &sigint, &oldsigint );
-#endif
-    
-    tracy::UdpListen udpSocket;
-    if( !udpSocket.Listen( g_listenPort ) )
-    {
-        fprintf( stderr, "Error: Failed to listen on port %u\n", g_listenPort );
-        return 1;
-    }
-    
-    printf( "Listening on 0.0.0.0:%u... Press Ctrl+C to stop\n", g_listenPort );
-    printf( "Output directory: %s\n", outputDir.c_str() );
-    
-    const std::string listenAddr = "0.0.0.0";
-    auto lastDisplay = std::chrono::steady_clock::now();
-    
-    while( !g_shutdown )
-    {
-        tracy::IpAddress clientAddr;
-        size_t len;
-        const char* msg = udpSocket.Read( len, clientAddr, 100 );
-        
-        if( msg )
-        {
-            auto parsed = tracy::ParseBroadcastMessage( msg, len );
-            if( parsed )
-            {
-                std::string clientId = std::to_string( parsed->pid ) + "_" + clientAddr.GetText() + "_" + std::to_string( parsed->listenPort );
-                
-                bool isNew = false;
-                {
-                    std::lock_guard<std::mutex> lock( g_clientsMutex );
-                    isNew = g_clients.find( clientId ) == g_clients.end();
-                }
-                
-                if( isNew && MatchesFilters( *parsed ) )
-                {
-                    std::string addressStr = clientAddr.GetText();
-                    std::string outputFile = GenerateOutputFilename( outputDir, parsed->programName, addressStr, parsed->listenPort );
-                    
-                    auto session = new ClientSession();
-                    session->id = clientId;
-                    session->programName = parsed->programName;
-                    session->address = addressStr;
-                    session->port = parsed->listenPort;
-                    session->outputFile = outputFile;
-                    session->active = true;
-                    
-                    {
-                        std::lock_guard<std::mutex> lock( g_clientsMutex );
-                        g_clients[clientId] = session;
-                    }
-                    
-                    session->thread = std::thread( CaptureThread, session, addressStr, parsed->listenPort, g_memoryLimit, outputFile );
-                }
-            }
-        }
-        
-        auto now = std::chrono::steady_clock::now();
-        if( std::chrono::duration_cast<std::chrono::milliseconds>( now - lastDisplay ).count() >= 100 )
-        {
-            RefreshDisplay( listenAddr );
-            lastDisplay = now;
-        }
-    }
-    
-    printf( "\n\nShutting down... waiting for %zu client(s) to finish\n", g_clients.size() );
-    
-    {
-        std::lock_guard<std::mutex> lock( g_clientsMutex );
-        for( auto& [id, session] : g_clients )
-        {
-            session->active = false;
-        }
-    }
-    
-    {
-        std::lock_guard<std::mutex> lock( g_clientsMutex );
-        for( auto& [id, session] : g_clients )
-        {
-            if( session->thread.joinable() )
-            {
-                session->thread.join();
-            }
-        }
-    }
-    
-    PrintSummary();
-    
-    {
-        std::lock_guard<std::mutex> lock( g_clientsMutex );
-        for( auto& [id, session] : g_clients )
-        {
-            delete session;
-        }
-        g_clients.clear();
-    }
-    
-    return 0;
-}
--- a/capture/src/getopt.c
+++ b/capture/src/getopt.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>
+ * Copyright (c) 2012-2017, Kim Grasman <kim.grasman@gmail.com>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -159,7 +159,6 @@ int getopt_long(int argc, char* const argv[], const char* optstring,
  const struct option* match = NULL;
  int num_matches = 0;
  size_t argument_name_length = 0;
-  size_t option_length = 0;
  const char* current_argument = NULL;
  int retval = -1;

@@ -176,16 +175,6 @@ int getopt_long(int argc, char* const argv[], const char* optstring,
  current_argument = argv[optind] + 2;
  argument_name_length = strcspn(current_argument, "=");
  for (; o->name; ++o) {
-    /* Check for exact match first. */
-    option_length = strlen(o->name);
-    if (option_length == argument_name_length &&
-        strncmp(o->name, current_argument, option_length) == 0) {
-      match = o;
-      num_matches = 1;
-      break;
-    }
-
-    /* If not exact, count the number of abbreviated matches. */
    if (strncmp(o->name, current_argument, argument_name_length) == 0) {
      match = o;
      ++num_matches;
--- a/capture/src/getopt.h
+++ b/capture/src/getopt.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>
+ * Copyright (c) 2012-2017, Kim Grasman <kim.grasman@gmail.com>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/client/TracyCallstack.cpp
+++ b/client/TracyCallstack.cpp
@@ -0,0 +1,253 @@
+#include <stdio.h>
+#include "TracyCallstack.hpp"
+
+#ifdef TRACY_HAS_CALLSTACK
+
+#if TRACY_HAS_CALLSTACK == 1
+#  include <windows.h>
+#  pragma warning( push )
+#  pragma warning( disable : 4091 )
+#  include <dbghelp.h>
+#  pragma warning( pop )
+#elif TRACY_HAS_CALLSTACK >= 2
+#  include <dlfcn.h>
+#  include <cxxabi.h>
+#endif
+
+namespace tracy
+{
+
+#if TRACY_HAS_CALLSTACK == 1
+
+extern "C" t_RtlWalkFrameChain RtlWalkFrameChain = 0;
+
+void InitCallstack()
+{
+#ifdef UNICODE
+    RtlWalkFrameChain = (t_RtlWalkFrameChain)GetProcAddress( GetModuleHandle( L"ntdll.dll" ), "RtlWalkFrameChain" );
+#else
+    RtlWalkFrameChain = (t_RtlWalkFrameChain)GetProcAddress( GetModuleHandle( "ntdll.dll" ), "RtlWalkFrameChain" );
+#endif
+    SymInitialize( GetCurrentProcess(), nullptr, true );
+    SymSetOptions( SYMOPT_LOAD_LINES );
+}
+
+CallstackEntry DecodeCallstackPtr( uint64_t ptr )
+{
+    CallstackEntry ret;
+
+    const auto proc = GetCurrentProcess();
+
+    char buf[sizeof( SYMBOL_INFO ) + 1024];
+    auto si = (SYMBOL_INFO*)buf;
+    si->SizeOfStruct = sizeof( SYMBOL_INFO );
+    si->MaxNameLen = 1024;
+
+    if( SymFromAddr( proc, ptr, nullptr, si ) == 0 )
+    {
+        memcpy( si->Name, "[unknown]", 10 );
+        si->NameLen = 9;
+    }
+
+    auto name = (char*)tracy_malloc( si->NameLen + 1 );
+    memcpy( name, si->Name, si->NameLen );
+    name[si->NameLen] = '\0';
+
+    ret.name = name;
+
+    const char* filename;
+    IMAGEHLP_LINE64 line;
+    DWORD displacement = 0;
+    line.SizeOfStruct = sizeof( IMAGEHLP_LINE64 );
+    if( SymGetLineFromAddr64( proc, ptr, &displacement, &line ) == 0 )
+    {
+        filename = "[unknown]";
+        ret.line = 0;
+    }
+    else
+    {
+        filename = line.FileName;
+        ret.line = line.LineNumber;
+    }
+
+    const auto fsz = strlen( filename );
+    auto file = (char*)tracy_malloc( fsz + 1 );
+    memcpy( file, filename, fsz );
+    file[fsz] = '\0';
+
+    ret.file = file;
+
+    return ret;
+}
+
+#elif TRACY_HAS_CALLSTACK == 2
+
+CallstackEntry DecodeCallstackPtr( uint64_t ptr )
+{
+    CallstackEntry ret;
+    ret.line = 0;
+
+    char* demangled = nullptr;
+    const char* symname = nullptr;
+    const char* symloc = nullptr;
+    auto vptr = (void*)ptr;
+    char** sym = nullptr;
+    ptrdiff_t symoff = 0;
+
+    Dl_info dlinfo;
+    if( dladdr( vptr, &dlinfo ) )
+    {
+        symloc = dlinfo.dli_fname;
+        symname = dlinfo.dli_sname;
+        symoff = (char*)ptr - (char*)dlinfo.dli_saddr;
+
+        if( symname && symname[0] == '_' )
+        {
+            size_t len = 0;
+            int status;
+            demangled = abi::__cxa_demangle( symname, nullptr, &len, &status );
+            if( status == 0 )
+            {
+                symname = demangled;
+            }
+        }
+    }
+
+    if( !symname )
+    {
+        symname = "[unknown]";
+    }
+    if( !symloc )
+    {
+        symloc = "[unknown]";
+    }
+
+    if( symoff == 0 )
+    {
+        const auto namelen = strlen( symname );
+        auto name = (char*)tracy_malloc( namelen + 1 );
+        memcpy( name, symname, namelen );
+        name[namelen] = '\0';
+        ret.name = name;
+    }
+    else
+    {
+        char buf[32];
+        sprintf( buf, " + %td", symoff );
+        const auto offlen = strlen( buf );
+        const auto namelen = strlen( symname );
+        auto name = (char*)tracy_malloc( namelen + offlen + 1 );
+        memcpy( name, symname, namelen );
+        memcpy( name + namelen, buf, offlen );
+        name[namelen + offlen] = '\0';
+        ret.name = name;
+    }
+
+    char buf[32];
+    sprintf( buf, " [%p]", (void*)ptr );
+    const auto addrlen = strlen( buf );
+    const auto loclen = strlen( symloc );
+    auto loc = (char*)tracy_malloc( loclen + addrlen + 1 );
+    memcpy( loc, symloc, loclen );
+    memcpy( loc + loclen, buf, addrlen );
+    loc[loclen + addrlen] = '\0';
+    ret.file = loc;
+
+    if( sym ) free( sym );
+    if( demangled ) free( demangled );
+
+    return ret;
+}
+
+#elif TRACY_HAS_CALLSTACK == 3
+
+CallstackEntry DecodeCallstackPtr( uint64_t ptr )
+{
+    CallstackEntry ret;
+    ret.line = 0;
+
+    char* demangled = nullptr;
+    const char* symname = nullptr;
+    const char* symloc = nullptr;
+    auto vptr = (void*)ptr;
+    char** sym = nullptr;
+    ptrdiff_t symoff = 0;
+
+    Dl_info dlinfo;
+    if( dladdr( vptr, &dlinfo ) )
+    {
+        symloc = dlinfo.dli_fname;
+        symname = dlinfo.dli_sname;
+        symoff = (char*)ptr - (char*)dlinfo.dli_saddr;
+
+        if( symname && symname[0] == '_' )
+        {
+            size_t len = 0;
+            int status;
+            demangled = abi::__cxa_demangle( symname, nullptr, &len, &status );
+            if( status == 0 )
+            {
+                symname = demangled;
+            }
+        }
+    }
+
+    if( !symname )
+    {
+        sym = backtrace_symbols( &vptr, 1 );
+        if( !sym )
+        {
+            symname = "[unknown]";
+        }
+        else
+        {
+            symname = *sym;
+        }
+    }
+    if( !symloc )
+    {
+        symloc = "[unknown]";
+    }
+
+    if( symoff == 0 )
+    {
+        const auto namelen = strlen( symname );
+        auto name = (char*)tracy_malloc( namelen + 1 );
+        memcpy( name, symname, namelen );
+        name[namelen] = '\0';
+        ret.name = name;
+    }
+    else
+    {
+        char buf[32];
+        sprintf( buf, " + %td", symoff );
+        const auto offlen = strlen( buf );
+        const auto namelen = strlen( symname );
+        auto name = (char*)tracy_malloc( namelen + offlen + 1 );
+        memcpy( name, symname, namelen );
+        memcpy( name + namelen, buf, offlen );
+        name[namelen + offlen] = '\0';
+        ret.name = name;
+    }
+
+    char buf[32];
+    sprintf( buf, " [%p]", (void*)ptr );
+    const auto addrlen = strlen( buf );
+    const auto loclen = strlen( symloc );
+    auto loc = (char*)tracy_malloc( loclen + addrlen + 1 );
+    memcpy( loc, symloc, loclen );
+    memcpy( loc + loclen, buf, addrlen );
+    loc[loclen + addrlen] = '\0';
+    ret.file = loc;
+
+    if( sym ) free( sym );
+    if( demangled ) free( demangled );
+
+    return ret;
+}
+
+#endif
+
+}
+
+#endif
--- a/client/TracyCallstack.hpp
+++ b/client/TracyCallstack.hpp
@@ -0,0 +1,117 @@
+#ifndef __TRACYCALLSTACK_HPP__
+#define __TRACYCALLSTACK_HPP__
+
+#if defined _WIN32 || defined __CYGWIN__
+#  define TRACY_HAS_CALLSTACK 1
+extern "C"
+{
+    typedef unsigned long (__stdcall *t_RtlWalkFrameChain)( void**, unsigned long, unsigned long );
+    extern t_RtlWalkFrameChain RtlWalkFrameChain;
+}
+#elif defined __ANDROID__
+#  define TRACY_HAS_CALLSTACK 2
+#  include <unwind.h>
+#elif defined __linux
+#  if defined _GNU_SOURCE && defined __GLIBC__
+#    define TRACY_HAS_CALLSTACK 3
+#    include <execinfo.h>
+#  else
+#    define TRACY_HAS_CALLSTACK 2
+#    include <unwind.h>
+#  endif
+#endif
+
+
+#ifdef TRACY_HAS_CALLSTACK
+
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "../common/TracyAlloc.hpp"
+#include "../common/TracyForceInline.hpp"
+
+namespace tracy
+{
+
+struct CallstackEntry
+{
+    const char* name;
+    const char* file;
+    uint32_t line;
+};
+
+CallstackEntry DecodeCallstackPtr( uint64_t ptr );
+
+#if TRACY_HAS_CALLSTACK == 1
+
+void InitCallstack();
+
+static tracy_force_inline void* Callstack( int depth )
+{
+    assert( depth >= 1 && depth < 63 );
+
+    auto trace = (uintptr_t*)tracy_malloc( ( 1 + depth ) * sizeof( uintptr_t ) );
+    const auto num = RtlWalkFrameChain( (void**)( trace + 1 ), depth, 0 );
+    *trace = num;
+
+    return trace;
+}
+
+#elif TRACY_HAS_CALLSTACK == 2
+
+static tracy_force_inline void InitCallstack() {}
+
+struct BacktraceState
+{
+    void** current;
+    void** end;
+};
+
+static _Unwind_Reason_Code tracy_unwind_callback( struct _Unwind_Context* ctx, void* arg )
+{
+    auto state = (BacktraceState*)arg;
+    uintptr_t pc = _Unwind_GetIP( ctx );
+    if( pc )
+    {
+        if( state->current == state->end ) return _URC_END_OF_STACK;
+        *state->current++ = (void*)pc;
+    }
+    return _URC_NO_REASON;
+}
+
+static tracy_force_inline void* Callstack( int depth )
+{
+    assert( depth >= 1 && depth < 63 );
+
+    auto trace = (uintptr_t*)tracy_malloc( ( 1 + depth ) * sizeof( uintptr_t ) );
+    BacktraceState state = { (void**)(trace+1), (void**)(trace+1+depth) };
+    _Unwind_Backtrace( tracy_unwind_callback, &state );
+
+    *trace = (uintptr_t*)state.current - trace + 1;
+
+    return trace;
+}
+
+#elif TRACY_HAS_CALLSTACK == 3
+
+static tracy_force_inline void InitCallstack() {}
+
+static tracy_force_inline void* Callstack( int depth )
+{
+    assert( depth >= 1 );
+
+    auto trace = (uintptr_t*)tracy_malloc( ( 1 + depth ) * sizeof( uintptr_t ) );
+    const auto num = backtrace( (void**)(trace+1), depth );
+    *trace = num;
+
+    return trace;
+}
+
+#endif
+
+}
+
+#endif
+
+#endif
--- a/public/client/TracyFastVector.hpp
+++ b/public/client/TracyFastVector.hpp
@@ -4,7 +4,6 @@
 #include <stddef.h>

 #include "../common/TracyAlloc.hpp"
-#include "../common/TracyAssert.hpp"
 #include "../common/TracyForceInline.hpp"

 namespace tracy
@@ -22,7 +21,6 @@ public:
        , m_write( m_ptr )
        , m_end( m_ptr + capacity )
    {
-        TRACY_ASSERT( capacity != 0 );
    }

    FastVector( const FastVector& ) = delete;
@@ -47,11 +45,11 @@ public:
    T* end() { return m_write; }
    const T* end() const { return m_write; }

-    T& front() { TRACY_ASSERT( !empty() ); return m_ptr[0]; }
-    const T& front() const { TRACY_ASSERT( !empty() ); return m_ptr[0]; }
+    T& front() { assert( !empty() ); return m_ptr[0]; }
+    const T& front() const { assert( !empty() ); return m_ptr[0]; }

-    T& back() { TRACY_ASSERT( !empty() ); return m_write[-1]; }
-    const T& back() const { TRACY_ASSERT( !empty() ); return m_write[-1]; }
+    T& back() { assert( !empty() ); return m_write[-1]; }
+    const T& back() const { assert( !empty() ); return m_write[-1]; }

    T& operator[]( size_t idx ) { return m_ptr[idx]; }
    const T& operator[]( size_t idx ) const { return m_ptr[idx]; }
@@ -98,11 +96,11 @@ public:
 private:
    tracy_no_inline void AllocMore()
    {
-        const auto cap = size_t( m_end - m_ptr ) * 2;
-        const auto size = size_t( m_write - m_ptr );
+        const auto cap = ( m_end - m_ptr ) * 2;
+        const auto size = m_write - m_ptr;
        T* ptr = (T*)tracy_malloc( sizeof( T ) * cap );
        memcpy( ptr, m_ptr, size * sizeof( T ) );
-        tracy_free_fast( m_ptr );
+        tracy_free( m_ptr );
        m_ptr = ptr;
        m_write = m_ptr + size;
        m_end = m_ptr + cap;
--- a/client/TracyLock.hpp
+++ b/client/TracyLock.hpp
@@ -0,0 +1,473 @@
+#ifndef __TRACYLOCK_HPP__
+#define __TRACYLOCK_HPP__
+
+#include <atomic>
+#include <limits>
+
+#include "../common/TracySystem.hpp"
+#include "../common/TracyAlign.hpp"
+#include "TracyProfiler.hpp"
+
+namespace tracy
+{
+
+extern std::atomic<uint32_t> s_lockCounter;
+
+template<class T>
+class Lockable
+{
+public:
+    tracy_force_inline Lockable( const SourceLocationData* srcloc )
+        : m_id( s_lockCounter.fetch_add( 1, std::memory_order_relaxed ) )
+#ifdef TRACY_ON_DEMAND
+        , m_lockCount( 0 )
+        , m_active( false )
+#endif
+    {
+        assert( m_id != std::numeric_limits<uint32_t>::max() );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockAnnounce );
+        MemWrite( &item->lockAnnounce.id, m_id );
+        MemWrite( &item->lockAnnounce.lckloc, (uint64_t)srcloc );
+        MemWrite( &item->lockAnnounce.type, LockType::Lockable );
+
+#ifdef TRACY_ON_DEMAND
+        s_profiler.DeferItem( *item );
+#endif
+
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    Lockable( const Lockable& ) = delete;
+    Lockable& operator=( const Lockable& ) = delete;
+
+    tracy_force_inline void lock()
+    {
+#ifdef TRACY_ON_DEMAND
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue )
+        {
+            m_lockable.lock();
+            return;
+        }
+#endif
+        const auto thread = GetThreadHandle();
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockWait );
+            MemWrite( &item->lockWait.id, m_id );
+            MemWrite( &item->lockWait.thread, thread );
+            MemWrite( &item->lockWait.time, Profiler::GetTime() );
+            MemWrite( &item->lockWait.type, LockType::Lockable );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        m_lockable.lock();
+
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, thread );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+    }
+
+    tracy_force_inline void unlock()
+    {
+        m_lockable.unlock();
+
+#ifdef TRACY_ON_DEMAND
+        m_lockCount.fetch_sub( 1, std::memory_order_relaxed );
+        if( !m_active.load( std::memory_order_relaxed ) ) return;
+        if( !s_profiler.IsConnected() )
+        {
+            m_active.store( false, std::memory_order_relaxed );
+            return;
+        }
+#endif
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockRelease );
+        MemWrite( &item->lockRelease.id, m_id );
+        MemWrite( &item->lockRelease.thread, GetThreadHandle() );
+        MemWrite( &item->lockRelease.time, Profiler::GetTime() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline bool try_lock()
+    {
+        const auto ret = m_lockable.try_lock();
+
+#ifdef TRACY_ON_DEMAND
+        if( !ret ) return ret;
+
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue ) return ret;
+#endif
+
+        if( ret )
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, GetThreadHandle() );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        return ret;
+    }
+
+    tracy_force_inline void Mark( const SourceLocationData* srcloc )
+    {
+#ifdef TRACY_ON_DEMAND
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( !active ) return;
+        const auto connected = s_profiler.IsConnected();
+        if( !connected )
+        {
+            if( active ) m_active.store( false, std::memory_order_relaxed );
+            return;
+        }
+#endif
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockMark );
+        MemWrite( &item->lockMark.id, m_id );
+        MemWrite( &item->lockMark.thread, GetThreadHandle() );
+        MemWrite( &item->lockMark.srcloc, (uint64_t)srcloc );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+private:
+    T m_lockable;
+    uint32_t m_id;
+
+#ifdef TRACY_ON_DEMAND
+    std::atomic<uint32_t> m_lockCount;
+    std::atomic<bool> m_active;
+#endif
+};
+
+
+template<class T>
+class SharedLockable
+{
+public:
+    tracy_force_inline SharedLockable( const SourceLocationData* srcloc )
+        : m_id( s_lockCounter.fetch_add( 1, std::memory_order_relaxed ) )
+#ifdef TRACY_ON_DEMAND
+        , m_lockCount( 0 )
+        , m_active( false )
+#endif
+    {
+        assert( m_id != std::numeric_limits<uint32_t>::max() );
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockAnnounce );
+        MemWrite( &item->lockAnnounce.id, m_id );
+        MemWrite( &item->lockAnnounce.lckloc, (uint64_t)srcloc );
+        MemWrite( &item->lockAnnounce.type, LockType::SharedLockable );
+
+#ifdef TRACY_ON_DEMAND
+        s_profiler.DeferItem( *item );
+#endif
+
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    SharedLockable( const SharedLockable& ) = delete;
+    SharedLockable& operator=( const SharedLockable& ) = delete;
+
+    tracy_force_inline void lock()
+    {
+#ifdef TRACY_ON_DEMAND
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue )
+        {
+            m_lockable.lock();
+            return;
+        }
+#endif
+        const auto thread = GetThreadHandle();
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockWait );
+            MemWrite( &item->lockWait.id, m_id );
+            MemWrite( &item->lockWait.thread, thread );
+            MemWrite( &item->lockWait.time, Profiler::GetTime() );
+            MemWrite( &item->lockWait.type, LockType::SharedLockable );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        m_lockable.lock();
+
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, thread );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+    }
+
+    tracy_force_inline void unlock()
+    {
+        m_lockable.unlock();
+
+#ifdef TRACY_ON_DEMAND
+        m_lockCount.fetch_sub( 1, std::memory_order_relaxed );
+        if( !m_active.load( std::memory_order_relaxed ) ) return;
+        if( !s_profiler.IsConnected() )
+        {
+            m_active.store( false, std::memory_order_relaxed );
+            return;
+        }
+#endif
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockRelease );
+        MemWrite( &item->lockRelease.id, m_id );
+        MemWrite( &item->lockRelease.thread, GetThreadHandle() );
+        MemWrite( &item->lockRelease.time, Profiler::GetTime() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline bool try_lock()
+    {
+        const auto ret = m_lockable.try_lock();
+
+#ifdef TRACY_ON_DEMAND
+        if( !ret ) return ret;
+
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue ) return ret;
+#endif
+
+        if( ret )
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, GetThreadHandle() );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        return ret;
+    }
+
+    tracy_force_inline void lock_shared()
+    {
+#ifdef TRACY_ON_DEMAND
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue )
+        {
+            m_lockable.lock_shared();
+            return;
+        }
+#endif
+        const auto thread = GetThreadHandle();
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockSharedWait );
+            MemWrite( &item->lockWait.id, m_id );
+            MemWrite( &item->lockWait.thread, thread );
+            MemWrite( &item->lockWait.time, Profiler::GetTime() );
+            MemWrite( &item->lockWait.type, LockType::SharedLockable );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        m_lockable.lock_shared();
+
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockSharedObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, thread );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+    }
+
+    tracy_force_inline void unlock_shared()
+    {
+        m_lockable.unlock_shared();
+
+#ifdef TRACY_ON_DEMAND
+        m_lockCount.fetch_sub( 1, std::memory_order_relaxed );
+        if( !m_active.load( std::memory_order_relaxed ) ) return;
+        if( !s_profiler.IsConnected() )
+        {
+            m_active.store( false, std::memory_order_relaxed );
+            return;
+        }
+#endif
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockSharedRelease );
+        MemWrite( &item->lockRelease.id, m_id );
+        MemWrite( &item->lockRelease.thread, GetThreadHandle() );
+        MemWrite( &item->lockRelease.time, Profiler::GetTime() );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline bool try_lock_shared()
+    {
+        const auto ret = m_lockable.try_lock_shared();
+
+#ifdef TRACY_ON_DEMAND
+        if( !ret ) return ret;
+
+        bool queue = false;
+        const auto locks = m_lockCount.fetch_add( 1, std::memory_order_relaxed );
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( locks == 0 || active )
+        {
+            const bool connected = s_profiler.IsConnected();
+            if( active != connected ) m_active.store( connected, std::memory_order_relaxed );
+            if( connected ) queue = true;
+        }
+        if( !queue ) return ret;
+#endif
+
+        if( ret )
+        {
+            Magic magic;
+            auto& token = s_token.ptr;
+            auto& tail = token->get_tail_index();
+            auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+            MemWrite( &item->hdr.type, QueueType::LockSharedObtain );
+            MemWrite( &item->lockObtain.id, m_id );
+            MemWrite( &item->lockObtain.thread, GetThreadHandle() );
+            MemWrite( &item->lockObtain.time, Profiler::GetTime() );
+            tail.store( magic + 1, std::memory_order_release );
+        }
+
+        return ret;
+    }
+
+    tracy_force_inline void Mark( const SourceLocationData* srcloc )
+    {
+#ifdef TRACY_ON_DEMAND
+        const auto active = m_active.load( std::memory_order_relaxed );
+        if( !active ) return;
+        const auto connected = s_profiler.IsConnected();
+        if( !connected )
+        {
+            if( active ) m_active.store( false, std::memory_order_relaxed );
+            return;
+        }
+#endif
+
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::LockMark );
+        MemWrite( &item->lockMark.id, m_id );
+        MemWrite( &item->lockMark.thread, GetThreadHandle() );
+        MemWrite( &item->lockMark.srcloc, (uint64_t)srcloc );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+private:
+    T m_lockable;
+    uint32_t m_id;
+
+#ifdef TRACY_ON_DEMAND
+    std::atomic<uint32_t> m_lockCount;
+    std::atomic<bool> m_active;
+#endif
+};
+
+
+};
+
+#endif
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -0,0 +1,459 @@
+#ifndef __TRACYPROFILER_HPP__
+#define __TRACYPROFILER_HPP__
+
+#include <assert.h>
+#include <atomic>
+#include <chrono>
+#include <stdint.h>
+#include <string.h>
+
+#include "concurrentqueue.h"
+#include "TracyCallstack.hpp"
+#include "TracyFastVector.hpp"
+#include "../common/tracy_lz4.hpp"
+#include "../common/TracyQueue.hpp"
+#include "../common/TracyAlign.hpp"
+#include "../common/TracyAlloc.hpp"
+#include "../common/TracyMutex.hpp"
+#include "../common/TracySystem.hpp"
+
+#if defined _MSC_VER || defined __CYGWIN__
+#  include <intrin.h>
+#endif
+
+#if defined _MSC_VER || defined __CYGWIN__ || ( ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) && !defined __ANDROID__ ) || __ARM_ARCH >= 6
+#  define TRACY_HW_TIMER
+#  if defined _MSC_VER || defined __CYGWIN__
+     // Enable optimization for MSVC __rdtscp() intrin, saving one LHS of a cpu value on the stack.
+     // This comes at the cost of an unaligned memory write.
+#    define TRACY_RDTSCP_OPT
+#  endif
+#endif
+
+#define TracyConcat(x,y) TracyConcatIndirect(x,y)
+#define TracyConcatIndirect(x,y) x##y
+
+namespace tracy
+{
+
+class Socket;
+
+struct SourceLocationData
+{
+    const char* name;
+    const char* function;
+    const char* file;
+    uint32_t line;
+    uint32_t color;
+};
+
+struct ProducerWrapper
+{
+    tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* ptr;
+};
+
+extern thread_local ProducerWrapper s_token;
+
+class GpuCtx;
+struct GpuCtxWrapper
+{
+    GpuCtx* ptr;
+};
+
+class VkCtx;
+struct VkCtxWrapper
+{
+    VkCtx* ptr;
+};
+
+#ifdef TRACY_ON_DEMAND
+struct LuaZoneState
+{
+    uint32_t counter;
+    bool active;
+};
+#endif
+
+using Magic = tracy::moodycamel::ConcurrentQueueDefaultTraits::index_t;
+
+#if __ARM_ARCH >= 6
+extern int64_t (*GetTimeImpl)();
+#endif
+
+class Profiler;
+extern Profiler& s_profiler;
+
+class Profiler
+{
+public:
+    Profiler();
+    ~Profiler();
+
+    static tracy_force_inline int64_t GetTime( uint32_t& cpu )
+    {
+#ifdef TRACY_HW_TIMER
+#  if __ARM_ARCH >= 6
+        cpu = 0xFFFFFFFF;
+        return GetTimeImpl();
+#  elif defined _MSC_VER || defined __CYGWIN__
+        const auto t = int64_t( __rdtscp( &cpu ) );
+        return t;
+#  elif defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64
+        uint32_t eax, edx;
+        asm volatile ( "rdtscp" : "=a" (eax), "=d" (edx), "=c" (cpu) :: );
+        return ( uint64_t( edx ) << 32 ) + uint64_t( eax );
+#  endif
+#else
+        cpu = 0xFFFFFFFF;
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+#endif
+    }
+
+    static tracy_force_inline int64_t GetTime()
+    {
+#ifdef TRACY_HW_TIMER
+#  if __ARM_ARCH >= 6
+        return GetTimeImpl();
+#  elif defined _MSC_VER || defined __CYGWIN__
+        unsigned int dontcare;
+        const auto t = int64_t( __rdtscp( &dontcare ) );
+        return t;
+#  elif defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64
+        uint32_t eax, edx;
+        asm volatile ( "rdtscp" : "=a" (eax), "=d" (edx) :: "%ecx" );
+        return ( uint64_t( edx ) << 32 ) + uint64_t( eax );
+#  endif
+#else
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+#endif
+    }
+
+    static tracy_force_inline void SendFrameMark()
+    {
+#ifdef TRACY_ON_DEMAND
+        s_profiler.m_frameCount.fetch_add( 1, std::memory_order_relaxed );
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::FrameMarkMsg );
+        MemWrite( &item->frameMark.time, GetTime() );
+        MemWrite( &item->frameMark.name, uint64_t( 0 ) );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void SendFrameMark( const char* name, QueueType type )
+    {
+        assert( type == QueueType::FrameMarkMsg || type == QueueType::FrameMarkMsgStart || type == QueueType::FrameMarkMsgEnd );
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, type );
+        MemWrite( &item->frameMark.time, GetTime() );
+        MemWrite( &item->frameMark.name, uint64_t( name ) );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void PlotData( const char* name, int64_t val )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::PlotData );
+        MemWrite( &item->plotData.name, (uint64_t)name );
+        MemWrite( &item->plotData.time, GetTime() );
+        MemWrite( &item->plotData.type, PlotDataType::Int );
+        MemWrite( &item->plotData.data.i, val );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void PlotData( const char* name, float val )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::PlotData );
+        MemWrite( &item->plotData.name, (uint64_t)name );
+        MemWrite( &item->plotData.time, GetTime() );
+        MemWrite( &item->plotData.type, PlotDataType::Float );
+        MemWrite( &item->plotData.data.f, val );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void PlotData( const char* name, double val )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::PlotData );
+        MemWrite( &item->plotData.name, (uint64_t)name );
+        MemWrite( &item->plotData.time, GetTime() );
+        MemWrite( &item->plotData.type, PlotDataType::Double );
+        MemWrite( &item->plotData.data.d, val );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void Message( const char* txt, size_t size )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto ptr = (char*)tracy_malloc( size+1 );
+        memcpy( ptr, txt, size );
+        ptr[size] = '\0';
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::Message );
+        MemWrite( &item->message.time, GetTime() );
+        MemWrite( &item->message.thread, GetThreadHandle() );
+        MemWrite( &item->message.text, (uint64_t)ptr );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void Message( const char* txt )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::MessageLiteral );
+        MemWrite( &item->message.time, GetTime() );
+        MemWrite( &item->message.thread, GetThreadHandle() );
+        MemWrite( &item->message.text, (uint64_t)txt );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    static tracy_force_inline void MemAlloc( const void* ptr, size_t size )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        const auto thread = GetThreadHandle();
+
+        s_profiler.m_serialLock.lock();
+        SendMemAlloc( QueueType::MemAlloc, thread, ptr, size );
+        s_profiler.m_serialLock.unlock();
+    }
+
+    static tracy_force_inline void MemFree( const void* ptr )
+    {
+#ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#endif
+        const auto thread = GetThreadHandle();
+
+        s_profiler.m_serialLock.lock();
+        SendMemFree( QueueType::MemFree, thread, ptr );
+        s_profiler.m_serialLock.unlock();
+    }
+
+    static tracy_force_inline void MemAllocCallstack( const void* ptr, size_t size, int depth )
+    {
+#ifdef TRACY_HAS_CALLSTACK
+#  ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#  endif
+        const auto thread = GetThreadHandle();
+
+        rpmalloc_thread_initialize();
+        auto callstack = Callstack( depth );
+
+        s_profiler.m_serialLock.lock();
+        SendMemAlloc( QueueType::MemAllocCallstack, thread, ptr, size );
+        SendCallstackMemory( callstack );
+        s_profiler.m_serialLock.unlock();
+#else
+        MemAlloc( ptr, size );
+#endif
+    }
+
+    static tracy_force_inline void MemFreeCallstack( const void* ptr, int depth )
+    {
+#ifdef TRACY_HAS_CALLSTACK
+#  ifdef TRACY_ON_DEMAND
+        if( !s_profiler.IsConnected() ) return;
+#  endif
+        const auto thread = GetThreadHandle();
+
+        rpmalloc_thread_initialize();
+        auto callstack = Callstack( depth );
+
+        s_profiler.m_serialLock.lock();
+        SendMemFree( QueueType::MemFreeCallstack, thread, ptr );
+        SendCallstackMemory( callstack );
+        s_profiler.m_serialLock.unlock();
+#else
+        MemFree( ptr );
+#endif
+    }
+
+    static tracy_force_inline void SendCallstack( int depth, uint64_t thread )
+    {
+#ifdef TRACY_HAS_CALLSTACK
+        auto ptr = Callstack( depth );
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::Callstack );
+        MemWrite( &item->callstack.ptr, ptr );
+        MemWrite( &item->callstack.thread, thread );
+        tail.store( magic + 1, std::memory_order_release );
+#endif
+    }
+
+    void SendCallstack( int depth, uint64_t thread, const char* skipBefore );
+
+    static bool ShouldExit();
+
+#ifdef TRACY_ON_DEMAND
+    tracy_force_inline bool IsConnected()
+    {
+        return m_isConnected.load( std::memory_order_relaxed );
+    }
+
+    tracy_force_inline void DeferItem( const QueueItem& item )
+    {
+        m_deferredLock.lock();
+        auto dst = m_deferredQueue.push_next();
+        memcpy( dst, &item, sizeof( item ) );
+        m_deferredLock.unlock();
+    }
+#endif
+
+    void RequestShutdown() { m_shutdown.store( true, std::memory_order_relaxed ); m_shutdownManual.store( true, std::memory_order_relaxed ); }
+    bool HasShutdownFinished() const { return m_shutdownFinished.load( std::memory_order_relaxed ); }
+
+private:
+    enum DequeueStatus { Success, ConnectionLost, QueueEmpty };
+
+    static void LaunchWorker( void* ptr ) { ((Profiler*)ptr)->Worker(); }
+    void Worker();
+
+    void ClearQueues( tracy::moodycamel::ConsumerToken& token );
+    DequeueStatus Dequeue( tracy::moodycamel::ConsumerToken& token );
+    DequeueStatus DequeueSerial();
+    bool AppendData( const void* data, size_t len );
+    bool CommitData();
+    bool NeedDataSize( size_t len );
+
+    tracy_force_inline void AppendDataUnsafe( const void* data, size_t len )
+    {
+        memcpy( m_buffer + m_bufferOffset, data, len );
+        m_bufferOffset += int( len );
+    }
+
+    bool SendData( const char* data, size_t len );
+    void SendString( uint64_t ptr, const char* str, QueueType type );
+    void SendSourceLocation( uint64_t ptr );
+    void SendSourceLocationPayload( uint64_t ptr );
+    void SendCallstackPayload( uint64_t ptr );
+    void SendCallstackFrame( uint64_t ptr );
+
+    bool HandleServerQuery();
+
+    void CalibrateTimer();
+    void CalibrateDelay();
+
+    static tracy_force_inline void SendCallstackMemory( void* ptr )
+    {
+#ifdef TRACY_HAS_CALLSTACK
+        auto item = s_profiler.m_serialQueue.prepare_next();
+        MemWrite( &item->hdr.type, QueueType::CallstackMemory );
+        MemWrite( &item->callstackMemory.ptr, (uint64_t)ptr );
+        s_profiler.m_serialQueue.commit_next();
+#endif
+    }
+
+    static tracy_force_inline void SendMemAlloc( QueueType type, const uint64_t thread, const void* ptr, size_t size )
+    {
+        assert( type == QueueType::MemAlloc || type == QueueType::MemAllocCallstack );
+
+        auto item = s_profiler.m_serialQueue.prepare_next();
+        MemWrite( &item->hdr.type, type );
+        MemWrite( &item->memAlloc.time, GetTime() );
+        MemWrite( &item->memAlloc.thread, thread );
+        MemWrite( &item->memAlloc.ptr, (uint64_t)ptr );
+        if( compile_time_condition<sizeof( size ) == 4>::value )
+        {
+            memcpy( &item->memAlloc.size, &size, 4 );
+            memset( &item->memAlloc.size + 4, 0, 2 );
+        }
+        else
+        {
+            assert( sizeof( size ) == 8 );
+            memcpy( &item->memAlloc.size, &size, 6 );
+        }
+        s_profiler.m_serialQueue.commit_next();
+    }
+
+    static tracy_force_inline void SendMemFree( QueueType type, const uint64_t thread, const void* ptr )
+    {
+        assert( type == QueueType::MemFree || type == QueueType::MemFreeCallstack );
+
+        auto item = s_profiler.m_serialQueue.prepare_next();
+        MemWrite( &item->hdr.type, type );
+        MemWrite( &item->memFree.time, GetTime() );
+        MemWrite( &item->memFree.thread, thread );
+        MemWrite( &item->memFree.ptr, (uint64_t)ptr );
+        s_profiler.m_serialQueue.commit_next();
+    }
+
+    double m_timerMul;
+    uint64_t m_resolution;
+    uint64_t m_delay;
+    std::atomic<int64_t> m_timeBegin;
+    uint64_t m_mainThread;
+    uint64_t m_epoch;
+    std::atomic<bool> m_shutdown;
+    std::atomic<bool> m_shutdownManual;
+    std::atomic<bool> m_shutdownFinished;
+    Socket* m_sock;
+    bool m_noExit;
+
+    LZ4_stream_t* m_stream;
+    char* m_buffer;
+    int m_bufferOffset;
+    int m_bufferStart;
+
+    QueueItem* m_itemBuf;
+    char* m_lz4Buf;
+
+    FastVector<QueueItem> m_serialQueue, m_serialDequeue;
+    TracyMutex m_serialLock;
+
+#ifdef TRACY_ON_DEMAND
+    std::atomic<bool> m_isConnected;
+    std::atomic<uint64_t> m_frameCount;
+
+    TracyMutex m_deferredLock;
+    FastVector<QueueItem> m_deferredQueue;
+#endif
+};
+
+};
+
+#endif
--- a/client/TracyScoped.hpp
+++ b/client/TracyScoped.hpp
@@ -0,0 +1,132 @@
+#ifndef __TRACYSCOPED_HPP__
+#define __TRACYSCOPED_HPP__
+
+#include <stdint.h>
+#include <string.h>
+
+#include "../common/TracySystem.hpp"
+#include "../common/TracyAlign.hpp"
+#include "../common/TracyAlloc.hpp"
+#include "TracyProfiler.hpp"
+
+namespace tracy
+{
+
+class ScopedZone
+{
+public:
+    tracy_force_inline ScopedZone( const SourceLocationData* srcloc, bool is_active = true )
+#ifdef TRACY_ON_DEMAND
+        : m_active( s_profiler.IsConnected() )
+#else
+        : m_active( is_active )
+#endif
+    {
+        if( !m_active ) return;
+        const auto thread = GetThreadHandle();
+        m_thread = thread;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::ZoneBegin );
+#ifdef TRACY_RDTSCP_OPT
+        MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) );
+#else
+        uint32_t cpu;
+        MemWrite( &item->zoneBegin.time, Profiler::GetTime( cpu ) );
+        MemWrite( &item->zoneBegin.cpu, cpu );
+#endif
+        MemWrite( &item->zoneBegin.thread, thread );
+        MemWrite( &item->zoneBegin.srcloc, (uint64_t)srcloc );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline ScopedZone( const SourceLocationData* srcloc, int depth, bool is_active = true )
+#ifdef TRACY_ON_DEMAND
+        : m_active( s_profiler.IsConnected() )
+#else
+        : m_active( is_active )
+#endif
+    {
+        if( !m_active ) return;
+        const auto thread = GetThreadHandle();
+        m_thread = thread;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::ZoneBeginCallstack );
+#ifdef TRACY_RDTSCP_OPT
+        MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) );
+#else
+        uint32_t cpu;
+        MemWrite( &item->zoneBegin.time, Profiler::GetTime( cpu ) );
+        MemWrite( &item->zoneBegin.cpu, cpu );
+#endif
+        MemWrite( &item->zoneBegin.thread, thread );
+        MemWrite( &item->zoneBegin.srcloc, (uint64_t)srcloc );
+        tail.store( magic + 1, std::memory_order_release );
+
+        s_profiler.SendCallstack( depth, thread );
+    }
+
+    tracy_force_inline ~ScopedZone()
+    {
+        if( !m_active ) return;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::ZoneEnd );
+#ifdef TRACY_RDTSCP_OPT
+        MemWrite( &item->zoneEnd.time, Profiler::GetTime( item->zoneEnd.cpu ) );
+#else
+        uint32_t cpu;
+        MemWrite( &item->zoneEnd.time, Profiler::GetTime( cpu ) );
+        MemWrite( &item->zoneEnd.cpu, cpu );
+#endif
+        MemWrite( &item->zoneEnd.thread, m_thread );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline void Text( const char* txt, size_t size )
+    {
+        if( !m_active ) return;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto ptr = (char*)tracy_malloc( size+1 );
+        memcpy( ptr, txt, size );
+        ptr[size] = '\0';
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::ZoneText );
+        MemWrite( &item->zoneText.thread, m_thread );
+        MemWrite( &item->zoneText.text, (uint64_t)ptr );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+    tracy_force_inline void Name( const char* txt, size_t size )
+    {
+        if( !m_active ) return;
+        Magic magic;
+        auto& token = s_token.ptr;
+        auto ptr = (char*)tracy_malloc( size+1 );
+        memcpy( ptr, txt, size );
+        ptr[size] = '\0';
+        auto& tail = token->get_tail_index();
+        auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
+        MemWrite( &item->hdr.type, QueueType::ZoneName );
+        MemWrite( &item->zoneText.thread, m_thread );
+        MemWrite( &item->zoneText.text, (uint64_t)ptr );
+        tail.store( magic + 1, std::memory_order_release );
+    }
+
+private:
+    uint64_t m_thread;
+    const bool m_active;
+};
+
+}
+
+#endif
--- a/public/client/TracyThread.hpp
+++ b/public/client/TracyThread.hpp
@@ -1,40 +1,16 @@
 #ifndef __TRACYTHREAD_HPP__
 #define __TRACYTHREAD_HPP__

-#if defined _WIN32
+#ifdef _MSC_VER
 #  include <windows.h>
 #else
 #  include <pthread.h>
 #endif

-#ifdef TRACY_MANUAL_LIFETIME
-#  include "../common/TracyAlloc.hpp"
-#endif
-
 namespace tracy
 {

-#ifdef TRACY_MANUAL_LIFETIME
-extern thread_local bool RpThreadInitDone;
-#endif
-
-class ThreadExitHandler
-{
-public:
-    ~ThreadExitHandler()
-    {
-#ifdef TRACY_MANUAL_LIFETIME
-#  if defined TRACY_HAS_CUSTOM_ALLOCATOR
-        PlatformAllocatorThreadFinalize();
-#  elif defined TRACY_USE_RPMALLOC
-        rpmalloc_thread_finalize( 1 );
-#  endif
-        RpThreadInitDone = false;
-#endif
-    }
-};
-
-#if defined _WIN32
+#ifdef _MSC_VER

 class Thread
 {
--- a/client/concurrentqueue.h
+++ b/client/concurrentqueue.h
--- a/client/tracy_rpmalloc.cpp
+++ b/client/tracy_rpmalloc.cpp
--- a/client/tracy_rpmalloc.hpp
+++ b/client/tracy_rpmalloc.hpp
@@ -0,0 +1,151 @@
+/* rpmalloc.h  -  Memory allocator  -  Public Domain  -  2016 Mattias Jansson / Rampant Pixels
+ *
+ * This library provides a cross-platform lock free thread caching malloc implementation in C11.
+ * The latest source code is always available at
+ *
+ * https://github.com/rampantpixels/rpmalloc
+ *
+ * This library is put in the public domain; you can redistribute it and/or modify it without any restrictions.
+ *
+ */
+
+#pragma once
+
+#include <stddef.h>
+
+namespace tracy
+{
+
+#if defined(__clang__) || defined(__GNUC__)
+# define RPMALLOC_ATTRIBUTE __attribute__((__malloc__))
+# define RPMALLOC_RESTRICT
+# define RPMALLOC_CDECL
+#elif defined(_MSC_VER)
+# define RPMALLOC_ATTRIBUTE
+# define RPMALLOC_RESTRICT __declspec(restrict)
+# define RPMALLOC_CDECL __cdecl
+#else
+# define RPMALLOC_ATTRIBUTE
+# define RPMALLOC_RESTRICT
+# define RPMALLOC_CDECL
+#endif
+
+//! Flag to rpaligned_realloc to not preserve content in reallocation
+#define RPMALLOC_NO_PRESERVE    1
+
+typedef struct rpmalloc_global_statistics_t {
+	//! Current amount of virtual memory mapped (only if ENABLE_STATISTICS=1)
+	size_t mapped;
+	//! Current amount of memory in global caches for small and medium sizes (<64KiB)
+	size_t cached;
+	//! Total amount of memory mapped (only if ENABLE_STATISTICS=1)
+	size_t mapped_total;
+	//! Total amount of memory unmapped (only if ENABLE_STATISTICS=1)
+	size_t unmapped_total;
+} rpmalloc_global_statistics_t;
+
+typedef struct rpmalloc_thread_statistics_t {
+	//! Current number of bytes available for allocation from active spans
+	size_t active;
+	//! Current number of bytes available in thread size class caches
+	size_t sizecache;
+	//! Current number of bytes available in thread span caches
+	size_t spancache;
+	//! Current number of bytes in pending deferred deallocations
+	size_t deferred;
+	//! Total number of bytes transitioned from thread cache to global cache
+	size_t thread_to_global;
+	//! Total number of bytes transitioned from global cache to thread cache
+	size_t global_to_thread;
+} rpmalloc_thread_statistics_t;
+
+typedef struct rpmalloc_config_t {
+	//! Map memory pages for the given number of bytes. The returned address MUST be
+	//  aligned to the rpmalloc span size, which will always be a power of two.
+	//  Optionally the function can store an alignment offset in the offset variable
+	//  in case it performs alignment and the returned pointer is offset from the
+	//  actual start of the memory region due to this alignment. The alignment offset
+	//  will be passed to the memory unmap function. The alignment offset MUST NOT be
+	//  larger than 65535 (storable in an uint16_t), if it is you must use natural
+	//  alignment to shift it into 16 bits.
+	void* (*memory_map)(size_t size, size_t* offset);
+	//! Unmap the memory pages starting at address and spanning the given number of bytes.
+	//  If release is set to 1, the unmap is for an entire span range as returned by
+	//  a previous call to memory_map and that the entire range should be released.
+	//  If release is set to 0, the unmap is a partial decommit of a subset of the mapped
+	//  memory range.
+	void (*memory_unmap)(void* address, size_t size, size_t offset, int release);
+	//! Size of memory pages. The page size MUST be a power of two in [512,16384] range
+	//  (2^9 to 2^14) unless 0 - set to 0 to use system page size. All memory mapping
+	//  requests to memory_map will be made with size set to a multiple of the page size.
+	size_t page_size;
+	//! Size of a span of memory pages. MUST be a multiple of page size, and in [4096,262144]
+	//  range (unless 0 - set to 0 to use the default span size).
+	size_t span_size;
+	//! Number of spans to map at each request to map new virtual memory blocks. This can
+	//  be used to minimize the system call overhead at the cost of virtual memory address
+	//  space. The extra mapped pages will not be written until actually used, so physical
+	//  committed memory should not be affected in the default implementation.
+	size_t span_map_count;
+	//! Debug callback if memory guards are enabled. Called if a memory overwrite is detected
+	void (*memory_overwrite)(void* address);
+} rpmalloc_config_t;
+
+extern int
+rpmalloc_initialize(void);
+
+extern int
+rpmalloc_initialize_config(const rpmalloc_config_t* config);
+
+extern const rpmalloc_config_t*
+rpmalloc_config(void);
+
+extern void
+rpmalloc_finalize(void);
+
+extern void
+rpmalloc_thread_initialize(void);
+
+extern void
+rpmalloc_thread_finalize(void);
+
+extern void
+rpmalloc_thread_collect(void);
+
+extern int
+rpmalloc_is_thread_initialized(void);
+
+extern void
+rpmalloc_thread_statistics(rpmalloc_thread_statistics_t* stats);
+
+extern void
+rpmalloc_global_statistics(rpmalloc_global_statistics_t* stats);
+
+extern RPMALLOC_RESTRICT void*
+rpmalloc(size_t size) RPMALLOC_ATTRIBUTE;
+
+extern void
+rpfree(void* ptr);
+
+extern RPMALLOC_RESTRICT void*
+rpcalloc(size_t num, size_t size) RPMALLOC_ATTRIBUTE;
+
+extern void*
+rprealloc(void* ptr, size_t size);
+
+extern void*
+rpaligned_realloc(void* ptr, size_t alignment, size_t size, size_t oldsize, unsigned int flags);
+
+extern RPMALLOC_RESTRICT void*
+rpaligned_alloc(size_t alignment, size_t size) RPMALLOC_ATTRIBUTE;
+
+extern RPMALLOC_RESTRICT void*
+rpmemalign(size_t alignment, size_t size) RPMALLOC_ATTRIBUTE;
+
+extern int
+rpposix_memalign(void **memptr, size_t alignment, size_t size);
+
+extern size_t
+rpmalloc_usable_size(void* ptr);
+
+}
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
--- a/cmake/ECMFindModuleHelpers.cmake
+++ b/cmake/ECMFindModuleHelpers.cmake
@@ -1,300 +0,0 @@
-#.rst:
-# ECMFindModuleHelpers
-# --------------------
-#
-# Helper macros for find modules: ecm_find_package_version_check(),
-# ecm_find_package_parse_components() and
-# ecm_find_package_handle_library_components().
-#
-# ::
-#
-#   ecm_find_package_version_check(<name>)
-#
-# Prints warnings if the CMake version or the project's required CMake version
-# is older than that required by extra-cmake-modules.
-#
-# ::
-#
-#   ecm_find_package_parse_components(<name>
-#       RESULT_VAR <variable>
-#       KNOWN_COMPONENTS <component1> [<component2> [...]]
-#       [SKIP_DEPENDENCY_HANDLING])
-#
-# This macro will populate <variable> with a list of components found in
-# <name>_FIND_COMPONENTS, after checking that all those components are in the
-# list of KNOWN_COMPONENTS; if there are any unknown components, it will print
-# an error or warning (depending on the value of <name>_FIND_REQUIRED) and call
-# return().
-#
-# The order of components in <variable> is guaranteed to match the order they
-# are listed in the KNOWN_COMPONENTS argument.
-#
-# If SKIP_DEPENDENCY_HANDLING is not set, for each component the variable
-# <name>_<component>_component_deps will be checked for dependent components.
-# If <component> is listed in <name>_FIND_COMPONENTS, then all its (transitive)
-# dependencies will also be added to <variable>.
-#
-# ::
-#
-#   ecm_find_package_handle_library_components(<name>
-#       COMPONENTS <component> [<component> [...]]
-#       [SKIP_DEPENDENCY_HANDLING])
-#       [SKIP_PKG_CONFIG])
-#
-# Creates an imported library target for each component.  The operation of this
-# macro depends on the presence of a number of CMake variables.
-#
-# The <name>_<component>_lib variable should contain the name of this library,
-# and <name>_<component>_header variable should contain the name of a header
-# file associated with it (whatever relative path is normally passed to
-# '#include'). <name>_<component>_header_subdir variable can be used to specify
-# which subdirectory of the include path the headers will be found in.
-# ecm_find_package_components() will then search for the library
-# and include directory (creating appropriate cache variables) and create an
-# imported library target named <name>::<component>.
-#
-# Additional variables can be used to provide additional information:
-#
-# If SKIP_PKG_CONFIG, the <name>_<component>_pkg_config variable is set, and
-# pkg-config is found, the pkg-config module given by
-# <name>_<component>_pkg_config will be searched for and used to help locate the
-# library and header file.  It will also be used to set
-# <name>_<component>_VERSION.
-#
-# Note that if version information is found via pkg-config,
-# <name>_<component>_FIND_VERSION can be set to require a particular version
-# for each component.
-#
-# If SKIP_DEPENDENCY_HANDLING is not set, the INTERFACE_LINK_LIBRARIES property
-# of the imported target for <component> will be set to contain the imported
-# targets for the components listed in <name>_<component>_component_deps.
-# <component>_FOUND will also be set to false if any of the components in
-# <name>_<component>_component_deps are not found.  This requires the components
-# in <name>_<component>_component_deps to be listed before <component> in the
-# COMPONENTS argument.
-#
-# The following variables will be set:
-#
-# ``<name>_TARGETS``
-#   the imported targets
-# ``<name>_LIBRARIES``
-#   the found libraries
-# ``<name>_INCLUDE_DIRS``
-#   the combined required include directories for the components
-# ``<name>_DEFINITIONS``
-#   the "other" CFLAGS provided by pkg-config, if any
-# ``<name>_VERSION``
-#   the value of ``<name>_<component>_VERSION`` for the first component that
-#   has this variable set (note that components are searched for in the order
-#   they are passed to the macro), although if it is already set, it will not
-#   be altered
-#
-# Note that these variables are never cleared, so if
-# ecm_find_package_handle_library_components() is called multiple times with
-# different components (typically because of multiple find_package() calls) then
-# ``<name>_TARGETS``, for example, will contain all the targets found in any
-# call (although no duplicates).
-#
-# Since pre-1.0.0.
-
-#=============================================================================
-# Copyright 2014 Alex Merry <alex.merry@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-macro(ecm_find_package_version_check module_name)
-    if(CMAKE_VERSION VERSION_LESS 2.8.12)
-        message(FATAL_ERROR "CMake 2.8.12 is required by Find${module_name}.cmake")
-    endif()
-    if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-        message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use Find${module_name}.cmake")
-    endif()
-endmacro()
-
-macro(ecm_find_package_parse_components module_name)
-    set(ecm_fppc_options SKIP_DEPENDENCY_HANDLING)
-    set(ecm_fppc_oneValueArgs RESULT_VAR)
-    set(ecm_fppc_multiValueArgs KNOWN_COMPONENTS DEFAULT_COMPONENTS)
-    cmake_parse_arguments(ECM_FPPC "${ecm_fppc_options}" "${ecm_fppc_oneValueArgs}" "${ecm_fppc_multiValueArgs}" ${ARGN})
-
-    if(ECM_FPPC_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unexpected arguments to ecm_find_package_parse_components: ${ECM_FPPC_UNPARSED_ARGUMENTS}")
-    endif()
-    if(NOT ECM_FPPC_RESULT_VAR)
-        message(FATAL_ERROR "Missing RESULT_VAR argument to ecm_find_package_parse_components")
-    endif()
-    if(NOT ECM_FPPC_KNOWN_COMPONENTS)
-        message(FATAL_ERROR "Missing KNOWN_COMPONENTS argument to ecm_find_package_parse_components")
-    endif()
-    if(NOT ECM_FPPC_DEFAULT_COMPONENTS)
-        set(ECM_FPPC_DEFAULT_COMPONENTS ${ECM_FPPC_KNOWN_COMPONENTS})
-    endif()
-
-    if(${module_name}_FIND_COMPONENTS)
-        set(ecm_fppc_requestedComps ${${module_name}_FIND_COMPONENTS})
-
-        if(NOT ECM_FPPC_SKIP_DEPENDENCY_HANDLING)
-            # Make sure deps are included
-            foreach(ecm_fppc_comp ${ecm_fppc_requestedComps})
-                foreach(ecm_fppc_dep_comp ${${module_name}_${ecm_fppc_comp}_component_deps})
-                    list(FIND ecm_fppc_requestedComps "${ecm_fppc_dep_comp}" ecm_fppc_index)
-                    if("${ecm_fppc_index}" STREQUAL "-1")
-                        if(NOT ${module_name}_FIND_QUIETLY)
-                            message(STATUS "${module_name}: ${ecm_fppc_comp} requires ${${module_name}_${ecm_fppc_comp}_component_deps}")
-                        endif()
-                        list(APPEND ecm_fppc_requestedComps "${ecm_fppc_dep_comp}")
-                    endif()
-                endforeach()
-            endforeach()
-        else()
-            message(STATUS "Skipping dependency handling for ${module_name}")
-        endif()
-        list(REMOVE_DUPLICATES ecm_fppc_requestedComps)
-
-        # This makes sure components are listed in the same order as
-        # KNOWN_COMPONENTS (potentially important for inter-dependencies)
-        set(${ECM_FPPC_RESULT_VAR})
-        foreach(ecm_fppc_comp ${ECM_FPPC_KNOWN_COMPONENTS})
-            list(FIND ecm_fppc_requestedComps "${ecm_fppc_comp}" ecm_fppc_index)
-            if(NOT "${ecm_fppc_index}" STREQUAL "-1")
-                list(APPEND ${ECM_FPPC_RESULT_VAR} "${ecm_fppc_comp}")
-                list(REMOVE_AT ecm_fppc_requestedComps ${ecm_fppc_index})
-            endif()
-        endforeach()
-        # if there are any left, they are unknown components
-        if(ecm_fppc_requestedComps)
-            set(ecm_fppc_msgType STATUS)
-            if(${module_name}_FIND_REQUIRED)
-                set(ecm_fppc_msgType FATAL_ERROR)
-            endif()
-            if(NOT ${module_name}_FIND_QUIETLY)
-                message(${ecm_fppc_msgType} "${module_name}: requested unknown components ${ecm_fppc_requestedComps}")
-            endif()
-            return()
-        endif()
-    else()
-        set(${ECM_FPPC_RESULT_VAR} ${ECM_FPPC_DEFAULT_COMPONENTS})
-    endif()
-endmacro()
-
-macro(ecm_find_package_handle_library_components module_name)
-    set(ecm_fpwc_options SKIP_PKG_CONFIG SKIP_DEPENDENCY_HANDLING)
-    set(ecm_fpwc_oneValueArgs)
-    set(ecm_fpwc_multiValueArgs COMPONENTS)
-    cmake_parse_arguments(ECM_FPWC "${ecm_fpwc_options}" "${ecm_fpwc_oneValueArgs}" "${ecm_fpwc_multiValueArgs}" ${ARGN})
-
-    if(ECM_FPWC_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unexpected arguments to ecm_find_package_handle_components: ${ECM_FPWC_UNPARSED_ARGUMENTS}")
-    endif()
-    if(NOT ECM_FPWC_COMPONENTS)
-        message(FATAL_ERROR "Missing COMPONENTS argument to ecm_find_package_handle_components")
-    endif()
-
-    include(FindPackageHandleStandardArgs)
-    find_package(PkgConfig QUIET)
-    foreach(ecm_fpwc_comp ${ECM_FPWC_COMPONENTS})
-        set(ecm_fpwc_dep_vars)
-        set(ecm_fpwc_dep_targets)
-        if(NOT SKIP_DEPENDENCY_HANDLING)
-            foreach(ecm_fpwc_dep ${${module_name}_${ecm_fpwc_comp}_component_deps})
-                list(APPEND ecm_fpwc_dep_vars "${module_name}_${ecm_fpwc_dep}_FOUND")
-                list(APPEND ecm_fpwc_dep_targets "${module_name}::${ecm_fpwc_dep}")
-            endforeach()
-        endif()
-
-        if(NOT ECM_FPWC_SKIP_PKG_CONFIG AND ${module_name}_${ecm_fpwc_comp}_pkg_config)
-            pkg_check_modules(PKG_${module_name}_${ecm_fpwc_comp} QUIET
-                              ${${module_name}_${ecm_fpwc_comp}_pkg_config})
-        endif()
-
-        find_path(${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
-            NAMES ${${module_name}_${ecm_fpwc_comp}_header}
-            HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_INCLUDE_DIRS}
-            PATH_SUFFIXES ${${module_name}_${ecm_fpwc_comp}_header_subdir}
-        )
-        find_library(${module_name}_${ecm_fpwc_comp}_LIBRARY
-            NAMES ${${module_name}_${ecm_fpwc_comp}_lib}
-            HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_LIBRARY_DIRS}
-        )
-
-        set(${module_name}_${ecm_fpwc_comp}_VERSION "${PKG_${module_name}_${ecm_fpwc_comp}_VERSION}")
-        if(NOT ${module_name}_VERSION)
-            set(${module_name}_VERSION ${${module_name}_${ecm_fpwc_comp}_VERSION})
-        endif()
-
-        set(_name_mismatched_arg)
-        if(NOT CMAKE_VERSION VERSION_LESS 3.17)
-            set(_name_mismatched_arg NAME_MISMATCHED)
-        endif()
-        find_package_handle_standard_args(${module_name}_${ecm_fpwc_comp}
-            FOUND_VAR
-                ${module_name}_${ecm_fpwc_comp}_FOUND
-            REQUIRED_VARS
-                ${module_name}_${ecm_fpwc_comp}_LIBRARY
-                ${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
-                ${ecm_fpwc_dep_vars}
-            VERSION_VAR
-                ${module_name}_${ecm_fpwc_comp}_VERSION
-            ${_name_mismatched_arg}
-            )
-
-        mark_as_advanced(
-            ${module_name}_${ecm_fpwc_comp}_LIBRARY
-            ${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
-        )
-
-        if(${module_name}_${ecm_fpwc_comp}_FOUND)
-            list(APPEND ${module_name}_LIBRARIES
-                        "${${module_name}_${ecm_fpwc_comp}_LIBRARY}")
-            list(APPEND ${module_name}_INCLUDE_DIRS
-                        "${${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR}")
-            set(${module_name}_DEFINITIONS
-                    ${${module_name}_DEFINITIONS}
-                    ${PKG_${module_name}_${ecm_fpwc_comp}_DEFINITIONS})
-            if(NOT TARGET ${module_name}::${ecm_fpwc_comp})
-                add_library(${module_name}::${ecm_fpwc_comp} UNKNOWN IMPORTED)
-                set_target_properties(${module_name}::${ecm_fpwc_comp} PROPERTIES
-                    IMPORTED_LOCATION "${${module_name}_${ecm_fpwc_comp}_LIBRARY}"
-                    INTERFACE_COMPILE_OPTIONS "${PKG_${module_name}_${ecm_fpwc_comp}_DEFINITIONS}"
-                    INTERFACE_INCLUDE_DIRECTORIES "${${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR}"
-                    INTERFACE_LINK_LIBRARIES "${ecm_fpwc_dep_targets}"
-                )
-            endif()
-            list(APPEND ${module_name}_TARGETS
-                        "${module_name}::${ecm_fpwc_comp}")
-        endif()
-    endforeach()
-    if(${module_name}_LIBRARIES)
-        list(REMOVE_DUPLICATES ${module_name}_LIBRARIES)
-    endif()
-    if(${module_name}_INCLUDE_DIRS)
-        list(REMOVE_DUPLICATES ${module_name}_INCLUDE_DIRS)
-    endif()
-    if(${module_name}_DEFINITIONS)
-        list(REMOVE_DUPLICATES ${module_name}_DEFINITIONS)
-    endif()
-    if(${module_name}_TARGETS)
-        list(REMOVE_DUPLICATES ${module_name}_TARGETS)
-    endif()
-endmacro()
--- a/cmake/FindWaylandScanner.cmake
+++ b/cmake/FindWaylandScanner.cmake
@@ -1,170 +0,0 @@
-#.rst:
-# FindWaylandScanner
-# ------------------
-#
-# Try to find wayland-scanner.
-#
-# If the wayland-scanner executable is not in your PATH, you can provide
-# an alternative name or full path location with the ``WaylandScanner_EXECUTABLE``
-# variable.
-#
-# This will define the following variables:
-#
-# ``WaylandScanner_FOUND``
-#     True if wayland-scanner is available.
-#
-# ``WaylandScanner_EXECUTABLE``
-#     The wayland-scanner executable.
-#
-# If ``WaylandScanner_FOUND`` is TRUE, it will also define the following imported
-# target:
-#
-# ``Wayland::Scanner``
-#     The wayland-scanner executable.
-#
-# This module provides the following functions to generate C protocol
-# implementations:
-#
-#   - ``ecm_add_wayland_client_protocol``
-#   - ``ecm_add_wayland_server_protocol``
-#
-# ::
-#
-#   ecm_add_wayland_client_protocol(<source_files_var>
-#                                   PROTOCOL <xmlfile>
-#                                   BASENAME <basename>)
-#
-# Generate Wayland client protocol files from ``<xmlfile>`` XML
-# definition for the ``<basename>`` interface and append those files
-# to ``<source_files_var>``.
-#
-# ::
-#
-#   ecm_add_wayland_server_protocol(<source_files_var>
-#                                   PROTOCOL <xmlfile>
-#                                   BASENAME <basename>)
-#
-# Generate Wayland server protocol files from ``<xmlfile>`` XML
-# definition for the ``<basename>`` interface and append those files
-# to ``<source_files_var>``.
-#
-# Since 1.4.0.
-
-#=============================================================================
-# Copyright 2012-2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpers.cmake)
-
-ecm_find_package_version_check(WaylandScanner)
-
-# Find wayland-scanner
-find_program(WaylandScanner_EXECUTABLE NAMES wayland-scanner)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WaylandScanner
-    FOUND_VAR
-        WaylandScanner_FOUND
-    REQUIRED_VARS
-        WaylandScanner_EXECUTABLE
-)
-
-mark_as_advanced(WaylandScanner_EXECUTABLE)
-
-if(NOT TARGET Wayland::Scanner AND WaylandScanner_FOUND)
-    add_executable(Wayland::Scanner IMPORTED)
-    set_target_properties(Wayland::Scanner PROPERTIES
-        IMPORTED_LOCATION "${WaylandScanner_EXECUTABLE}"
-    )
-endif()
-
-include(FeatureSummary)
-set_package_properties(WaylandScanner PROPERTIES
-    URL "https://wayland.freedesktop.org/"
-    DESCRIPTION "Executable that converts XML protocol files to C code"
-)
-
-function(ecm_add_wayland_client_protocol out_var)
-    # Parse arguments
-    set(oneValueArgs PROTOCOL BASENAME)
-    cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
-
-    if(ARGS_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unknown keywords given to ecm_add_wayland_client_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
-    endif()
-
-    get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
-    set(_client_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.h")
-    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-protocol.c")
-
-    set_source_files_properties(${_client_header} GENERATED)
-    set_source_files_properties(${_code} GENERATED)
-    set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON)
-
-    add_custom_command(OUTPUT "${_client_header}"
-        COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile} ${_client_header}
-        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
-        VERBATIM
-    )
-
-    add_custom_command(OUTPUT "${_code}"
-        COMMAND ${WaylandScanner_EXECUTABLE} private-code ${_infile} ${_code}
-        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile} ${_client_header}
-        VERBATIM
-    )
-
-    list(APPEND ${out_var} "${_client_header}" "${_code}")
-    set(${out_var} ${${out_var}} PARENT_SCOPE)
-endfunction()
-
-
-function(ecm_add_wayland_server_protocol out_var)
-    # Parse arguments
-    set(oneValueArgs PROTOCOL BASENAME)
-    cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
-
-    if(ARGS_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unknown keywords given to ecm_add_wayland_server_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
-    endif()
-
-    ecm_add_wayland_client_protocol(${out_var}
-                                    PROTOCOL ${ARGS_PROTOCOL}
-                                    BASENAME ${ARGS_BASENAME})
-
-    get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
-    set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-server-protocol.h")
-    set_property(SOURCE ${_server_header} PROPERTY SKIP_AUTOMOC ON)
-    set_source_files_properties(${_server_header} GENERATED)
-
-    add_custom_command(OUTPUT "${_server_header}"
-        COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile} ${_server_header}
-        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
-        VERBATIM
-   )
-
-    list(APPEND ${out_var} "${_server_header}")
-    set(${out_var} ${${out_var}} PARENT_SCOPE)
-endfunction()
--- a/cmake/GitRef.cmake
+++ b/cmake/GitRef.cmake
@@ -1,37 +0,0 @@
-function(add_git_ref target)
-    if(NOT DEFINED GIT_REV)
-        set(GIT_REV "HEAD")
-    endif()
-
-    get_property(_git_ref_created GLOBAL PROPERTY _GIT_REF_CREATED)
-    if(NOT _git_ref_created)
-        set_property(GLOBAL PROPERTY _GIT_REF_CREATED TRUE)
-        find_package(Git)
-        set_property(GLOBAL PROPERTY _GIT_FOUND "${Git_FOUND}")
-        if(Git_FOUND)
-            add_custom_target(git-ref
-                COMMAND ${CMAKE_COMMAND} -E echo "#pragma once" > GitRef.hpp.tmp
-                COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR} log -1 "--format=namespace tracy { static inline const char* GitRef = %x22%h%x22; }" ${GIT_REV} >> GitRef.hpp.tmp || ${CMAKE_COMMAND} -E echo "namespace tracy { static inline const char* GitRef = \"unknown\"; }" >> GitRef.hpp.tmp
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different GitRef.hpp.tmp GitRef.hpp
-                BYPRODUCTS GitRef.hpp GitRef.hpp.tmp
-                VERBATIM
-            )
-        else()
-            message(WARNING "git not found, using 'unknown' as git ref.")
-            add_custom_command(
-                OUTPUT GitRef.hpp
-                COMMAND ${CMAKE_COMMAND} -E echo "#pragma once" > GitRef.hpp
-                COMMAND ${CMAKE_COMMAND} -E echo "namespace tracy { static inline const char* GitRef = \"unknown\"; }" >> GitRef.hpp
-                VERBATIM
-            )
-        endif()
-    endif()
-
-    target_include_directories(${target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-    get_property(_git_found GLOBAL PROPERTY _GIT_FOUND)
-    if(_git_found)
-        add_dependencies(${target} git-ref)
-    else()
-        target_sources(${target} PUBLIC GitRef.hpp)
-    endif()
-endfunction()
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -1,84 +0,0 @@
-include(${CMAKE_CURRENT_LIST_DIR}/options.cmake)
-
-set_option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF)
-set_option(NO_LTO "Disable interprocedural optimization (LTO)" OFF)
-set_option(NO_MOLD_LINKER "Disable mold linker (use default linker)" OFF)
-set_option(NO_CCACHE "Disable ccache acceleration" OFF)
-
-if (NOT NO_ISA_EXTENSIONS)
-    include(CheckCXXCompilerFlag)
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
-        CHECK_CXX_COMPILER_FLAG("-mcpu=native" COMPILER_SUPPORTS_MCPU_NATIVE)
-        if(COMPILER_SUPPORTS_MCPU_NATIVE)
-            add_compile_options(-mcpu=native)
-        endif()
-    else()
-        CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
-        if(COMPILER_SUPPORTS_MARCH_NATIVE)
-            add_compile_options(-march=native)
-        endif()
-    endif()
-    if(WIN32)
-        add_compile_options(/arch:AVX2)
-    endif()
-endif()
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT LEGACY)
-    set(USE_WAYLAND ON)
-else()
-    set(USE_WAYLAND OFF)
-endif()
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0")
-    endif()
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "15")
-          message(FATAL_ERROR "Apple Clang 15 or newer is required.")
-        elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "16" AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "13.3")
-          # AppleClang 15 has issues with to_chars in <chrono> if target is too old
-          set(CMAKE_OSX_DEPLOYMENT_TARGET "13.3")
-        endif()
-        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fexperimental-library>)
-    endif()
-    message(STATUS "macOS deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
-endif()
-
-if(WIN32)
-    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-    # /MP is MSVC-specific for multi-processor compilation
-    if(MSVC)
-        add_compile_options(/MP)
-    endif()
-endif()
-
-if(EMSCRIPTEN)
-    add_compile_options(-pthread -DIMGUI_IMPL_OPENGL_ES2)
-endif()
-
-if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT EMSCRIPTEN AND NOT NO_LTO)
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT NO_MOLD_LINKER)
-    find_program(MOLD_LINKER mold)
-    if(MOLD_LINKER)
-        set(CMAKE_LINKER_TYPE "MOLD")
-    endif()
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-        add_compile_options(-fno-eliminate-unused-debug-types)
-    endif()
-endif()
-
-if(NOT NO_CCACHE)
-    find_program(CCACHE ccache)
-    if(CCACHE)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-    endif()
-endif()
-
-file(GENERATE OUTPUT .gitignore CONTENT "*")
-
-set(CMAKE_COLOR_DIAGNOSTICS ON)
--- a/cmake/imgui-emscripten.patch
+++ b/cmake/imgui-emscripten.patch
@@ -1,14 +0,0 @@
-diff '--color=auto' -ruN 72d8f61727dc878102157113d1998f86b852d20e/imconfig.h new/imconfig.h
--- 72d8f61727dc878102157113d1998f86b852d20e/imconfig.h	2024-09-27 14:28:05.568760349 +0200
-+++ new/imconfig.h	2024-09-27 14:29:47.310243707 +0200
-@@ -113,6 +113,10 @@
- // Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
- //#define ImDrawIdx unsigned int
- 
-+#ifdef __EMSCRIPTEN__
-+#define ImDrawIdx unsigned int
-+#endif
-+
- //---- Override ImDrawCallback signature (will need to modify renderer backends accordingly)
- //struct ImDrawList;
- //struct ImDrawCmd;
--- a/cmake/imgui-loader.patch
+++ b/cmake/imgui-loader.patch
@@ -1,56 +0,0 @@
-diff --git i/backends/imgui_impl_opengl3_loader.h w/backends/imgui_impl_opengl3_loader.h
-index 4ca0536..a1ff572 100644
--- i/backends/imgui_impl_opengl3_loader.h
-+++ w/backends/imgui_impl_opengl3_loader.h
-@@ -180,6 +180,7 @@ typedef khronos_uint8_t GLubyte;
- #define GL_VERSION                        0x1F02
- #define GL_EXTENSIONS                     0x1F03
- #define GL_LINEAR                         0x2601
-+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
- #define GL_TEXTURE_MAG_FILTER             0x2800
- #define GL_TEXTURE_MIN_FILTER             0x2801
- #define GL_TEXTURE_WRAP_S                 0x2802
-@@ -244,8 +245,10 @@ GLAPI void APIENTRY glGenTextures (GLsizei n, GLuint *textures);
- #define GL_TEXTURE0                       0x84C0
- #define GL_ACTIVE_TEXTURE                 0x84E0
- typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
- #ifdef GL_GLEXT_PROTOTYPES
- GLAPI void APIENTRY glActiveTexture (GLenum texture);
-+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
- #endif
- #endif /* GL_VERSION_1_3 */
- #ifndef GL_VERSION_1_4
-@@ -481,7 +484,7 @@ GL3W_API GL3WglProc imgl3wGetProcAddress(const char *proc);
- 
- /* gl3w internal state */
- union ImGL3WProcs {
-    GL3WglProc ptr[63];
-+    GL3WglProc ptr[64];
-     struct {
-         PFNGLACTIVETEXTUREPROC            ActiveTexture;
-         PFNGLATTACHSHADERPROC             AttachShader;
-@@ -497,6 +500,7 @@ union ImGL3WProcs {
-         PFNGLCLEARPROC                    Clear;
-         PFNGLCLEARCOLORPROC               ClearColor;
-         PFNGLCOMPILESHADERPROC            CompileShader;
-+        PFNGLCOMPRESSEDTEXIMAGE2DPROC     CompressedTexImage2D;
-         PFNGLCREATEPROGRAMPROC            CreateProgram;
-         PFNGLCREATESHADERPROC             CreateShader;
-         PFNGLDELETEBUFFERSPROC            DeleteBuffers;
-@@ -563,6 +567,7 @@ GL3W_API extern union ImGL3WProcs imgl3wProcs;
- #define glClear                           imgl3wProcs.gl.Clear
- #define glClearColor                      imgl3wProcs.gl.ClearColor
- #define glCompileShader                   imgl3wProcs.gl.CompileShader
-+#define glCompressedTexImage2D            imgl3wProcs.gl.CompressedTexImage2D
- #define glCreateProgram                   imgl3wProcs.gl.CreateProgram
- #define glCreateShader                    imgl3wProcs.gl.CreateShader
- #define glDeleteBuffers                   imgl3wProcs.gl.DeleteBuffers
-@@ -859,6 +864,7 @@ static const char *proc_names[] = {
-     "glClear",
-     "glClearColor",
-     "glCompileShader",
-+    "glCompressedTexImage2D",
-     "glCreateProgram",
-     "glCreateShader",
-     "glDeleteBuffers",
--- a/cmake/imgui-macos-clipboard.patch
+++ b/cmake/imgui-macos-clipboard.patch
@@ -1,13 +0,0 @@
-diff --git i/imconfig.h w/imconfig.h
-index b40db3898..561ab7782 100644
--- i/imconfig.h
-+++ w/imconfig.h
-@@ -42,7 +42,7 @@
- //#define IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS          // [Win32] [Default with Visual Studio] Implement default IME handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW)
- //#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_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_TIME_FUNCTIONS                      // Don't setup default platform_io.Platform_SessionDate value using time(), localtime_r().
- //#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)
--- a/cmake/imgui-no-default-font.patch
+++ b/cmake/imgui-no-default-font.patch
@@ -1,13 +0,0 @@
-diff --git i/imconfig.h w/imconfig.h
-index b40db3898..f7f864394 100644
--- i/imconfig.h
-+++ w/imconfig.h
-@@ -50,7 +50,7 @@
- //#define IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
- //#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
- //#define IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
-//#define IMGUI_DISABLE_DEFAULT_FONT                        // Disable default embedded fonts (ProggyClean + ProggyForever). Remove ~9 KB + ~14 KB from output binary. AddFontDefaultXXX() functions will assert.
-+#define IMGUI_DISABLE_DEFAULT_FONT                        // Disable default embedded fonts (ProggyClean + ProggyForever). Remove ~9 KB + ~14 KB from output binary. AddFontDefaultXXX() functions will assert.
- //#define IMGUI_DISABLE_DEFAULT_FONT_BITMAP                 // Disable default embedded bitmap font (ProggyClean). Remove ~9 KB from output binary. AddFontDefaultBitmap() will assert.
- //#define IMGUI_DISABLE_DEFAULT_FONT_VECTOR                 // Disable default embedded vector font (ProggyForever), Remove ~14 KB from output binary. AddFontDefaultVector() will assert.
- //#define IMGUI_DISABLE_SSE                                 // Disable use of SSE intrinsics even if available
--- a/cmake/imgui-no-samplers.patch
+++ b/cmake/imgui-no-samplers.patch
@@ -1,13 +0,0 @@
-diff --git a/backends/imgui_impl_opengl3.cpp b/backends/imgui_impl_opengl3.cpp
-index a9e32b7ac..2cdbc4812 100644
--- a/backends/imgui_impl_opengl3.cpp
-+++ b/backends/imgui_impl_opengl3.cpp
-@@ -1069,7 +1069,7 @@ bool    ImGui_ImplOpenGL3_Init(const char* glsl_version)
-     bd->HasPolygonMode = (!bd->GlProfileIsES2 && !bd->GlProfileIsES3);
- #endif
- #ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_SAMPLER
-    bd->HasBindSampler = (bd->GlVersion >= 330 || bd->GlProfileIsES3);
-+    //bd->HasBindSampler = (bd->GlVersion >= 330 || bd->GlProfileIsES3);
- #endif
-     bd->HasClipOrigin = (bd->GlVersion >= 450);
- #ifdef IMGUI_IMPL_OPENGL_HAS_EXTENSIONS
--- a/cmake/imgui-phantom-column.patch
+++ b/cmake/imgui-phantom-column.patch
@@ -1,14 +0,0 @@
-diff --git a/imgui_tables.cpp b/imgui_tables.cpp
--- a/imgui_tables.cpp
-+++ b/imgui_tables.cpp
-@@ -4082,7 +4082,9 @@
-     }
-     if (load_flags & ImGuiTableFlags_Reorderable)
-         column->DisplayOrder = column_settings->DisplayOrder;
-    else
-+    else if (column_settings->Index != -1)
-+        // An Index of -1 means this column had no "Column N" line in the .ini file (columns without saved
-+        // data are not written). Keep the display order as initialized (identity for non-reorderable tables). (#9519)
-         column->DisplayOrder = column_settings->Index; // Because default depends on previous Index, we need to set that up and cannot rely on TableInitColumnDefaults()
-     if ((load_flags & ImGuiTableFlags_Hideable) && column_settings->IsEnabled != -1)
-         column->IsUserEnabled = column->IsUserEnabledNextFrame = (column_settings->IsEnabled == 1);
--- a/cmake/manual.cmake
+++ b/cmake/manual.cmake
@@ -1,88 +0,0 @@
-set(PANDOC_VERSION 3.11)
-
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
-
-find_program(TRACY_PANDOC pandoc)
-if(TRACY_PANDOC)
-    execute_process(
-        COMMAND ${TRACY_PANDOC} --version
-        OUTPUT_VARIABLE _pandoc_version
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _pandoc_rc
-        ERROR_QUIET)
-    string(REGEX MATCH "pandoc [0-9.]+" _pandoc_version "${_pandoc_version}")
-    if(NOT _pandoc_rc EQUAL 0 OR NOT _pandoc_version STREQUAL "pandoc ${PANDOC_VERSION}")
-        set(TRACY_PANDOC "")
-    endif()
-endif()
-if(TRACY_PANDOC)
-    message(STATUS "Using system pandoc ${PANDOC_VERSION}: ${TRACY_PANDOC}")
-else()
-    if(WIN32)
-        if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64)$")
-            message(FATAL_ERROR "No pinned pandoc ${PANDOC_VERSION} binary for ${CMAKE_HOST_SYSTEM_PROCESSOR}; install pandoc ${PANDOC_VERSION}")
-        endif()
-        set(_pandoc_asset pandoc-${PANDOC_VERSION}-windows-x86_64.zip)
-        set(_pandoc_hash 2ab72baf2399450e148ddf7a2a8689806c42e1bba71862b57e220fd9b8456d3d)
-        set(_pandoc_exe pandoc-${PANDOC_VERSION}/pandoc.exe)
-    elseif(APPLE)
-        if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
-            set(_pandoc_asset pandoc-${PANDOC_VERSION}-arm64-macOS.zip)
-            set(_pandoc_hash 15806bedf9517bfead72e88fe6a6696635c3691efbb6e152173440e9c5bb50b4)
-            set(_pandoc_exe pandoc-${PANDOC_VERSION}-arm64/bin/pandoc)
-        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64)$")
-            set(_pandoc_asset pandoc-${PANDOC_VERSION}-x86_64-macOS.zip)
-            set(_pandoc_hash 3b1c1b57f160112c821d02f23d946ede8b7f57a6ccf4632a25a512d334a9291f)
-            set(_pandoc_exe pandoc-${PANDOC_VERSION}-x86_64/bin/pandoc)
-        else()
-            message(FATAL_ERROR "No pinned pandoc ${PANDOC_VERSION} binary for ${CMAKE_HOST_SYSTEM_PROCESSOR}; install pandoc ${PANDOC_VERSION}")
-        endif()
-    else()
-        if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$")
-            set(_pandoc_asset pandoc-${PANDOC_VERSION}-linux-arm64.tar.gz)
-            set(_pandoc_hash 56ed5566ec41d22ec9ee0704e6ac0b98ba102e92384efd5306173a22d314c79a)
-            set(_pandoc_exe pandoc-${PANDOC_VERSION}/bin/pandoc)
-        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64)$")
-            set(_pandoc_asset pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz)
-            set(_pandoc_hash 37edb3bbcf722f921a009941bf5874e2e0c09263226c9b4a2d980788cb062ab6)
-        set(_pandoc_exe pandoc-${PANDOC_VERSION}/bin/pandoc)
-        else()
-            message(FATAL_ERROR "No pinned pandoc ${PANDOC_VERSION} binary for ${CMAKE_HOST_SYSTEM_PROCESSOR}; install pandoc ${PANDOC_VERSION}")
-        endif()
-    endif()
-
-    # Shared cache: $PANDOC_CACHE_DIR, else the platform user cache directory.
-    if(DEFINED ENV{PANDOC_CACHE_DIR})
-        set(_pandoc_cache $ENV{PANDOC_CACHE_DIR})
-    elseif(WIN32)
-        set(_pandoc_cache $ENV{LOCALAPPDATA}/tracy/pandoc)
-    elseif(APPLE)
-        set(_pandoc_cache $ENV{HOME}/Library/Caches/tracy/pandoc)
-    elseif(DEFINED ENV{XDG_CACHE_HOME})
-        set(_pandoc_cache $ENV{XDG_CACHE_HOME}/tracy/pandoc)
-    else()
-        set(_pandoc_cache $ENV{HOME}/.cache/tracy/pandoc)
-    endif()
-
-    set(TRACY_PANDOC ${_pandoc_cache}/${_pandoc_exe})
-    if(NOT EXISTS ${TRACY_PANDOC})
-        # Concurrent configures on a cold cache can collide; worst case the
-        # hash check fails and a rerun succeeds.
-        message(STATUS "Downloading pandoc ${PANDOC_VERSION} (${_pandoc_asset})")
-        file(MAKE_DIRECTORY ${_pandoc_cache})
-        file(DOWNLOAD
-            https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${_pandoc_asset}
-            ${_pandoc_cache}/pandoc.archive
-            EXPECTED_HASH SHA256=${_pandoc_hash}
-            STATUS _pandoc_download)
-        list(GET _pandoc_download 0 _pandoc_download_rc)
-        if(NOT _pandoc_download_rc STREQUAL "0")
-            file(REMOVE ${_pandoc_cache}/pandoc.archive)
-            message(FATAL_ERROR "Failed to download pandoc ${PANDOC_VERSION}: ${_pandoc_download}")
-        endif()
-        file(ARCHIVE_EXTRACT
-            INPUT ${_pandoc_cache}/pandoc.archive
-            DESTINATION ${_pandoc_cache})
-        file(REMOVE ${_pandoc_cache}/pandoc.archive)
-    endif()
-endif()
--- a/cmake/nfd-xdg-foreign-v2.patch
+++ b/cmake/nfd-xdg-foreign-v2.patch
@@ -1,203 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d6a9edc..abef8d7 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -32,18 +32,18 @@ if(nfd_PLATFORM STREQUAL PLATFORM_LINUX)
-   if(NFD_WAYLAND)
-     pkg_check_modules(WAYLAND REQUIRED wayland-client)
-     message(STATUS "Using Wayland version: ${WAYLAND_VERSION}")
-    set(NFD_WAYLAND_PROTOCOL_XDG_FOREIGN ${CMAKE_CURRENT_SOURCE_DIR}/../3ps/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml)
-+    set(NFD_WAYLAND_PROTOCOL_XDG_FOREIGN ${CMAKE_CURRENT_SOURCE_DIR}/../3ps/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml)
-     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.h
-      COMMAND wayland-scanner client-header < ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN} > ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.h
-+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.h
-+      COMMAND wayland-scanner client-header < ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN} > ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.h
-       MAIN_DEPENDENCY ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN}
-     )
-     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.c
-      COMMAND wayland-scanner private-code < ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN} > ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.c
-+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.c
-+      COMMAND wayland-scanner private-code < ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN} > ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.c
-       MAIN_DEPENDENCY ${NFD_WAYLAND_PROTOCOL_XDG_FOREIGN}
-     )
-    list(APPEND SOURCE_FILES ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.h ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v1.c)
-+    list(APPEND SOURCE_FILES ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.h ${CMAKE_CURRENT_BINARY_DIR}/xdg-foreign-unstable-v2.c)
-   endif()
- endif()
- 
-diff --git a/src/nfd_gtk.cpp b/src/nfd_gtk.cpp
-index 76fdcd7..cec691d 100644
--- a/src/nfd_gtk.cpp
-+++ b/src/nfd_gtk.cpp
-@@ -433,17 +433,17 @@ gint RunDialogWithFocus(GtkDialog* dialog) {
- 
- #if defined(NFD_WAYLAND)
- void DestroyXdgExported(void* context) {
-    zxdg_exported_v1_destroy(static_cast<struct zxdg_exported_v1*>(context));
-+    zxdg_exported_v2_destroy(static_cast<struct zxdg_exported_v2*>(context));
- }
- 
-void zxdg_exported_v1_handle(void* context, struct zxdg_exported_v1*, const char* handle) {
-+void zxdg_exported_v2_handle(void* context, struct zxdg_exported_v2*, const char* handle) {
-     GdkWindow* childWindow = static_cast<GdkWindow*>(context);
-     // GDK doesn't modify the string, even though it takes char*, so we can cast away the constness
-     gdk_wayland_window_set_transient_for_exported(childWindow, const_cast<char*>(handle));
- }
- 
-constexpr struct zxdg_exported_v1_listener wayland_xdg_exported_v1_listener{
-    &zxdg_exported_v1_handle};
-+constexpr struct zxdg_exported_v2_listener wayland_xdg_exported_v2_listener{
-+    &zxdg_exported_v2_handle};
- #endif
- 
- // This is an RAII class that wraps the parenting of a GtkWidget (the file dialog).
-@@ -645,17 +645,17 @@ struct NativeWindowParenter {
- 
- #if defined(NFD_WAYLAND)
-     void SetParentWayland(GdkWindow* childWindow) {
-        if (wayland_display && wayland_xdg_exporter_v1) {
-            struct zxdg_exported_v1* exported = zxdg_exporter_v1_export(
-                wayland_xdg_exporter_v1, static_cast<struct wl_surface*>(parentWindowHandle));
-+        if (wayland_display && wayland_xdg_exporter_v2) {
-+            struct zxdg_exported_v2* exported = zxdg_exporter_v2_export_toplevel(
-+                wayland_xdg_exporter_v2, static_cast<struct wl_surface*>(parentWindowHandle));
-             if (!exported) {
-                 // if we fail to export the wl_surface, act as if the window has no parent
-                 return;
-             }
-            zxdg_exported_v1_add_listener(
-                exported, &wayland_xdg_exported_v1_listener, static_cast<void*>(childWindow));
-+            zxdg_exported_v2_add_listener(
-+                exported, &wayland_xdg_exported_v2_listener, static_cast<void*>(childWindow));
-             wl_display_roundtrip(wayland_display);
-            zxdg_exported_v1_set_user_data(exported, nullptr);
-+            zxdg_exported_v2_set_user_data(exported, nullptr);
-             destroy.fn = &DestroyXdgExported;
-             destroy.context = static_cast<void*>(exported);
-         }
-diff --git a/src/nfd_linux_shared.hpp b/src/nfd_linux_shared.hpp
-index 1413bac..e826f1e 100644
--- a/src/nfd_linux_shared.hpp
-+++ b/src/nfd_linux_shared.hpp
-@@ -14,7 +14,7 @@
- 
- #ifdef NFD_WAYLAND
- #include <wayland-client.h>
-#include "xdg-foreign-unstable-v1.h"
-+#include "xdg-foreign-unstable-v2.h"
- #endif
- 
- namespace {
-@@ -81,9 +81,9 @@ nfdnchar_t* emit_case_insensitive_glob(const nfdnchar_t* begin,
- #ifdef NFD_WAYLAND
- struct wl_display* wayland_display;
- struct wl_registry* wayland_registry;
-uint32_t wayland_xdg_exporter_v1_name;
-struct zxdg_exporter_v1* wayland_xdg_exporter_v1;
-constexpr const char* XDG_EXPORTER_V1 = "zxdg_exporter_v1";
-+uint32_t wayland_xdg_exporter_v2_name;
-+struct zxdg_exporter_v2* wayland_xdg_exporter_v2;
-+constexpr const char* XDG_EXPORTER_V2 = "zxdg_exporter_v2";
- #endif
- 
- void EmptyFn(void*) {}
-@@ -103,19 +103,19 @@ void registry_handle_global(void* context,
-                             uint32_t version) {
-     (void)context;
-     (void)version;
-    if (strcmp(interface, XDG_EXPORTER_V1) == 0) {
-        wayland_xdg_exporter_v1_name = name;
-        wayland_xdg_exporter_v1 = static_cast<struct zxdg_exporter_v1*>(wl_registry_bind(
-            registry, name, &zxdg_exporter_v1_interface, zxdg_exporter_v1_interface.version));
-+    if (strcmp(interface, XDG_EXPORTER_V2) == 0) {
-+        wayland_xdg_exporter_v2_name = name;
-+        wayland_xdg_exporter_v2 = static_cast<struct zxdg_exporter_v2*>(wl_registry_bind(
-+            registry, name, &zxdg_exporter_v2_interface, zxdg_exporter_v2_interface.version));
-     }
- }
- 
- void registry_handle_global_remove(void* context, struct wl_registry* registry, uint32_t name) {
-     (void)context;
-     (void)registry;
-    if (wayland_xdg_exporter_v1 && name == wayland_xdg_exporter_v1_name) {
-        zxdg_exporter_v1_destroy(wayland_xdg_exporter_v1);
-        wayland_xdg_exporter_v1 = nullptr;
-+    if (wayland_xdg_exporter_v2 && name == wayland_xdg_exporter_v2_name) {
-+        zxdg_exporter_v2_destroy(wayland_xdg_exporter_v2);
-+        wayland_xdg_exporter_v2 = nullptr;
-     }
- }
- 
-@@ -128,7 +128,7 @@ void NFD_Wayland_Init(void) {
- 
- void NFD_Wayland_Quit(void) {
-     if (wayland_display) {
-        if (wayland_xdg_exporter_v1) zxdg_exporter_v1_destroy(wayland_xdg_exporter_v1);
-+        if (wayland_xdg_exporter_v2) zxdg_exporter_v2_destroy(wayland_xdg_exporter_v2);
-         wl_registry_destroy(wayland_registry);
-     }
- }
-@@ -143,7 +143,7 @@ nfdresult_t NFD_SetWaylandDisplay(wl_display* display) {
-     wayland_display = display;
-     if (wayland_display) {
-         wayland_registry = wl_display_get_registry(wayland_display);
-        wayland_xdg_exporter_v1 = nullptr;
-+        wayland_xdg_exporter_v2 = nullptr;
-         // seems like registry can't be null
-         wl_registry_add_listener(wayland_registry, &wayland_registry_listener, nullptr);
-         wl_display_roundtrip(wayland_display);
-diff --git a/src/nfd_portal.cpp b/src/nfd_portal.cpp
-index df840e0..e66ca7f 100644
--- a/src/nfd_portal.cpp
-+++ b/src/nfd_portal.cpp
-@@ -148,10 +148,10 @@ constexpr const char* DBUS_REQUEST_IFACE = "org.freedesktop.portal.Request";
- constexpr const char* WAYLAND_PREFIX = "wayland:";
- 
- void DestroyXdgExported(void* context) {
-    zxdg_exported_v1_destroy(static_cast<struct zxdg_exported_v1*>(context));
-+    zxdg_exported_v2_destroy(static_cast<struct zxdg_exported_v2*>(context));
- }
- 
-void zxdg_exported_v1_handle(void* context, struct zxdg_exported_v1*, const char* handle) {
-+void zxdg_exported_v2_handle(void* context, struct zxdg_exported_v2*, const char* handle) {
-     DBusMessageIter& iter = *static_cast<DBusMessageIter*>(context);
-     const size_t handle_len = strlen(handle);
-     const size_t prefix_len = strlen(WAYLAND_PREFIX);
-@@ -163,8 +163,8 @@ void zxdg_exported_v1_handle(void* context, struct zxdg_exported_v1*, const char
-     NFDi_Free(buf);
- }
- 
-constexpr struct zxdg_exported_v1_listener wayland_xdg_exported_v1_listener{
-    &zxdg_exported_v1_handle};
-+constexpr struct zxdg_exported_v2_listener wayland_xdg_exported_v2_listener{
-+    &zxdg_exported_v2_handle};
- #endif
- 
- void AppendOpenFileQueryParentWindow(DBusMessageIter& iter,
-@@ -194,18 +194,18 @@ void AppendOpenFileQueryParentWindow(DBusMessageIter& iter,
- #endif
- #ifdef NFD_WAYLAND
-         case NFD_WINDOW_HANDLE_TYPE_WAYLAND: {
-            if (wayland_display && wayland_xdg_exporter_v1) {
-                struct zxdg_exported_v1* exported = zxdg_exporter_v1_export(
-                    wayland_xdg_exporter_v1, static_cast<struct wl_surface*>(parentWindow.handle));
-+            if (wayland_display && wayland_xdg_exporter_v2) {
-+                struct zxdg_exported_v2* exported = zxdg_exporter_v2_export_toplevel(
-+                    wayland_xdg_exporter_v2, static_cast<struct wl_surface*>(parentWindow.handle));
-                 if (!exported) {
-                     // if we fail to export the wl_surface, act as if the window has no parent
-                     dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &STR_EMPTY);
-                     return;
-                 }
-                zxdg_exported_v1_add_listener(
-                    exported, &wayland_xdg_exported_v1_listener, static_cast<void*>(&iter));
-+                zxdg_exported_v2_add_listener(
-+                    exported, &wayland_xdg_exported_v2_listener, static_cast<void*>(&iter));
-                 wl_display_roundtrip(wayland_display);
-                zxdg_exported_v1_set_user_data(exported, nullptr);
-+                zxdg_exported_v2_set_user_data(exported, nullptr);
-                 destroy.fn = &DestroyXdgExported;
-                 destroy.context = static_cast<void*>(exported);
-                 return;
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -1,48 +0,0 @@
-# Reusable option macros for Tracy CMake projects
-#
-# Usage:
-#   set_option(OPTION_NAME "Help text" ON/OFF [TARGET])     - for boolean options
-#   set_option_value(VAR_NAME "Help text" "value" [TARGET]) - for value options (CACHE STRING)
-#   set_option_value_as_string(VAR_NAME "Help text" "value" [TARGET]) - for value options as C string literals
-#
-# [TARGET] is optional and specifies a target to which the option will 
-# be added as a compile definition (e.g., -DOPTION_NAME or -DVAR_NAME=value).
-
-# Boolean option (ON/OFF).
-macro(set_option option help value)
-    option(${option} ${help} ${value})
-    if(${option})
-        message(STATUS "${option}: ON")
-        if(${ARGC} GREATER 3)
-            target_compile_definitions(${ARGV3} PUBLIC ${option})
-        endif()
-    else()
-        message(STATUS "${option}: OFF")
-    endif()
-endmacro()
-
-# Value option (string/number).
-macro(set_option_value var help default)
-    set(${var} ${default} CACHE STRING "${help}")
-    if(${var})
-        message(STATUS "${var}: ${${var}}")
-        if(${ARGC} GREATER 3)
-            target_compile_definitions(${ARGV3} PUBLIC ${var}=${${var}})
-        endif()
-    else()
-        message(STATUS "${var}: (not set)")
-    endif()
-endmacro()
-
-# Value option embedded as a C string literal (VAR="value").
-macro(set_option_value_as_string var help default)
-    set(${var} ${default} CACHE STRING "${help}")
-    if(${var})
-        message(STATUS "${var}: ${${var}}")
-        if(${ARGC} GREATER 3)
-            target_compile_definitions(${ARGV3} PUBLIC "${var}=\"${${var}}\"")
-        endif()
-    else()
-        message(STATUS "${var}: (not set)")
-    endif()
-endmacro()
--- a/cmake/ppqsort-nodebug.patch
+++ b/cmake/ppqsort-nodebug.patch
@@ -1,14 +0,0 @@
-diff --git i/include/ppqsort/parameters.h w/include/ppqsort/parameters.h
-index 115c3a1..3f4b669 100644
--- i/include/ppqsort/parameters.h
-+++ w/include/ppqsort/parameters.h
-@@ -3,7 +3,8 @@
- #include <bit>
- #include <execution>
- 
-#ifndef NDEBUG
-+//#ifndef NDEBUG
-+#if 0
-     #include <bitset>
-     #include <iostream>
-     #include <syncstream>
--- a/cmake/ppqsort-semaphore.patch
+++ b/cmake/ppqsort-semaphore.patch
@@ -1,14 +0,0 @@
-diff --git i/include/ppqsort/parallel/cpp/thread_pool.h w/include/ppqsort/parallel/cpp/thread_pool.h
--- i/include/ppqsort/parallel/cpp/thread_pool.h
-+++ w/include/ppqsort/parallel/cpp/thread_pool.h
-@@ -134,7 +134,9 @@ namespace ppqsort::impl::cpp {
-             alignas(parameters::cacheline_size) std::atomic<std::size_t> pending_tasks_{0};
-             alignas(parameters::cacheline_size) std::atomic<std::size_t> total_tasks_{0};
-             alignas(parameters::cacheline_size) std::atomic<bool> to_stop_{false};
-            std::binary_semaphore threads_done_semaphore_{0};   // used to wait for all tasks to finish
-+            // counting_semaphore: multiple workers may concurrently observe total_tasks_ == 0
-+            // and call release(); a binary_semaphore would assert when the count exceeds 1.
-+            std::counting_semaphore<> threads_done_semaphore_{0};
-             std::mutex mtx_priority_;
-             bool stopped = false;
-     };
--- a/cmake/server.cmake
+++ b/cmake/server.cmake
@@ -1,36 +0,0 @@
-set(TRACY_COMMON_DIR ${CMAKE_CURRENT_LIST_DIR}/../public/common)
-
-set(TRACY_COMMON_SOURCES
-    tracy_lz4.cpp
-    tracy_lz4hc.cpp
-    TracySocket.cpp
-    TracyStackFrames.cpp
-    TracySystem.cpp
-)
-
-list(TRANSFORM TRACY_COMMON_SOURCES PREPEND "${TRACY_COMMON_DIR}/")
-
-
-set(TRACY_SERVER_DIR ${CMAKE_CURRENT_LIST_DIR}/../server)
-
-set(TRACY_SERVER_SOURCES
-    TracyBroadcast.cpp
-    TracyMemory.cpp
-    TracyMmap.cpp
-    TracyPrint.cpp
-    TracySysUtil.cpp
-    TracyTaskDispatch.cpp
-    TracyTextureCompression.cpp
-    TracyThreadCompress.cpp
-    TracyWorker.cpp
-)
-
-list(TRANSFORM TRACY_SERVER_SOURCES PREPEND "${TRACY_SERVER_DIR}/")
-
-
-add_library(TracyServer STATIC EXCLUDE_FROM_ALL ${TRACY_COMMON_SOURCES} ${TRACY_SERVER_SOURCES})
-target_include_directories(TracyServer PUBLIC ${TRACY_COMMON_DIR} ${TRACY_SERVER_DIR})
-target_link_libraries(TracyServer PUBLIC TracyCapstone libzstd PPQSort::PPQSort)
-if(NO_STATISTICS)
-    target_compile_definitions(TracyServer PUBLIC TRACY_NO_STATISTICS)
-endif()
--- a/cmake/tidy-cmake.patch
+++ b/cmake/tidy-cmake.patch
@@ -1,39 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 8efec25..c1d101e 100644
--- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -17,7 +17,7 @@
- # @date    Consult git log.
- ##############################################################################
- 
-cmake_minimum_required (VERSION 2.8.12)
-+cmake_minimum_required (VERSION 3.10)
- 
- set(LIB_NAME tidy)
- set(LIBTIDY_DESCRIPTION "${LIB_NAME} - HTML syntax checker")
-@@ -528,6 +528,7 @@ if (UNIX AND SUPPORT_CONSOLE_APP)
-  
-         # Run the built EXE to generate xml output .
-         add_custom_command(
-+            POST_BUILD
-             TARGET man
-             COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP}
-             COMMENT "Generate ${TIDYHELP}"
-@@ -536,6 +537,7 @@ if (UNIX AND SUPPORT_CONSOLE_APP)
- 
-         # Run the built EXE to generate more xml output.
-         add_custom_command(
-+            POST_BUILD
-             TARGET man
-             COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG}
-             COMMENT "Generate ${TIDYCONFIG}"
-@@ -544,8 +546,8 @@ if (UNIX AND SUPPORT_CONSOLE_APP)
- 
-         # Run xsltproc to generate the install files.
-         add_custom_command(
-+            POST_BUILD
-             TARGET man
-            DEPENDS ${TIDYHELP}
-             COMMAND xsltproc ARGS ${TIDY1XSL} ${TIDYHELP} > ${CMAKE_CURRENT_BINARY_DIR}/${TIDY_MANFILE}
-             COMMENT "Generate ${TIDY_MANFILE}"
-             VERBATIM
--- a/cmake/util.cmake
+++ b/cmake/util.cmake
@@ -1,13 +0,0 @@
-set(TRACY_UTIL_DIR ${CMAKE_CURRENT_LIST_DIR}/../util)
-
-set(TRACY_UTIL_SOURCES
-    CaptureConsole.cpp
-    CaptureFileBackup.cpp
-    CaptureOutput.cpp
-)
-
-list(TRANSFORM TRACY_UTIL_SOURCES PREPEND "${TRACY_UTIL_DIR}/")
-
-add_library(TracyUtil STATIC EXCLUDE_FROM_ALL ${TRACY_UTIL_SOURCES})
-target_link_libraries(TracyUtil PUBLIC TracyServer)
-target_include_directories(TracyUtil PUBLIC ${TRACY_UTIL_DIR})
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -1,341 +0,0 @@
-# Vendor Specific CMake
-# The Tracy project keeps most vendor source locally
-
-set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../")
-
-# Dependencies are taken from the system first and if not found, they are pulled with CPM and built from source
-
-include(FindPkgConfig)
-include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake)
-
-if(APPLE AND BUNDLE)
-    set(DLOPT ON)
-else()
-    set(DLOPT OFF)
-endif()
-
-option(DOWNLOAD_CAPSTONE "Force download capstone" ON)
-
-if(VENDOR_GUI)
-    option(DOWNLOAD_GLFW "Force download glfw" ${DLOPT})
-    option(DOWNLOAD_FREETYPE "Force download freetype" ${DLOPT})
-    option(DOWNLOAD_LIBCURL "Force download libcURL" OFF)
-    option(DOWNLOAD_PUGIXML "Force download pugixml" ${DLOPT})
-endif()
-
-# capstone
-
-pkg_check_modules(CAPSTONE capstone)
-if(CAPSTONE_FOUND AND NOT DOWNLOAD_CAPSTONE)
-    message(STATUS "Capstone found: ${CAPSTONE}")
-    add_library(TracyCapstone INTERFACE)
-    target_include_directories(TracyCapstone INTERFACE ${CAPSTONE_INCLUDE_DIRS})
-    target_link_libraries(TracyCapstone INTERFACE ${CAPSTONE_LINK_LIBRARIES})
-else()
-    CPMAddPackage(
-        NAME capstone
-        GITHUB_REPOSITORY capstone-engine/capstone
-        GIT_TAG 6.0.0-Alpha10
-        OPTIONS
-            "CAPSTONE_X86_ATT_DISABLE ON"
-            "CAPSTONE_ALPHA_SUPPORT OFF"
-            "CAPSTONE_ARC_SUPPORT OFF"
-            "CAPSTONE_HPPA_SUPPORT OFF"
-            "CAPSTONE_LOONGARCH_SUPPORT OFF"
-            "CAPSTONE_M680X_SUPPORT OFF"
-            "CAPSTONE_M68K_SUPPORT OFF"
-            "CAPSTONE_MIPS_SUPPORT OFF"
-            "CAPSTONE_MOS65XX_SUPPORT OFF"
-            "CAPSTONE_PPC_SUPPORT OFF"
-            "CAPSTONE_SPARC_SUPPORT OFF"
-            "CAPSTONE_SYSTEMZ_SUPPORT OFF"
-            "CAPSTONE_XCORE_SUPPORT OFF"
-            "CAPSTONE_TRICORE_SUPPORT OFF"
-            "CAPSTONE_TMS320C64X_SUPPORT OFF"
-            "CAPSTONE_M680X_SUPPORT OFF"
-            "CAPSTONE_EVM_SUPPORT OFF"
-            "CAPSTONE_WASM_SUPPORT OFF"
-            "CAPSTONE_BPF_SUPPORT OFF"
-            "CAPSTONE_RISCV_SUPPORT OFF"
-            "CAPSTONE_SH_SUPPORT OFF"
-            "CAPSTONE_XTENSA_SUPPORT OFF"
-            "CAPSTONE_BUILD_MACOS_THIN ON"
-        EXCLUDE_FROM_ALL TRUE
-    )
-    add_library(TracyCapstone INTERFACE)
-    target_include_directories(TracyCapstone INTERFACE ${capstone_SOURCE_DIR}/include/capstone)
-    target_link_libraries(TracyCapstone INTERFACE capstone_static)
-endif()
-
-# Zstd
-
-CPMAddPackage(
-    NAME zstd
-    GITHUB_REPOSITORY facebook/zstd
-    GIT_TAG v1.5.7
-    OPTIONS
-        "ZSTD_BUILD_SHARED OFF"
-    EXCLUDE_FROM_ALL TRUE
-    SOURCE_SUBDIR build/cmake
-)
-
-# Diff Template Library
-
-set(DTL_DIR "${ROOT_DIR}/dtl")
-file(GLOB_RECURSE DTL_HEADERS CONFIGURE_DEPENDS RELATIVE ${DTL_DIR} "*.hpp")
-add_library(TracyDtl INTERFACE)
-target_sources(TracyDtl INTERFACE ${DTL_HEADERS})
-target_include_directories(TracyDtl INTERFACE ${DTL_DIR})
-
-# Get Opt
-
-set(GETOPT_DIR "${ROOT_DIR}/getopt")
-set(GETOPT_SOURCES ${GETOPT_DIR}/getopt.c)
-set(GETOPT_HEADERS ${GETOPT_DIR}/getopt.h)
-add_library(TracyGetOpt STATIC EXCLUDE_FROM_ALL ${GETOPT_SOURCES} ${GETOPT_HEADERS})
-target_include_directories(TracyGetOpt PUBLIC ${GETOPT_DIR})
-
-# PPQSort
-
-CPMAddPackage(
-    NAME PPQSort
-    GITHUB_REPOSITORY GabTux/PPQSort
-    VERSION 1.0.6
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/ppqsort-nodebug.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/ppqsort-semaphore.patch"
-    EXCLUDE_FROM_ALL TRUE
-)
-
-# json
-
-CPMAddPackage(
-    NAME json
-    GITHUB_REPOSITORY nlohmann/json
-    GIT_TAG v3.12.0
-    EXCLUDE_FROM_ALL TRUE
-)
-
-if(VENDOR_GUI)
-
-    # GLFW
-
-    if(NOT USE_WAYLAND AND NOT EMSCRIPTEN)
-        pkg_check_modules(GLFW glfw3)
-        if (GLFW_FOUND AND NOT DOWNLOAD_GLFW)
-            add_library(TracyGlfw3 INTERFACE)
-            target_include_directories(TracyGlfw3 INTERFACE ${GLFW_INCLUDE_DIRS})
-            target_link_libraries(TracyGlfw3 INTERFACE ${GLFW_LINK_LIBRARIES})
-        else()
-            CPMAddPackage(
-                NAME glfw
-                GITHUB_REPOSITORY glfw/glfw
-                GIT_TAG 3.5.1
-                OPTIONS
-                    "GLFW_BUILD_EXAMPLES OFF"
-                    "GLFW_BUILD_TESTS OFF"
-                    "GLFW_BUILD_DOCS OFF"
-                    "GLFW_INSTALL OFF"
-                EXCLUDE_FROM_ALL TRUE
-            )
-            add_library(TracyGlfw3 INTERFACE)
-            target_link_libraries(TracyGlfw3 INTERFACE glfw)
-        endif()
-    endif()
-
-    # freetype
-
-    pkg_check_modules(FREETYPE freetype2)
-    if (FREETYPE_FOUND AND NOT DOWNLOAD_FREETYPE)
-        add_library(TracyFreetype INTERFACE)
-        target_include_directories(TracyFreetype INTERFACE ${FREETYPE_INCLUDE_DIRS})
-        target_link_libraries(TracyFreetype INTERFACE ${FREETYPE_LINK_LIBRARIES})
-    else()
-        CPMAddPackage(
-            NAME freetype
-            GITHUB_REPOSITORY freetype/freetype
-            GIT_TAG VER-2-14-3
-            OPTIONS
-                "FT_DISABLE_HARFBUZZ ON"
-                "FT_WITH_HARFBUZZ OFF"
-                "FT_DISABLE_ZLIB ON"
-                "FT_DISABLE_BZIP2 ON"
-                "FT_DISABLE_PNG ON"
-                "FT_DISABLE_BROTLI ON"
-            EXCLUDE_FROM_ALL TRUE
-        )
-        add_library(TracyFreetype INTERFACE)
-        target_link_libraries(TracyFreetype INTERFACE freetype)
-    endif()
-
-    # ImGui
-
-    CPMAddPackage(
-        NAME ImGui
-        GITHUB_REPOSITORY ocornut/imgui
-        GIT_TAG v1.92.9b-docking
-        DOWNLOAD_ONLY TRUE
-        PATCHES
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-emscripten.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-loader.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-no-samplers.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-no-default-font.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-macos-clipboard.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/imgui-phantom-column.patch"
-    )
-
-    set(IMGUI_SOURCES
-        imgui_widgets.cpp
-        imgui_draw.cpp
-        imgui_demo.cpp
-        imgui.cpp
-        imgui_tables.cpp
-        misc/freetype/imgui_freetype.cpp
-        backends/imgui_impl_opengl3.cpp
-    )
-
-    list(TRANSFORM IMGUI_SOURCES PREPEND "${ImGui_SOURCE_DIR}/")
-
-    add_library(TracyImGui STATIC EXCLUDE_FROM_ALL ${IMGUI_SOURCES})
-    target_include_directories(TracyImGui PUBLIC ${ImGui_SOURCE_DIR})
-    target_link_libraries(TracyImGui PUBLIC
-        TracyFreetype
-        ${CMAKE_DL_LIBS}
-    )
-    target_compile_definitions(TracyImGui PRIVATE "IMGUI_ENABLE_FREETYPE")
-    target_compile_definitions(TracyImGui PUBLIC "IMGUI_USE_WCHAR32")
-    #target_compile_definitions(TracyImGui PUBLIC "IMGUI_DISABLE_OBSOLETE_FUNCTIONS")
-
-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND LEGACY)
-        find_package(X11 REQUIRED)
-        target_link_libraries(TracyImGui PUBLIC ${X11_LIBRARIES})
-    endif()
-
-    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        target_compile_definitions(TracyImGui PRIVATE "IMGUI_DISABLE_DEBUG_TOOLS" "IMGUI_DISABLE_DEMO_WINDOWS")
-    endif()
-
-    if(APPLE)
-        target_link_libraries(TracyImGui PUBLIC "-framework ApplicationServices")
-    endif()
-
-    # NFD
-
-    if(NOT NO_FILESELECTOR AND NOT EMSCRIPTEN)
-        if(GTK_FILESELECTOR)
-            set(NFD_PORTAL OFF)
-        else()
-            set(NFD_PORTAL ON)
-        endif()
-
-        CPMAddPackage(
-            NAME nfd
-            GITHUB_REPOSITORY btzy/nativefiledialog-extended
-            GIT_TAG 7bbbd9fe6b1d1549b41df138f614d1a44df9ba08
-            EXCLUDE_FROM_ALL TRUE
-            PATCHES
-                "${CMAKE_CURRENT_LIST_DIR}/nfd-xdg-foreign-v2.patch"
-            OPTIONS
-                "BUILD_SHARED_LIBS OFF"
-                "NFD_PORTAL ${NFD_PORTAL}"
-        )
-    endif()
-
-    # md4c
-
-    CPMAddPackage(
-        NAME md4c
-        GITHUB_REPOSITORY mity/md4c
-        GIT_TAG 00788b157b2b6ef3efd8659b66f6521229f382d7
-        OPTIONS
-            "BUILD_SHARED_LIBS OFF"
-        EXCLUDE_FROM_ALL TRUE
-    )
-
-    if(NOT EMSCRIPTEN)
-
-        # base64
-
-        set(BUILD_SHARED_LIBS_SAVE ${BUILD_SHARED_LIBS})
-        set(BUILD_SHARED_LIBS OFF)
-        CPMAddPackage(
-            NAME base64
-            GITHUB_REPOSITORY aklomp/base64
-            GIT_TAG v0.5.2
-            OPTIONS
-                "BASE64_BUILD_CLI OFF"
-                "BASE64_WITH_OpenMP OFF"
-            EXCLUDE_FROM_ALL TRUE
-        )
-        set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVE})
-
-        # tidy
-
-        CPMAddPackage(
-            NAME tidy
-            GITHUB_REPOSITORY htacg/tidy-html5
-            GIT_TAG 5.8.0
-            PATCHES
-                "${CMAKE_CURRENT_LIST_DIR}/tidy-cmake.patch"
-            EXCLUDE_FROM_ALL TRUE
-        )
-
-        # usearch
-
-        CPMAddPackage(
-            NAME usearch
-            GITHUB_REPOSITORY unum-cloud/usearch
-            GIT_TAG v2.26.2
-            EXCLUDE_FROM_ALL TRUE
-        )
-
-        # pugixml
-
-        pkg_check_modules(PUGIXML pugixml)
-        if (PUGIXML_FOUND AND NOT DOWNLOAD_PUGIXML)
-            add_library(TracyPugixml INTERFACE)
-            target_include_directories(TracyPugixml INTERFACE ${PUGIXML_INCLUDE_DIRS})
-            target_link_libraries(TracyPugixml INTERFACE ${PUGIXML_LINK_LIBRARIES})
-        else()
-            CPMAddPackage(
-                NAME pugixml
-                GITHUB_REPOSITORY zeux/pugixml
-                GIT_TAG v1.16
-                EXCLUDE_FROM_ALL TRUE
-            )
-            add_library(TracyPugixml INTERFACE)
-            target_link_libraries(TracyPugixml INTERFACE pugixml)
-        endif()
-
-        # libcurl
-
-        pkg_check_modules(LIBCURL libcurl>=7.87.0)
-        if (LIBCURL_FOUND AND NOT DOWNLOAD_LIBCURL)
-            add_library(TracyLibcurl INTERFACE)
-            target_include_directories(TracyLibcurl INTERFACE ${LIBCURL_INCLUDE_DIRS})
-            target_link_libraries(TracyLibcurl INTERFACE ${LIBCURL_LINK_LIBRARIES})
-        else()
-            CPMAddPackage(
-                NAME libcurl
-                GITHUB_REPOSITORY curl/curl
-                GIT_TAG curl-8_22_0
-                OPTIONS
-                    "BUILD_STATIC_LIBS ON"
-                    "BUILD_SHARED_LIBS OFF"
-                    "HTTP_ONLY ON"
-                    "CURL_ZSTD OFF"
-                    "CURL_USE_LIBPSL OFF"
-                    "CURL_USE_LIBSSH2 OFF"
-                    "CURL_BROTLI OFF"
-                    "USE_NGHTTP2 OFF"
-                    "USE_LIBIDN2 OFF"
-                EXCLUDE_FROM_ALL TRUE
-            )
-            add_library(TracyLibcurl INTERFACE)
-            target_link_libraries(TracyLibcurl INTERFACE libcurl_static)
-            target_include_directories(TracyLibcurl INTERFACE ${libcurl_SOURCE_DIR}/include)
-        endif()
-
-    endif()
-
-endif()
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-message("Parsing public/common/TracyVersion.hpp file")
-
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../public/common/TracyVersion.hpp" version)
-
-# Note: This looks for a specific pattern in TracyVersion.hpp, if it changes
-# this needs updating.
-string(REGEX MATCH "Major = ([0-9]+)" _ ${version})
-
-# This works do to the above () subexpression selection. See
-# https://cmake.org/cmake/help/latest/command/string.html#regex-match for more
-# details
-set(TRACY_VERSION_MAJOR ${CMAKE_MATCH_1})
-
-string(REGEX MATCH "Minor = ([0-9]+)" _ ${version})
-set(TRACY_VERSION_MINOR ${CMAKE_MATCH_1})
-
-string(REGEX MATCH "Patch = ([0-9]+)" _ ${version})
-set(TRACY_VERSION_PATCH ${CMAKE_MATCH_1})
-
-set(TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR}.${TRACY_VERSION_MINOR}.${TRACY_VERSION_PATCH}")
-
-message("VERSION ${TRACY_VERSION_STRING}")
--- a/common/TracyAlign.hpp
+++ b/common/TracyAlign.hpp
@@ -0,0 +1,27 @@
+#ifndef __TRACYALIGN_HPP__
+#define __TRACYALIGN_HPP__
+
+#include <string.h>
+
+#include "TracyForceInline.hpp"
+
+namespace tracy
+{
+
+template<typename T>
+tracy_force_inline T MemRead( const void* ptr )
+{
+    T val;
+    memcpy( &val, ptr, sizeof( T ) );
+    return val;
+}
+
+template<typename T>
+tracy_force_inline void MemWrite( void* ptr, T val )
+{
+    memcpy( ptr, &val, sizeof( T ) );
+}
+
+}
+
+#endif
--- a/common/TracyAlloc.hpp
+++ b/common/TracyAlloc.hpp
@@ -0,0 +1,33 @@
+#ifndef __TRACYALLOC_HPP__
+#define __TRACYALLOC_HPP__
+
+#include <cstdlib>
+
+#ifdef TRACY_ENABLE
+#  include "../client/tracy_rpmalloc.hpp"
+#endif
+
+namespace tracy
+{
+
+static inline void* tracy_malloc( size_t size )
+{
+#ifdef TRACY_ENABLE
+    return rpmalloc( size );
+#else
+    return malloc( size );
+#endif
+}
+
+static inline void tracy_free( void* ptr )
+{
+#ifdef TRACY_ENABLE
+    rpfree( ptr );
+#else
+    free( ptr );
+#endif
+}
+
+}
+
+#endif
--- a/public/common/TracyColor.hpp
+++ b/public/common/TracyColor.hpp
--- a/public/common/TracyForceInline.hpp
+++ b/public/common/TracyForceInline.hpp
--- a/public/common/TracyMutex.hpp
+++ b/public/common/TracyMutex.hpp
@@ -10,6 +10,15 @@ namespace tracy
 using TracyMutex = std::shared_mutex;
 }

+#elif defined __CYGWIN__
+
+#include "tracy_benaphore.h"
+
+namespace tracy
+{
+using TracyMutex = NonRecursiveBenaphore;
+}
+
 #else

 #include <mutex>
--- a/common/TracyProtocol.hpp
+++ b/common/TracyProtocol.hpp
@@ -0,0 +1,62 @@
+#ifndef __TRACYPROTOCOL_HPP__
+#define __TRACYPROTOCOL_HPP__
+
+#include <limits>
+#include <stdint.h>
+
+#include "../common/tracy_lz4.hpp"
+
+namespace tracy
+{
+
+using lz4sz_t = uint32_t;
+
+enum { TargetFrameSize = 256 * 1024 };
+enum { LZ4Size = LZ4_COMPRESSBOUND( TargetFrameSize ) };
+static_assert( LZ4Size <= std::numeric_limits<lz4sz_t>::max(), "LZ4Size greater than lz4sz_t" );
+static_assert( TargetFrameSize * 2 >= 64 * 1024, "Not enough space for LZ4 stream buffer" );
+
+enum ServerQuery : uint8_t
+{
+    ServerQueryTerminate,
+    ServerQueryString,
+    ServerQueryThreadString,
+    ServerQuerySourceLocation,
+    ServerQueryPlotName,
+    ServerQueryCallstackFrame,
+    ServerQueryFrameName,
+};
+
+enum { WelcomeMessageProgramNameSize = 64 };
+enum { WelcomeMessageHostInfoSize = 1024 };
+
+#pragma pack( 1 )
+
+struct WelcomeMessage
+{
+    double timerMul;
+    int64_t initBegin;
+    int64_t initEnd;
+    uint64_t delay;
+    uint64_t resolution;
+    uint64_t epoch;
+    uint8_t onDemand;
+    char programName[WelcomeMessageProgramNameSize];
+    char hostInfo[WelcomeMessageHostInfoSize];
+};
+
+enum { WelcomeMessageSize = sizeof( WelcomeMessage ) };
+
+
+struct OnDemandPayloadMessage
+{
+    uint64_t frames;
+};
+
+enum { OnDemandPayloadMessageSize = sizeof( OnDemandPayloadMessage ) };
+
+#pragma pack()
+
+}
+
+#endif
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -0,0 +1,346 @@
+#ifndef __TRACYQUEUE_HPP__
+#define __TRACYQUEUE_HPP__
+
+#include <stdint.h>
+
+namespace tracy
+{
+
+enum class QueueType : uint8_t
+{
+    ZoneText,
+    ZoneName,
+    Message,
+    ZoneBeginAllocSrcLoc,
+    CallstackMemory,
+    Callstack,
+    Terminate,
+    KeepAlive,
+    Crash,
+    CrashReport,
+    ZoneBegin,
+    ZoneBeginCallstack,
+    ZoneEnd,
+    FrameMarkMsg,
+    FrameMarkMsgStart,
+    FrameMarkMsgEnd,
+    SourceLocation,
+    LockAnnounce,
+    LockWait,
+    LockObtain,
+    LockRelease,
+    LockSharedWait,
+    LockSharedObtain,
+    LockSharedRelease,
+    LockMark,
+    PlotData,
+    MessageLiteral,
+    GpuNewContext,
+    GpuZoneBegin,
+    GpuZoneBeginCallstack,
+    GpuZoneEnd,
+    GpuTime,
+    MemAlloc,
+    MemFree,
+    MemAllocCallstack,
+    MemFreeCallstack,
+    CallstackFrame,
+    StringData,
+    ThreadName,
+    CustomStringData,
+    PlotName,
+    SourceLocationPayload,
+    CallstackPayload,
+    FrameName,
+    NUM_TYPES
+};
+
+#pragma pack( 1 )
+
+struct QueueZoneBegin
+{
+    int64_t time;
+    uint64_t thread;
+    uint64_t srcloc;    // ptr
+    uint32_t cpu;
+};
+
+struct QueueZoneEnd
+{
+    int64_t time;
+    uint64_t thread;
+    uint32_t cpu;
+};
+
+struct QueueStringTransfer
+{
+    uint64_t ptr;
+};
+
+struct QueueFrameMark
+{
+    int64_t time;
+    uint64_t name;      // ptr
+};
+
+struct QueueSourceLocation
+{
+    uint64_t name;
+    uint64_t function;  // ptr
+    uint64_t file;      // ptr
+    uint32_t line;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
+struct QueueZoneText
+{
+    uint64_t thread;
+    uint64_t text;      // ptr
+};
+
+enum class LockType : uint8_t
+{
+    Lockable,
+    SharedLockable
+};
+
+struct QueueLockAnnounce
+{
+    uint32_t id;
+    uint64_t lckloc;    // ptr
+    LockType type;
+};
+
+struct QueueLockWait
+{
+    uint32_t id;
+    int64_t time;
+    uint64_t thread;
+    LockType type;
+};
+
+struct QueueLockObtain
+{
+    uint32_t id;
+    int64_t time;
+    uint64_t thread;
+};
+
+struct QueueLockRelease
+{
+    uint32_t id;
+    int64_t time;
+    uint64_t thread;
+};
+
+struct QueueLockMark
+{
+    uint32_t id;
+    uint64_t thread;
+    uint64_t srcloc;    // ptr
+};
+
+enum class PlotDataType : uint8_t
+{
+    Float,
+    Double,
+    Int
+};
+
+struct QueuePlotData
+{
+    uint64_t name;      // ptr
+    int64_t time;
+    PlotDataType type;
+    union
+    {
+        double d;
+        float f;
+        int64_t i;
+    } data;
+};
+
+struct QueueMessage
+{
+    int64_t time;
+    uint64_t thread;
+    uint64_t text;      // ptr
+};
+
+struct QueueGpuNewContext
+{
+    int64_t cpuTime;
+    int64_t gpuTime;
+    uint64_t thread;
+    float period;
+    uint8_t context;
+    uint8_t accuracyBits;
+};
+
+struct QueueGpuZoneBegin
+{
+    int64_t cpuTime;
+    uint64_t srcloc;
+    uint64_t thread;
+    uint16_t queryId;
+    uint8_t context;
+};
+
+struct QueueGpuZoneEnd
+{
+    int64_t cpuTime;
+    uint16_t queryId;
+    uint8_t context;
+};
+
+struct QueueGpuTime
+{
+    int64_t gpuTime;
+    uint16_t queryId;
+    uint8_t context;
+};
+
+struct QueueMemAlloc
+{
+    int64_t time;
+    uint64_t thread;
+    uint64_t ptr;
+    char size[6];
+};
+
+struct QueueMemFree
+{
+    int64_t time;
+    uint64_t thread;
+    uint64_t ptr;
+};
+
+struct QueueCallstackMemory
+{
+    uint64_t ptr;
+};
+
+struct QueueCallstack
+{
+    uint64_t ptr;
+    uint64_t thread;
+};
+
+struct QueueCallstackFrame
+{
+    uint64_t ptr;
+    uint64_t name;
+    uint64_t file;
+    uint32_t line;
+};
+
+struct QueueCrashReport
+{
+    int64_t time;
+    uint64_t thread;
+    uint64_t text;      // ptr
+};
+
+struct QueueHeader
+{
+    union
+    {
+        QueueType type;
+        uint8_t idx;
+    };
+};
+
+struct QueueItem
+{
+    QueueHeader hdr;
+    union
+    {
+        QueueZoneBegin zoneBegin;
+        QueueZoneEnd zoneEnd;
+        QueueStringTransfer stringTransfer;
+        QueueFrameMark frameMark;
+        QueueSourceLocation srcloc;
+        QueueZoneText zoneText;
+        QueueLockAnnounce lockAnnounce;
+        QueueLockWait lockWait;
+        QueueLockObtain lockObtain;
+        QueueLockRelease lockRelease;
+        QueueLockMark lockMark;
+        QueuePlotData plotData;
+        QueueMessage message;
+        QueueGpuNewContext gpuNewContext;
+        QueueGpuZoneBegin gpuZoneBegin;
+        QueueGpuZoneEnd gpuZoneEnd;
+        QueueGpuTime gpuTime;
+        QueueMemAlloc memAlloc;
+        QueueMemFree memFree;
+        QueueCallstackMemory callstackMemory;
+        QueueCallstack callstack;
+        QueueCallstackFrame callstackFrame;
+        QueueCrashReport crashReport;
+    };
+};
+
+#pragma pack()
+
+enum { QueueItemSize = sizeof( QueueItem ) };
+
+static const size_t QueueDataSize[] = {
+    sizeof( QueueHeader ) + sizeof( QueueZoneText ),
+    sizeof( QueueHeader ) + sizeof( QueueZoneText ),        // zone name
+    sizeof( QueueHeader ) + sizeof( QueueMessage ),
+    sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),       // allocated source location
+    sizeof( QueueHeader ) + sizeof( QueueCallstackMemory ),
+    sizeof( QueueHeader ) + sizeof( QueueCallstack ),
+    // above items must be first
+    sizeof( QueueHeader ),                                  // terminate
+    sizeof( QueueHeader ),                                  // keep alive
+    sizeof( QueueHeader ),                                  // crash
+    sizeof( QueueHeader ) + sizeof( QueueCrashReport ),
+    sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),
+    sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),       // callstack
+    sizeof( QueueHeader ) + sizeof( QueueZoneEnd ),
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // continuous frames
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // start
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // end
+    sizeof( QueueHeader ) + sizeof( QueueSourceLocation ),
+    sizeof( QueueHeader ) + sizeof( QueueLockAnnounce ),
+    sizeof( QueueHeader ) + sizeof( QueueLockWait ),
+    sizeof( QueueHeader ) + sizeof( QueueLockObtain ),
+    sizeof( QueueHeader ) + sizeof( QueueLockRelease ),
+    sizeof( QueueHeader ) + sizeof( QueueLockWait ),
+    sizeof( QueueHeader ) + sizeof( QueueLockObtain ),
+    sizeof( QueueHeader ) + sizeof( QueueLockRelease ),
+    sizeof( QueueHeader ) + sizeof( QueueLockMark ),
+    sizeof( QueueHeader ) + sizeof( QueuePlotData ),
+    sizeof( QueueHeader ) + sizeof( QueueMessage ),         // literal
+    sizeof( QueueHeader ) + sizeof( QueueGpuNewContext ),
+    sizeof( QueueHeader ) + sizeof( QueueGpuZoneBegin ),
+    sizeof( QueueHeader ) + sizeof( QueueGpuZoneBegin ),    // callstack
+    sizeof( QueueHeader ) + sizeof( QueueGpuZoneEnd ),
+    sizeof( QueueHeader ) + sizeof( QueueGpuTime ),
+    sizeof( QueueHeader ) + sizeof( QueueMemAlloc ),
+    sizeof( QueueHeader ) + sizeof( QueueMemFree ),
+    sizeof( QueueHeader ) + sizeof( QueueMemAlloc ),        // callstack
+    sizeof( QueueHeader ) + sizeof( QueueMemFree ),         // callstack
+    sizeof( QueueHeader ) + sizeof( QueueCallstackFrame ),
+    // keep all QueueStringTransfer below
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // string data
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // thread name
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // custom string data
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // plot name
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // allocated source location payload
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // callstack payload
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // frame name
+};
+
+static_assert( QueueItemSize == 32, "Queue item size not 32 bytes" );
+static_assert( sizeof( QueueDataSize ) / sizeof( size_t ) == (uint8_t)QueueType::NUM_TYPES, "QueueDataSize mismatch" );
+static_assert( sizeof( void* ) <= sizeof( uint64_t ), "Pointer size > 8 bytes" );
+static_assert( sizeof( void* ) == sizeof( uintptr_t ), "Pointer size != uintptr_t" );
+
+};
+
+#endif
--- a/common/TracySocket.cpp
+++ b/common/TracySocket.cpp
@@ -0,0 +1,335 @@
+#include <algorithm>
+#include <assert.h>
+#include <new>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "TracyAlloc.hpp"
+#include "TracySocket.hpp"
+
+#ifdef _MSC_VER
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#  pragma warning(disable:4244)
+#  pragma warning(disable:4267)
+#else
+#  include <sys/socket.h>
+#  include <netdb.h>
+#  include <unistd.h>
+#endif
+
+#ifndef MSG_NOSIGNAL
+#  define MSG_NOSIGNAL 0
+#endif
+
+namespace tracy
+{
+
+#ifdef _MSC_VER
+typedef SOCKET socket_t;
+#else
+typedef int socket_t;
+#endif
+
+#ifdef _MSC_VER
+struct __wsinit
+{
+    __wsinit()
+    {
+        WSADATA wsaData;
+        if( WSAStartup( MAKEWORD( 2, 2 ), &wsaData ) != 0 )
+        {
+            fprintf( stderr, "Cannot init winsock.\n" );
+            exit( 1 );
+        }
+    }
+};
+
+void InitWinSock()
+{
+    static __wsinit init;
+}
+#endif
+
+Socket::Socket()
+    : m_sock( -1 )
+    , m_buf( (char*)tracy_malloc( BufSize ) )
+    , m_bufPtr( nullptr )
+    , m_bufLeft( 0 )
+{
+#ifdef _MSC_VER
+    InitWinSock();
+#endif
+}
+
+Socket::Socket( int sock )
+    : m_sock( sock )
+    , m_buf( (char*)tracy_malloc( BufSize ) )
+    , m_bufPtr( nullptr )
+    , m_bufLeft( 0 )
+{
+}
+
+Socket::~Socket()
+{
+    tracy_free( m_buf );
+    if( m_sock != -1 )
+    {
+        Close();
+    }
+}
+
+bool Socket::Connect( const char* addr, const char* port )
+{
+    assert( m_sock == -1 );
+
+    struct addrinfo hints;
+    struct addrinfo *res, *ptr;
+
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+
+    if( getaddrinfo( addr, port, &hints, &res ) != 0 ) return false;
+    int sock = 0;
+    for( ptr = res; ptr; ptr = ptr->ai_next )
+    {
+        if( ( sock = socket( ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol ) ) == -1 ) continue;
+#if defined __APPLE__
+        int val = 1;
+        setsockopt( m_sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof( val ) );
+#endif
+        if( connect( sock, ptr->ai_addr, ptr->ai_addrlen ) == -1 )
+        {
+#ifdef _MSC_VER
+            closesocket( sock );
+#else
+            close( sock );
+#endif
+            continue;
+        }
+        break;
+    }
+    freeaddrinfo( res );
+    if( !ptr ) return false;
+
+    m_sock = sock;
+    return true;
+}
+
+void Socket::Close()
+{
+    assert( m_sock != -1 );
+#ifdef _MSC_VER
+    closesocket( m_sock );
+#else
+    close( m_sock );
+#endif
+    m_sock = -1;
+}
+
+int Socket::Send( const void* _buf, int len )
+{
+    auto buf = (const char*)_buf;
+    assert( m_sock != -1 );
+    auto start = buf;
+    while( len > 0 )
+    {
+        auto ret = send( m_sock, buf, len, MSG_NOSIGNAL );
+        if( ret == -1 ) return -1;
+        len -= ret;
+        buf += ret;
+    }
+    return int( buf - start );
+}
+
+int Socket::RecvBuffered( void* buf, int len, const timeval* tv )
+{
+    if( len <= m_bufLeft )
+    {
+        memcpy( buf, m_bufPtr, len );
+        m_bufPtr += len;
+        m_bufLeft -= len;
+        return len;
+    }
+
+    if( m_bufLeft > 0 )
+    {
+        memcpy( buf, m_bufPtr, m_bufLeft );
+        const auto ret = m_bufLeft;
+        m_bufLeft = 0;
+        return ret;
+    }
+
+    if( len >= BufSize ) return Recv( buf, len, tv );
+
+    m_bufLeft = Recv( m_buf, BufSize, tv );
+    if( m_bufLeft <= 0 ) return m_bufLeft;
+
+    const auto sz = std::min( len, m_bufLeft );
+    memcpy( buf, m_buf, sz );
+    m_bufPtr = m_buf + sz;
+    m_bufLeft -= sz;
+    return sz;
+}
+
+int Socket::Recv( void* _buf, int len, const timeval* tv )
+{
+    auto buf = (char*)_buf;
+
+    fd_set fds;
+    FD_ZERO( &fds );
+    FD_SET( static_cast<socket_t>(m_sock), &fds );
+
+#ifndef _WIN32
+    timeval _tv = *tv;
+    select( m_sock+1, &fds, nullptr, nullptr, &_tv );
+#else
+    select( m_sock+1, &fds, nullptr, nullptr, tv );
+#endif
+    if( FD_ISSET( m_sock, &fds ) )
+    {
+        return recv( m_sock, buf, len, 0 );
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+bool Socket::Read( void* _buf, int len, const timeval* tv, std::function<bool()> exitCb )
+{
+    auto buf = (char*)_buf;
+
+    while( len > 0 )
+    {
+        if( exitCb() ) return false;
+        const auto sz = RecvBuffered( buf, len, tv );
+        switch( sz )
+        {
+        case 0:
+            return false;
+        case -1:
+#ifdef _WIN32
+        {
+            auto err = WSAGetLastError();
+            if( err == WSAECONNABORTED || err == WSAECONNRESET ) return false;
+        }
+#endif
+            break;
+        default:
+            len -= sz;
+            buf += sz;
+            break;
+        }
+    }
+
+    return true;
+}
+
+bool Socket::HasData()
+{
+    if( m_bufLeft > 0 ) return true;
+
+    struct timeval tv;
+    memset( &tv, 0, sizeof( tv ) );
+
+    fd_set fds;
+    FD_ZERO( &fds );
+    FD_SET( static_cast<socket_t>(m_sock), &fds );
+
+    return select( m_sock+1, &fds, nullptr, nullptr, &tv ) > 0;
+}
+
+
+ListenSocket::ListenSocket()
+    : m_sock( -1 )
+{
+#ifdef _MSC_VER
+    InitWinSock();
+#endif
+}
+
+ListenSocket::~ListenSocket()
+{
+}
+
+bool ListenSocket::Listen( const char* port, int backlog )
+{
+    assert( m_sock == -1 );
+
+    struct addrinfo* res;
+    struct addrinfo hints;
+
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_INET6;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
+
+    if( getaddrinfo( nullptr, port, &hints, &res ) != 0 ) return false;
+
+    m_sock = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
+#if defined _MSC_VER || defined __CYGWIN__
+    unsigned long val = 0;
+    setsockopt( m_sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&val, sizeof( val ) );
+#else
+    int val = 1;
+    setsockopt( m_sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof( val ) );
+#endif
+    if( bind( m_sock, res->ai_addr, res->ai_addrlen ) == -1 ) return false;
+    if( listen( m_sock, backlog ) == -1 ) return false;
+    return true;
+}
+
+Socket* ListenSocket::Accept()
+{
+    struct sockaddr_storage remote;
+    socklen_t sz = sizeof( remote );
+
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+
+    fd_set fds;
+    FD_ZERO( &fds );
+    FD_SET( static_cast<socket_t>(m_sock), &fds );
+
+    select( m_sock+1, &fds, nullptr, nullptr, &tv );
+    if( FD_ISSET( m_sock, &fds ) )
+    {
+        int sock = accept( m_sock, (sockaddr*)&remote, &sz);
+#if defined __APPLE__
+        int val = 1;
+        setsockopt( sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof( val ) );
+#endif
+        if( sock == -1 )
+        {
+            return nullptr;
+        }
+        else
+        {
+            auto ptr = (Socket*)tracy_malloc( sizeof( Socket ) );
+            new(ptr) Socket( sock );
+            return ptr;
+        }
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+void ListenSocket::Close()
+{
+    assert( m_sock != -1 );
+#ifdef _MSC_VER
+    closesocket( m_sock );
+#else
+    close( m_sock );
+#endif
+    m_sock = -1;
+}
+
+}
--- a/common/TracySocket.hpp
+++ b/common/TracySocket.hpp
@@ -0,0 +1,69 @@
+#ifndef __TRACYSOCKET_HPP__
+#define __TRACYSOCKET_HPP__
+
+#include <functional>
+
+struct timeval;
+
+namespace tracy
+{
+
+#ifdef _MSC_VER
+void InitWinSock();
+#endif
+
+class Socket
+{
+    enum { BufSize = 128 * 1024 };
+
+public:
+    Socket();
+    Socket( int sock );
+    ~Socket();
+
+    bool Connect( const char* addr, const char* port );
+    void Close();
+
+    int Send( const void* buf, int len );
+
+    bool Read( void* buf, int len, const timeval* tv, std::function<bool()> exitCb );
+    bool HasData();
+
+    Socket( const Socket& ) = delete;
+    Socket( Socket&& ) = delete;
+    Socket& operator=( const Socket& ) = delete;
+    Socket& operator=( Socket&& ) = delete;
+
+private:
+    int RecvBuffered( void* buf, int len, const timeval* tv );
+    int Recv( void* buf, int len, const timeval* tv );
+
+    int m_sock;
+
+    char* m_buf;
+    char* m_bufPtr;
+    int m_bufLeft;
+};
+
+class ListenSocket
+{
+public:
+    ListenSocket();
+    ~ListenSocket();
+
+    bool Listen( const char* port, int backlog );
+    Socket* Accept();
+    void Close();
+
+    ListenSocket( const ListenSocket& ) = delete;
+    ListenSocket( ListenSocket&& ) = delete;
+    ListenSocket& operator=( const ListenSocket& ) = delete;
+    ListenSocket& operator=( ListenSocket&& ) = delete;
+
+private:
+    int m_sock;
+};
+
+}
+
+#endif
--- a/common/TracySystem.cpp
+++ b/common/TracySystem.cpp
@@ -0,0 +1,183 @@
+#if defined _MSC_VER || defined __CYGWIN__ || defined _WIN32
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
+#endif
+#ifdef _WIN32
+#  include <windows.h>
+#else
+#  include <pthread.h>
+#  include <string.h>
+#  include <unistd.h>
+#endif
+
+#ifdef __linux__
+#   ifndef __ANDROID__
+#       include <syscall.h>
+#   endif
+#   include <fcntl.h>
+#endif
+
+#include <inttypes.h>
+#include <stdio.h>
+
+#include "TracySystem.hpp"
+
+#ifdef TRACY_COLLECT_THREAD_NAMES
+#  include <atomic>
+#  include "TracyAlloc.hpp"
+#endif
+
+namespace tracy
+{
+
+#ifdef TRACY_COLLECT_THREAD_NAMES
+struct ThreadNameData
+{
+    uint64_t id;
+    const char* name;
+    ThreadNameData* next;
+};
+extern std::atomic<ThreadNameData*>& s_threadNameData;
+#endif
+
+void SetThreadName( std::thread& thread, const char* name )
+{
+    SetThreadName( thread.native_handle(), name );
+}
+
+void SetThreadName( std::thread::native_handle_type handle, const char* name )
+{
+#ifdef _WIN32
+#  if defined NTDDI_WIN10_RS2 && NTDDI_VERSION >= NTDDI_WIN10_RS2
+    wchar_t buf[256];
+    mbstowcs( buf, name, 256 );
+    SetThreadDescription( static_cast<HANDLE>( handle ), buf );
+#  else
+    const DWORD MS_VC_EXCEPTION=0x406D1388;
+#    pragma pack( push, 8 )
+    struct THREADNAME_INFO
+    {
+        DWORD dwType;
+        LPCSTR szName;
+        DWORD dwThreadID;
+        DWORD dwFlags;
+    };
+#    pragma pack(pop)
+
+    DWORD ThreadId = GetThreadId( static_cast<HANDLE>( handle ) );
+    THREADNAME_INFO info;
+    info.dwType = 0x1000;
+    info.szName = name;
+    info.dwThreadID = ThreadId;
+    info.dwFlags = 0;
+
+    __try
+    {
+        RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
+    }
+    __except(EXCEPTION_EXECUTE_HANDLER)
+    {
+    }
+#  endif
+#elif defined _GNU_SOURCE && !defined __EMSCRIPTEN__
+    {
+        const auto sz = strlen( name );
+        if( sz <= 15 )
+        {
+            pthread_setname_np( handle, name );
+        }
+        else
+        {
+            char buf[16];
+            memcpy( buf, name, 15 );
+            buf[15] = '\0';
+            pthread_setname_np( handle, buf );
+        }
+    }
+#endif
+#ifdef TRACY_COLLECT_THREAD_NAMES
+    {
+        rpmalloc_thread_initialize();
+        const auto sz = strlen( name );
+        char* buf = (char*)tracy_malloc( sz+1 );
+        memcpy( buf, name, sz );
+        buf[sz+1] = '\0';
+        auto data = (ThreadNameData*)tracy_malloc( sizeof( ThreadNameData ) );
+#  ifdef _WIN32
+        data->id = GetThreadId( static_cast<HANDLE>( handle ) );
+#  elif defined __APPLE__
+        pthread_threadid_np( handle, &data->id );
+#  else
+        data->id = (uint64_t)handle;
+#  endif
+        data->name = buf;
+        data->next = s_threadNameData.load( std::memory_order_relaxed );
+        while( !s_threadNameData.compare_exchange_weak( data->next, data, std::memory_order_release, std::memory_order_relaxed ) ) {}
+    }
+#endif
+}
+
+const char* GetThreadName( uint64_t id )
+{
+    static char buf[256];
+#ifdef TRACY_COLLECT_THREAD_NAMES
+    auto ptr = s_threadNameData.load( std::memory_order_relaxed );
+    while( ptr )
+    {
+        if( ptr->id == id )
+        {
+            return ptr->name;
+        }
+        ptr = ptr->next;
+    }
+#else
+#  ifdef _WIN32
+#    if defined NTDDI_WIN10_RS2 && NTDDI_VERSION >= NTDDI_WIN10_RS2
+    auto hnd = OpenThread( THREAD_QUERY_LIMITED_INFORMATION, FALSE, (DWORD)id );
+    if( hnd != 0 )
+    {
+        PWSTR tmp;
+        GetThreadDescription( hnd, &tmp );
+        auto ret = wcstombs( buf, tmp, 256 );
+        CloseHandle( hnd );
+        if( ret != 0 )
+        {
+            return buf;
+        }
+    }
+#    endif
+#  elif defined __GLIBC__ && !defined __ANDROID__ && !defined __EMSCRIPTEN__
+    if( pthread_getname_np( (pthread_t)id, buf, 256 ) == 0 )
+    {
+        return buf;
+    }
+#  elif defined __linux__
+    int cs, fd;
+    char path[32];
+#   ifdef __ANDROID__
+    int tid = gettid();
+#   else
+    int tid = (int) syscall( SYS_gettid );
+#   endif
+    snprintf( path, sizeof( path ), "/proc/self/task/%d/comm", tid );
+    sprintf( buf, "%" PRIu64, id );
+    pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &cs );
+    if ( ( fd = open( path, O_RDONLY ) ) > 0) {
+        int len = read( fd, buf, 255 );
+        if ( len > 0 )
+            buf[len] = 0;
+        close( fd );
+    }
+    pthread_setcancelstate( cs, 0 );
+    return buf;
+#  endif
+#endif
+    sprintf( buf, "%" PRIu64, id );
+    return buf;
+}
+
+}
--- a/common/TracySystem.hpp
+++ b/common/TracySystem.hpp
@@ -0,0 +1,45 @@
+#ifndef __TRACYSYSTEM_HPP__
+#define __TRACYSYSTEM_HPP__
+
+#ifdef TRACY_ENABLE
+#  if defined __ANDROID__ || defined __CYGWIN__ || defined __APPLE__ || defined _GNU_SOURCE || ( defined _WIN32 && ( !defined NTDDI_WIN10_RS2 || NTDDI_VERSION < NTDDI_WIN10_RS2 ) )
+#    define TRACY_COLLECT_THREAD_NAMES
+#  endif
+#endif
+
+#ifdef _WIN32
+#ifndef _WINDOWS_
+extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void);
+#endif
+#else
+#  include <pthread.h>
+#endif
+
+#include <stdint.h>
+#include <thread>
+
+namespace tracy
+{
+
+static inline uint64_t GetThreadHandle()
+{
+#ifdef _WIN32
+    static_assert( sizeof( decltype( GetCurrentThreadId() ) ) <= sizeof( uint64_t ), "Thread handle too big to fit in protocol" );
+    return uint64_t( GetCurrentThreadId() );
+#elif defined __APPLE__
+    uint64_t id;
+    pthread_threadid_np( pthread_self(), &id );
+    return id;
+#else
+    static_assert( sizeof( decltype( pthread_self() ) ) <= sizeof( uint64_t ), "Thread handle too big to fit in protocol" );
+    return uint64_t( pthread_self() );
+#endif
+}
+
+void SetThreadName( std::thread& thread, const char* name );
+void SetThreadName( std::thread::native_handle_type handle, const char* name );
+const char* GetThreadName( uint64_t id );
+
+}
+
+#endif
--- a/common/tracy_benaphore.h
+++ b/common/tracy_benaphore.h
@@ -0,0 +1,68 @@
+// Copyright (c) 2015 Jeff Preshing
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgement in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef __TRACY_CPP11OM_BENAPHORE_H__
+#define __TRACY_CPP11OM_BENAPHORE_H__
+
+#include <cassert>
+#include <thread>
+#include <atomic>
+#include "tracy_sema.h"
+
+namespace tracy
+{
+
+class NonRecursiveBenaphore
+{
+private:
+    std::atomic<int> m_contentionCount;
+    DefaultSemaphoreType m_sema;
+
+public:
+    NonRecursiveBenaphore() : m_contentionCount(0) {}
+
+    void lock()
+    {
+        if (m_contentionCount.fetch_add(1, std::memory_order_acquire) > 0)
+        {
+            m_sema.wait();
+        }
+    }
+
+    bool try_lock()
+    {
+        if (m_contentionCount.load(std::memory_order_relaxed) != 0)
+            return false;
+        int expected = 0;
+        return m_contentionCount.compare_exchange_strong(expected, 1, std::memory_order_acquire);
+    }
+
+    void unlock()
+    {
+        int oldCount = m_contentionCount.fetch_sub(1, std::memory_order_release);
+        assert(oldCount > 0);
+        if (oldCount > 1)
+        {
+            m_sema.signal();
+        }
+    }
+};
+
+}
+
+#endif // __CPP11OM_BENAPHORE_H__
--- a/common/tracy_lz4.cpp
+++ b/common/tracy_lz4.cpp
--- a/common/tracy_lz4.hpp
+++ b/common/tracy_lz4.hpp
@@ -0,0 +1,604 @@
+/*
+ *  LZ4 - Fast LZ compression algorithm
+ *  Header File
+ *  Copyright (C) 2011-2017, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+       * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following disclaimer
+   in the documentation and/or other materials provided with the
+   distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   You can contact the author at :
+    - LZ4 homepage : http://www.lz4.org
+    - LZ4 source repository : https://github.com/lz4/lz4
+*/
+
+
+#ifndef TRACY_LZ4_H_2983827168210
+#define TRACY_LZ4_H_2983827168210
+
+/* --- Dependency --- */
+#include <stddef.h>   /* size_t */
+#include <stdint.h>
+
+namespace tracy
+{
+
+/**
+  Introduction
+
+  LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core,
+  scalable with multi-cores CPU. It features an extremely fast decoder, with speed in
+  multiple GB/s per core, typically reaching RAM speed limits on multi-core systems.
+
+  The LZ4 compression library provides in-memory compression and decompression functions.
+  Compression can be done in:
+    - a single step (described as Simple Functions)
+    - a single step, reusing a context (described in Advanced Functions)
+    - unbounded multiple steps (described as Streaming compression)
+
+  lz4.h provides block compression functions. It gives full buffer control to user.
+  Decompressing an lz4-compressed block also requires metadata (such as compressed size).
+  Each application is free to encode such metadata in whichever way it wants.
+
+  An additional format, called LZ4 frame specification (doc/lz4_Frame_format.md),
+  take care of encoding standard metadata alongside LZ4-compressed blocks.
+  If your application requires interoperability, it's recommended to use it.
+  A library is provided to take care of it, see lz4frame.h.
+*/
+
+/*^***************************************************************
+*  Export parameters
+*****************************************************************/
+/*
+*  LZ4_DLL_EXPORT :
+*  Enable exporting of functions when building a Windows DLL
+*  LZ4LIB_VISIBILITY :
+*  Control library symbols visibility.
+*/
+#ifndef LZ4LIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define LZ4LIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define LZ4LIB_VISIBILITY
+#  endif
+#endif
+#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1)
+#  define LZ4LIB_API __declspec(dllexport) LZ4LIB_VISIBILITY
+#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)
+#  define LZ4LIB_API __declspec(dllimport) LZ4LIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define LZ4LIB_API LZ4LIB_VISIBILITY
+#endif
+
+/*------   Version   ------*/
+#define LZ4_VERSION_MAJOR    1    /* for breaking interface changes  */
+#define LZ4_VERSION_MINOR    8    /* for new (non-breaking) interface capabilities */
+#define LZ4_VERSION_RELEASE  2    /* for tweaks, bug-fixes, or development */
+
+#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
+
+#define LZ4_LIB_VERSION LZ4_VERSION_MAJOR.LZ4_VERSION_MINOR.LZ4_VERSION_RELEASE
+#define LZ4_QUOTE(str) #str
+#define LZ4_EXPAND_AND_QUOTE(str) LZ4_QUOTE(str)
+#define LZ4_VERSION_STRING LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION)
+
+LZ4LIB_API int LZ4_versionNumber (void);  /**< library version number; useful to check dll version */
+LZ4LIB_API const char* LZ4_versionString (void);   /**< library version string; unseful to check dll version */
+
+
+/*-************************************
+*  Tuning parameter
+**************************************/
+/*!
+ * LZ4_MEMORY_USAGE :
+ * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.)
+ * Increasing memory usage improves compression ratio
+ * Reduced memory usage may improve speed, thanks to cache effect
+ * Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache
+ */
+#ifndef LZ4_MEMORY_USAGE
+# define LZ4_MEMORY_USAGE 12
+#endif
+
+/*-************************************
+*  Simple Functions
+**************************************/
+/*! LZ4_compress_default() :
+    Compresses 'srcSize' bytes from buffer 'src'
+    into already allocated 'dst' buffer of size 'dstCapacity'.
+    Compression is guaranteed to succeed if 'dstCapacity' >= LZ4_compressBound(srcSize).
+    It also runs faster, so it's a recommended setting.
+    If the function cannot compress 'src' into a more limited 'dst' budget,
+    compression stops *immediately*, and the function result is zero.
+    Note : as a consequence, 'dst' content is not valid.
+    Note 2 : This function is protected against buffer overflow scenarios (never writes outside 'dst' buffer, nor read outside 'source' buffer).
+        srcSize : max supported value is LZ4_MAX_INPUT_SIZE.
+        dstCapacity : size of buffer 'dst' (which must be already allocated)
+        return  : the number of bytes written into buffer 'dst' (necessarily <= dstCapacity)
+                  or 0 if compression fails */
+LZ4LIB_API int LZ4_compress_default(const char* src, char* dst, int srcSize, int dstCapacity);
+
+/*! LZ4_decompress_safe() :
+    compressedSize : is the exact complete size of the compressed block.
+    dstCapacity : is the size of destination buffer, which must be already allocated.
+    return : the number of bytes decompressed into destination buffer (necessarily <= dstCapacity)
+             If destination buffer is not large enough, decoding will stop and output an error code (negative value).
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             This function is protected against malicious data packets.
+*/
+LZ4LIB_API int LZ4_decompress_safe (const char* src, char* dst, int compressedSize, int dstCapacity);
+
+
+/*-************************************
+*  Advanced Functions
+**************************************/
+#define LZ4_MAX_INPUT_SIZE        0x7E000000   /* 2 113 929 216 bytes */
+#define LZ4_COMPRESSBOUND(isize)  ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16)
+
+/*!
+LZ4_compressBound() :
+    Provides the maximum size that LZ4 compression may output in a "worst case" scenario (input data not compressible)
+    This function is primarily useful for memory allocation purposes (destination buffer size).
+    Macro LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack memory allocation for example).
+    Note that LZ4_compress_default() compresses faster when dstCapacity is >= LZ4_compressBound(srcSize)
+        inputSize  : max supported value is LZ4_MAX_INPUT_SIZE
+        return : maximum output size in a "worst case" scenario
+              or 0, if input size is incorrect (too large or negative)
+*/
+LZ4LIB_API int LZ4_compressBound(int inputSize);
+
+/*!
+LZ4_compress_fast() :
+    Same as LZ4_compress_default(), but allows selection of "acceleration" factor.
+    The larger the acceleration value, the faster the algorithm, but also the lesser the compression.
+    It's a trade-off. It can be fine tuned, with each successive value providing roughly +~3% to speed.
+    An acceleration value of "1" is the same as regular LZ4_compress_default()
+    Values <= 0 will be replaced by ACCELERATION_DEFAULT (currently == 1, see lz4.c).
+*/
+LZ4LIB_API int LZ4_compress_fast (const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+
+/*!
+LZ4_compress_fast_extState() :
+    Same compression function, just using an externally allocated memory space to store compression state.
+    Use LZ4_sizeofState() to know how much memory must be allocated,
+    and allocate it on 8-bytes boundaries (using malloc() typically).
+    Then, provide it as 'void* state' to compression function.
+*/
+LZ4LIB_API int LZ4_sizeofState(void);
+LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+
+/*!
+LZ4_compress_destSize() :
+    Reverse the logic : compresses as much data as possible from 'src' buffer
+    into already allocated buffer 'dst' of size 'targetDestSize'.
+    This function either compresses the entire 'src' content into 'dst' if it's large enough,
+    or fill 'dst' buffer completely with as much data as possible from 'src'.
+        *srcSizePtr : will be modified to indicate how many bytes where read from 'src' to fill 'dst'.
+                      New value is necessarily <= old value.
+        return : Nb bytes written into 'dst' (necessarily <= targetDestSize)
+                 or 0 if compression fails
+*/
+LZ4LIB_API int LZ4_compress_destSize (const char* src, char* dst, int* srcSizePtr, int targetDstSize);
+
+
+/*!
+LZ4_decompress_fast() : **unsafe!**
+This function is a bit faster than LZ4_decompress_safe(),
+but it may misbehave on malformed input because it doesn't perform full validation of compressed data.
+    originalSize : is the uncompressed size to regenerate
+                   Destination buffer must be already allocated, and its size must be >= 'originalSize' bytes.
+    return : number of bytes read from source buffer (== compressed size).
+             If the source stream is detected malformed, the function stops decoding and return a negative result.
+    note : This function is only usable if the originalSize of uncompressed data is known in advance.
+           The caller should also check that all the compressed input has been consumed properly,
+           i.e. that the return value matches the size of the buffer with compressed input.
+           The function never writes past the output buffer.  However, since it doesn't know its 'src' size,
+           it may read past the intended input.  Also, because match offsets are not validated during decoding,
+           reads from 'src' may underflow.  Use this function in trusted environment **only**.
+*/
+LZ4LIB_API int LZ4_decompress_fast (const char* src, char* dst, int originalSize);
+
+/*!
+LZ4_decompress_safe_partial() :
+    This function decompress a compressed block of size 'srcSize' at position 'src'
+    into destination buffer 'dst' of size 'dstCapacity'.
+    The function will decompress a minimum of 'targetOutputSize' bytes, and stop after that.
+    However, it's not accurate, and may write more than 'targetOutputSize' (but always <= dstCapacity).
+   @return : the number of bytes decoded in the destination buffer (necessarily <= dstCapacity)
+        Note : this number can also be < targetOutputSize, if compressed block contains less data.
+            Therefore, always control how many bytes were decoded.
+            If source stream is detected malformed, function returns a negative result.
+            This function is protected against malicious data packets.
+*/
+LZ4LIB_API int LZ4_decompress_safe_partial (const char* src, char* dst, int srcSize, int targetOutputSize, int dstCapacity);
+
+
+/*-*********************************************
+*  Streaming Compression Functions
+***********************************************/
+typedef union LZ4_stream_u LZ4_stream_t;  /* incomplete type (defined later) */
+
+/*! LZ4_createStream() and LZ4_freeStream() :
+ *  LZ4_createStream() will allocate and initialize an `LZ4_stream_t` structure.
+ *  LZ4_freeStream() releases its memory.
+ */
+LZ4LIB_API LZ4_stream_t* LZ4_createStream(void);
+LZ4LIB_API int           LZ4_freeStream (LZ4_stream_t* streamPtr);
+
+/*! LZ4_resetStream() :
+ *  An LZ4_stream_t structure can be allocated once and re-used multiple times.
+ *  Use this function to start compressing a new stream.
+ */
+LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* streamPtr);
+
+/*! LZ4_loadDict() :
+ *  Use this function to load a static dictionary into LZ4_stream_t.
+ *  Any previous data will be forgotten, only 'dictionary' will remain in memory.
+ *  Loading a size of 0 is allowed, and is the same as reset.
+ * @return : dictionary size, in bytes (necessarily <= 64 KB)
+ */
+LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize);
+
+/*! LZ4_compress_fast_continue() :
+ *  Compress 'src' content using data from previously compressed blocks, for better compression ratio.
+ *  'dst' buffer must be already allocated.
+ *  If dstCapacity >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster.
+ *
+ *  Important : The previous 64KB of compressed data is assumed to remain present and unmodified in memory!
+ *
+ *  Special 1 : When input is a double-buffer, they can have any size, including < 64 KB.
+ *              Make sure that buffers are separated by at least one byte.
+ *              This way, each block only depends on previous block.
+ *  Special 2 : If input buffer is a ring-buffer, it can have any size, including < 64 KB.
+ *
+ * @return : size of compressed block
+ *           or 0 if there is an error (typically, cannot fit into 'dst').
+ *  After an error, the stream status is invalid, it can only be reset or freed.
+ */
+LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+/*! LZ4_saveDict() :
+ *  If last 64KB data cannot be guaranteed to remain available at its current memory location,
+ *  save it into a safer place (char* safeBuffer).
+ *  This is schematically equivalent to a memcpy() followed by LZ4_loadDict(),
+ *  but is much faster, because LZ4_saveDict() doesn't need to rebuild tables.
+ * @return : saved dictionary size in bytes (necessarily <= maxDictSize), or 0 if error.
+ */
+LZ4LIB_API int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int maxDictSize);
+
+
+/*-**********************************************
+*  Streaming Decompression Functions
+*  Bufferless synchronous API
+************************************************/
+typedef union LZ4_streamDecode_u LZ4_streamDecode_t;   /* tracking context */
+
+/*! LZ4_createStreamDecode() and LZ4_freeStreamDecode() :
+ *  creation / destruction of streaming decompression tracking context.
+ *  A tracking context can be re-used multiple times.
+ */
+LZ4LIB_API LZ4_streamDecode_t* LZ4_createStreamDecode(void);
+LZ4LIB_API int                 LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
+
+/*! LZ4_setStreamDecode() :
+ *  An LZ4_streamDecode_t context can be allocated once and re-used multiple times.
+ *  Use this function to start decompression of a new stream of blocks.
+ *  A dictionary can optionnally be set. Use NULL or size 0 for a reset order.
+ *  Dictionary is presumed stable : it must remain accessible and unmodified during next decompression.
+ * @return : 1 if OK, 0 if error
+ */
+LZ4LIB_API int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize);
+
+/*! LZ4_decoderRingBufferSize() : v1.8.2
+ *  Note : in a ring buffer scenario (optional),
+ *  blocks are presumed decompressed next to each other
+ *  up to the moment there is not enough remaining space for next block (remainingSize < maxBlockSize),
+ *  at which stage it resumes from beginning of ring buffer.
+ *  When setting such a ring buffer for streaming decompression,
+ *  provides the minimum size of this ring buffer
+ *  to be compatible with any source respecting maxBlockSize condition.
+ * @return : minimum ring buffer size,
+ *           or 0 if there is an error (invalid maxBlockSize).
+ */
+LZ4LIB_API int LZ4_decoderRingBufferSize(int maxBlockSize);
+#define LZ4_DECODER_RING_BUFFER_SIZE(mbs) (65536 + 14 + (mbs))  /* for static allocation; mbs presumed valid */
+
+/*! LZ4_decompress_*_continue() :
+ *  These decoding functions allow decompression of consecutive blocks in "streaming" mode.
+ *  A block is an unsplittable entity, it must be presented entirely to a decompression function.
+ *  Decompression functions only accepts one block at a time.
+ *  The last 64KB of previously decoded data *must* remain available and unmodified at the memory position where they were decoded.
+ *  If less than 64KB of data has been decoded, all the data must be present.
+ *
+ *  Special : if decompression side sets a ring buffer, it must respect one of the following conditions :
+ *  - Decompression buffer size is _at least_ LZ4_decoderRingBufferSize(maxBlockSize).
+ *    maxBlockSize is the maximum size of any single block. It can have any value > 16 bytes.
+ *    In which case, encoding and decoding buffers do not need to be synchronized.
+ *    Actually, data can be produced by any source compliant with LZ4 format specification, and respecting maxBlockSize.
+ *  - Synchronized mode :
+ *    Decompression buffer size is _exactly_ the same as compression buffer size,
+ *    and follows exactly same update rule (block boundaries at same positions),
+ *    and decoding function is provided with exact decompressed size of each block (exception for last block of the stream),
+ *    _then_ decoding & encoding ring buffer can have any size, including small ones ( < 64 KB).
+ *  - Decompression buffer is larger than encoding buffer, by a minimum of maxBlockSize more bytes.
+ *    In which case, encoding and decoding buffers do not need to be synchronized,
+ *    and encoding ring buffer can have any size, including small ones ( < 64 KB).
+ *
+ *  Whenever these conditions are not possible,
+ *  save the last 64KB of decoded data into a safe buffer where it can't be modified during decompression,
+ *  then indicate where this data is saved using LZ4_setStreamDecode(), before decompressing next block.
+*/
+LZ4LIB_API int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int srcSize, int dstCapacity);
+LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int originalSize);
+
+
+/*! LZ4_decompress_*_usingDict() :
+ *  These decoding functions work the same as
+ *  a combination of LZ4_setStreamDecode() followed by LZ4_decompress_*_continue()
+ *  They are stand-alone, and don't need an LZ4_streamDecode_t structure.
+ *  Dictionary is presumed stable : it must remain accessible and unmodified during next decompression.
+ */
+LZ4LIB_API int LZ4_decompress_safe_usingDict (const char* src, char* dst, int srcSize, int dstCapcity, const char* dictStart, int dictSize);
+LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int originalSize, const char* dictStart, int dictSize);
+
+
+/*^**********************************************
+ * !!!!!!   STATIC LINKING ONLY   !!!!!!
+ ***********************************************/
+
+/*-************************************
+ *  Unstable declarations
+ **************************************
+ * Declarations in this section should be considered unstable.
+ * Use at your own peril, etc., etc.
+ * They may be removed in the future.
+ * Their signatures may change.
+ **************************************/
+
+#ifdef LZ4_STATIC_LINKING_ONLY
+
+/*! LZ4_resetStream_fast() :
+ *  Use this, like LZ4_resetStream(), to prepare a context for a new chain of
+ *  calls to a streaming API (e.g., LZ4_compress_fast_continue()).
+ *
+ *  Note:
+ *  Using this in advance of a non- streaming-compression function is redundant,
+ *  and potentially bad for performance, since they all perform their own custom
+ *  reset internally.
+ *
+ *  Differences from LZ4_resetStream():
+ *  When an LZ4_stream_t is known to be in a internally coherent state,
+ *  it can often be prepared for a new compression with almost no work, only
+ *  sometimes falling back to the full, expensive reset that is always required
+ *  when the stream is in an indeterminate state (i.e., the reset performed by
+ *  LZ4_resetStream()).
+ *
+ *  LZ4_streams are guaranteed to be in a valid state when:
+ *  - returned from LZ4_createStream()
+ *  - reset by LZ4_resetStream()
+ *  - memset(stream, 0, sizeof(LZ4_stream_t)), though this is discouraged
+ *  - the stream was in a valid state and was reset by LZ4_resetStream_fast()
+ *  - the stream was in a valid state and was then used in any compression call
+ *    that returned success
+ *  - the stream was in an indeterminate state and was used in a compression
+ *    call that fully reset the state (e.g., LZ4_compress_fast_extState()) and
+ *    that returned success
+ *
+ *  When a stream isn't known to be in a valid state, it is not safe to pass to
+ *  any fastReset or streaming function. It must first be cleansed by the full
+ *  LZ4_resetStream().
+ */
+LZ4LIB_API void LZ4_resetStream_fast (LZ4_stream_t* streamPtr);
+
+/*! LZ4_compress_fast_extState_fastReset() :
+ *  A variant of LZ4_compress_fast_extState().
+ *
+ *  Using this variant avoids an expensive initialization step. It is only safe
+ *  to call if the state buffer is known to be correctly initialized already
+ *  (see above comment on LZ4_resetStream_fast() for a definition of "correctly
+ *  initialized"). From a high level, the difference is that this function
+ *  initializes the provided state with a call to something like
+ *  LZ4_resetStream_fast() while LZ4_compress_fast_extState() starts with a
+ *  call to LZ4_resetStream().
+ */
+LZ4LIB_API int LZ4_compress_fast_extState_fastReset (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+/*! LZ4_attach_dictionary() :
+ *  This is an experimental API that allows for the efficient use of a
+ *  static dictionary many times.
+ *
+ *  Rather than re-loading the dictionary buffer into a working context before
+ *  each compression, or copying a pre-loaded dictionary's LZ4_stream_t into a
+ *  working LZ4_stream_t, this function introduces a no-copy setup mechanism,
+ *  in which the working stream references the dictionary stream in-place.
+ *
+ *  Several assumptions are made about the state of the dictionary stream.
+ *  Currently, only streams which have been prepared by LZ4_loadDict() should
+ *  be expected to work.
+ *
+ *  Alternatively, the provided dictionary stream pointer may be NULL, in which
+ *  case any existing dictionary stream is unset.
+ *
+ *  If a dictionary is provided, it replaces any pre-existing stream history.
+ *  The dictionary contents are the only history that can be referenced and
+ *  logically immediately precede the data compressed in the first subsequent
+ *  compression call.
+ *
+ *  The dictionary will only remain attached to the working stream through the
+ *  first compression call, at the end of which it is cleared. The dictionary
+ *  stream (and source buffer) must remain in-place / accessible / unchanged
+ *  through the completion of the first compression call on the stream.
+ */
+LZ4LIB_API void LZ4_attach_dictionary(LZ4_stream_t *working_stream, const LZ4_stream_t *dictionary_stream);
+
+#endif
+
+/*-************************************
+ *  Private definitions
+ **************************************
+ * Do not use these definitions.
+ * They are exposed to allow static allocation of `LZ4_stream_t` and `LZ4_streamDecode_t`.
+ * Using these definitions will expose code to API and/or ABI break in future versions of the library.
+ **************************************/
+#define LZ4_HASHLOG   (LZ4_MEMORY_USAGE-2)
+#define LZ4_HASHTABLESIZE (1 << LZ4_MEMORY_USAGE)
+#define LZ4_HASH_SIZE_U32 (1 << LZ4_HASHLOG)       /* required as macro for static allocation */
+
+#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+
+typedef struct LZ4_stream_t_internal LZ4_stream_t_internal;
+struct LZ4_stream_t_internal {
+    uint32_t hashTable[LZ4_HASH_SIZE_U32];
+    uint32_t currentOffset;
+    uint16_t initCheck;
+    uint16_t tableType;
+    const uint8_t* dictionary;
+    const LZ4_stream_t_internal* dictCtx;
+    uint32_t dictSize;
+};
+
+typedef struct {
+    const uint8_t* externalDict;
+    size_t extDictSize;
+    const uint8_t* prefixEnd;
+    size_t prefixSize;
+} LZ4_streamDecode_t_internal;
+
+#else
+
+typedef struct LZ4_stream_t_internal LZ4_stream_t_internal;
+struct LZ4_stream_t_internal {
+    unsigned int hashTable[LZ4_HASH_SIZE_U32];
+    unsigned int currentOffset;
+    unsigned short initCheck;
+    unsigned short tableType;
+    const unsigned char* dictionary;
+    const LZ4_stream_t_internal* dictCtx;
+    unsigned int dictSize;
+};
+
+typedef struct {
+    const unsigned char* externalDict;
+    size_t extDictSize;
+    const unsigned char* prefixEnd;
+    size_t prefixSize;
+} LZ4_streamDecode_t_internal;
+
+#endif
+
+/*!
+ * LZ4_stream_t :
+ * information structure to track an LZ4 stream.
+ * init this structure before first use.
+ * note : only use in association with static linking !
+ *        this definition is not API/ABI safe,
+ *        it may change in a future version !
+ */
+#define LZ4_STREAMSIZE_U64 ((1 << (LZ4_MEMORY_USAGE-3)) + 4)
+#define LZ4_STREAMSIZE     (LZ4_STREAMSIZE_U64 * sizeof(unsigned long long))
+union LZ4_stream_u {
+    unsigned long long table[LZ4_STREAMSIZE_U64];
+    LZ4_stream_t_internal internal_donotuse;
+} ;  /* previously typedef'd to LZ4_stream_t */
+
+
+/*!
+ * LZ4_streamDecode_t :
+ * information structure to track an LZ4 stream during decompression.
+ * init this structure  using LZ4_setStreamDecode (or memset()) before first use
+ * note : only use in association with static linking !
+ *        this definition is not API/ABI safe,
+ *        and may change in a future version !
+ */
+#define LZ4_STREAMDECODESIZE_U64  4
+#define LZ4_STREAMDECODESIZE     (LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
+union LZ4_streamDecode_u {
+    unsigned long long table[LZ4_STREAMDECODESIZE_U64];
+    LZ4_streamDecode_t_internal internal_donotuse;
+} ;   /* previously typedef'd to LZ4_streamDecode_t */
+
+
+/*-************************************
+*  Obsolete Functions
+**************************************/
+
+/*! Deprecation warnings
+   Should deprecation warnings be a problem,
+   it is generally possible to disable them,
+   typically with -Wno-deprecated-declarations for gcc
+   or _CRT_SECURE_NO_WARNINGS in Visual.
+   Otherwise, it's also possible to define LZ4_DISABLE_DEPRECATE_WARNINGS */
+#ifdef LZ4_DISABLE_DEPRECATE_WARNINGS
+#  define LZ4_DEPRECATED(message)   /* disable deprecation warnings */
+#else
+#  define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+#    define LZ4_DEPRECATED(message) [[deprecated(message)]]
+#  elif (LZ4_GCC_VERSION >= 405) || defined(__clang__)
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
+#  elif (LZ4_GCC_VERSION >= 301)
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated))
+#  elif defined(_MSC_VER)
+#    define LZ4_DEPRECATED(message) __declspec(deprecated(message))
+#  else
+#    pragma message("WARNING: You need to implement LZ4_DEPRECATED for this compiler")
+#    define LZ4_DEPRECATED(message)
+#  endif
+#endif /* LZ4_DISABLE_DEPRECATE_WARNINGS */
+
+/* Obsolete compression functions */
+LZ4_DEPRECATED("use LZ4_compress_default() instead") LZ4LIB_API int LZ4_compress               (const char* source, char* dest, int sourceSize);
+LZ4_DEPRECATED("use LZ4_compress_default() instead") LZ4LIB_API int LZ4_compress_limitedOutput (const char* source, char* dest, int sourceSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_withState               (void* state, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_continue                (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_limitedOutput_continue  (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
+
+/* Obsolete decompression functions */
+LZ4_DEPRECATED("use LZ4_decompress_fast() instead") LZ4LIB_API int LZ4_uncompress (const char* source, char* dest, int outputSize);
+LZ4_DEPRECATED("use LZ4_decompress_safe() instead") LZ4LIB_API int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize);
+
+/* Obsolete streaming functions; degraded functionality; do not use!
+ *
+ * In order to perform streaming compression, these functions depended on data
+ * that is no longer tracked in the state. They have been preserved as well as
+ * possible: using them will still produce a correct output. However, they don't
+ * actually retain any history between compression calls. The compression ratio
+ * achieved will therefore be no better than compressing each chunk
+ * independently.
+ */
+LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API void* LZ4_create (char* inputBuffer);
+LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API int   LZ4_sizeofStreamState(void);
+LZ4_DEPRECATED("Use LZ4_resetStream() instead") LZ4LIB_API  int   LZ4_resetStreamState(void* state, char* inputBuffer);
+LZ4_DEPRECATED("Use LZ4_saveDict() instead") LZ4LIB_API     char* LZ4_slideInputBuffer (void* state);
+
+/* Obsolete streaming decoding functions */
+/*LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead")*/ LZ4LIB_API int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);
+LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") LZ4LIB_API int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);
+
+}
+
+#endif /* LZ4_H_2983827168210 */
--- a/common/tracy_lz4hc.cpp
+++ b/common/tracy_lz4hc.cpp
--- a/public/common/tracy_lz4hc.hpp
+++ b/public/common/tracy_lz4hc.hpp
@@ -1,7 +1,7 @@
 /*
   LZ4 HC - High Compression Mode of LZ4
   Header File
-   Copyright (C) 2011-2020, Yann Collet.
+   Copyright (C) 2011-2017, Yann Collet.
   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)

   Redistribution and use in source and binary forms, with or without
@@ -31,28 +31,28 @@
   - LZ4 source repository : https://github.com/lz4/lz4
   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
 */
-#ifndef TRACY_LZ4_HC_H_19834876238432
-#define TRACY_LZ4_HC_H_19834876238432
+#ifndef LZ4_HC_H_19834876238432
+#define LZ4_HC_H_19834876238432

 /* --- Dependency --- */
 /* note : lz4hc requires lz4.h/lz4.c for compilation */
 #include "tracy_lz4.hpp"   /* stddef, LZ4LIB_API, LZ4_DEPRECATED */

+namespace tracy
+{

 /* --- Useful constants --- */
-#define LZ4HC_CLEVEL_MIN         2
+#define LZ4HC_CLEVEL_MIN         3
 #define LZ4HC_CLEVEL_DEFAULT     9
 #define LZ4HC_CLEVEL_OPT_MIN    10
 #define LZ4HC_CLEVEL_MAX        12

-namespace tracy
-{

 /*-************************************
 *  Block Compression
 **************************************/
 /*! LZ4_compress_HC() :
- *  Compress data from `src` into `dst`, using the powerful but slower "HC" algorithm.
+ *  Compress data from `src` into `dst`, using the more powerful but slower "HC" algorithm.
 * `dst` must be already allocated.
 *  Compression is guaranteed to succeed if `dstCapacity >= LZ4_compressBound(srcSize)` (see "lz4.h")
 *  Max supported `srcSize` value is LZ4_MAX_INPUT_SIZE (see "lz4.h")
@@ -75,21 +75,7 @@ LZ4LIB_API int LZ4_compress_HC (const char* src, char* dst, int srcSize, int dst
 *  Memory segment must be aligned on 8-bytes boundaries (which a normal malloc() should do properly).
 */
 LZ4LIB_API int LZ4_sizeofStateHC(void);
-LZ4LIB_API int LZ4_compress_HC_extStateHC(void* stateHC, const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel);
-
-
-/*! LZ4_compress_HC_destSize() : v1.9.0+
- *  Will compress as much data as possible from `src`
- *  to fit into `targetDstSize` budget.
- *  Result is provided in 2 parts :
- * @return : the number of bytes written into 'dst' (necessarily <= targetDstSize)
- *           or 0 if compression fails.
- * `srcSizePtr` : on success, *srcSizePtr is updated to indicate how much bytes were read from `src`
- */
-LZ4LIB_API int LZ4_compress_HC_destSize(void* stateHC,
-                                  const char* src, char* dst,
-                                        int* srcSizePtr, int targetDstSize,
-                                        int compressionLevel);
+LZ4LIB_API int LZ4_compress_HC_extStateHC(void* state, const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel);


 /*-************************************
@@ -101,83 +87,236 @@ LZ4LIB_API int LZ4_compress_HC_destSize(void* stateHC,
 /*! LZ4_createStreamHC() and LZ4_freeStreamHC() :
 *  These functions create and release memory for LZ4 HC streaming state.
 *  Newly created states are automatically initialized.
- *  A same state can be used multiple times consecutively,
- *  starting with LZ4_resetStreamHC_fast() to start a new stream of blocks.
+ *  Existing states can be re-used several times, using LZ4_resetStreamHC().
+ *  These methods are API and ABI stable, they can be used in combination with a DLL.
 */
 LZ4LIB_API LZ4_streamHC_t* LZ4_createStreamHC(void);
 LZ4LIB_API int             LZ4_freeStreamHC (LZ4_streamHC_t* streamHCPtr);

-/*
-  These functions compress data in successive blocks of any size,
-  using previous blocks as dictionary, to improve compression ratio.
-  One key assumption is that previous blocks (up to 64 KB) remain read-accessible while compressing next blocks.
-  There is an exception for ring buffers, which can be smaller than 64 KB.
-  Ring-buffer scenario is automatically detected and handled within LZ4_compress_HC_continue().
-
-  Before starting compression, state must be allocated and properly initialized.
-  LZ4_createStreamHC() does both, though compression level is set to LZ4HC_CLEVEL_DEFAULT.
-
-  Selecting the compression level can be done with LZ4_resetStreamHC_fast() (starts a new stream)
-  or LZ4_setCompressionLevel() (anytime, between blocks in the same stream) (experimental).
-  LZ4_resetStreamHC_fast() only works on states which have been properly initialized at least once,
-  which is automatically the case when state is created using LZ4_createStreamHC().
-
-  After reset, a first "fictional block" can be designated as initial dictionary,
-  using LZ4_loadDictHC() (Optional).
-  Note: In order for LZ4_loadDictHC() to create the correct data structure,
-  it is essential to set the compression level _before_ loading the dictionary.
-
-  Invoke LZ4_compress_HC_continue() to compress each successive block.
-  The number of blocks is unlimited.
-  Previous input blocks, including initial dictionary when present,
-  must remain accessible and unmodified during compression.
-
-  It's allowed to update compression level anytime between blocks,
-  using LZ4_setCompressionLevel() (experimental).
-
- @dst buffer should be sized to handle worst case scenarios
-  (see LZ4_compressBound(), it ensures compression success).
-  In case of failure, the API does not guarantee recovery,
-  so the state _must_ be reset.
-  To ensure compression success
-  whenever @dst buffer size cannot be made >= LZ4_compressBound(),
-  consider using LZ4_compress_HC_continue_destSize().
-
-  Whenever previous input blocks can't be preserved unmodified in-place during compression of next blocks,
-  it's possible to copy the last blocks into a more stable memory space, using LZ4_saveDictHC().
-  Return value of LZ4_saveDictHC() is the size of dictionary effectively saved into 'safeBuffer' (<= 64 KB)
-
-  After completing a streaming compression,
-  it's possible to start a new stream of blocks, using the same LZ4_streamHC_t state,
-  just by resetting it, using LZ4_resetStreamHC_fast().
-*/
-
-LZ4LIB_API void LZ4_resetStreamHC_fast(LZ4_streamHC_t* streamHCPtr, int compressionLevel);   /* v1.9.0+ */
+LZ4LIB_API void LZ4_resetStreamHC (LZ4_streamHC_t* streamHCPtr, int compressionLevel);
 LZ4LIB_API int  LZ4_loadDictHC (LZ4_streamHC_t* streamHCPtr, const char* dictionary, int dictSize);

-LZ4LIB_API int LZ4_compress_HC_continue (LZ4_streamHC_t* streamHCPtr,
-                                   const char* src, char* dst,
-                                         int srcSize, int maxDstSize);
-
-/*! LZ4_compress_HC_continue_destSize() : v1.9.0+
- *  Similar to LZ4_compress_HC_continue(),
- *  but will read as much data as possible from `src`
- *  to fit into `targetDstSize` budget.
- *  Result is provided into 2 parts :
- * @return : the number of bytes written into 'dst' (necessarily <= targetDstSize)
- *           or 0 if compression fails.
- * `srcSizePtr` : on success, *srcSizePtr will be updated to indicate how much bytes were read from `src`.
- *           Note that this function may not consume the entire input.
- */
-LZ4LIB_API int LZ4_compress_HC_continue_destSize(LZ4_streamHC_t* LZ4_streamHCPtr,
-                                           const char* src, char* dst,
-                                                 int* srcSizePtr, int targetDstSize);
+LZ4LIB_API int LZ4_compress_HC_continue (LZ4_streamHC_t* streamHCPtr, const char* src, char* dst, int srcSize, int maxDstSize);

 LZ4LIB_API int LZ4_saveDictHC (LZ4_streamHC_t* streamHCPtr, char* safeBuffer, int maxDictSize);

+/*
+  These functions compress data in successive blocks of any size, using previous blocks as dictionary.
+  One key assumption is that previous blocks (up to 64 KB) remain read-accessible while compressing next blocks.
+  There is an exception for ring buffers, which can be smaller than 64 KB.
+  Ring buffers scenario is automatically detected and handled by LZ4_compress_HC_continue().

-/*! LZ4_attach_HC_dictionary() : stable since v1.10.0
- *  This API allows for the efficient re-use of a static dictionary many times.
+  Before starting compression, state must be properly initialized, using LZ4_resetStreamHC().
+  A first "fictional block" can then be designated as initial dictionary, using LZ4_loadDictHC() (Optional).
+
+  Then, use LZ4_compress_HC_continue() to compress each successive block.
+  Previous memory blocks (including initial dictionary when present) must remain accessible and unmodified during compression.
+  'dst' buffer should be sized to handle worst case scenarios (see LZ4_compressBound()), to ensure operation success.
+  Because in case of failure, the API does not guarantee context recovery, and context will have to be reset.
+  If `dst` buffer budget cannot be >= LZ4_compressBound(), consider using LZ4_compress_HC_continue_destSize() instead.
+
+  If, for any reason, previous data block can't be preserved unmodified in memory for next compression block,
+  you can save it to a more stable memory space, using LZ4_saveDictHC().
+  Return value of LZ4_saveDictHC() is the size of dictionary effectively saved into 'safeBuffer'.
+*/
+
+
+/*-**************************************************************
+ * PRIVATE DEFINITIONS :
+ * Do not use these definitions.
+ * They are exposed to allow static allocation of `LZ4_streamHC_t`.
+ * Using these definitions makes the code vulnerable to potential API break when upgrading LZ4
+ ****************************************************************/
+#define LZ4HC_DICTIONARY_LOGSIZE 16
+#define LZ4HC_MAXD (1<<LZ4HC_DICTIONARY_LOGSIZE)
+#define LZ4HC_MAXD_MASK (LZ4HC_MAXD - 1)
+
+#define LZ4HC_HASH_LOG 15
+#define LZ4HC_HASHTABLESIZE (1 << LZ4HC_HASH_LOG)
+#define LZ4HC_HASH_MASK (LZ4HC_HASHTABLESIZE - 1)
+
+
+#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+#include <stdint.h>
+
+typedef struct LZ4HC_CCtx_internal LZ4HC_CCtx_internal;
+struct LZ4HC_CCtx_internal
+{
+    uint32_t   hashTable[LZ4HC_HASHTABLESIZE];
+    uint16_t   chainTable[LZ4HC_MAXD];
+    const uint8_t* end;         /* next block here to continue on current prefix */
+    const uint8_t* base;        /* All index relative to this position */
+    const uint8_t* dictBase;    /* alternate base for extDict */
+    uint32_t   dictLimit;       /* below that point, need extDict */
+    uint32_t   lowLimit;        /* below that point, no more dict */
+    uint32_t   nextToUpdate;    /* index from which to continue dictionary update */
+    short      compressionLevel;
+    short      favorDecSpeed;
+    const LZ4HC_CCtx_internal* dictCtx;
+};
+
+#else
+
+typedef struct LZ4HC_CCtx_internal LZ4HC_CCtx_internal;
+struct LZ4HC_CCtx_internal
+{
+    unsigned int   hashTable[LZ4HC_HASHTABLESIZE];
+    unsigned short chainTable[LZ4HC_MAXD];
+    const unsigned char* end;        /* next block here to continue on current prefix */
+    const unsigned char* base;       /* All index relative to this position */
+    const unsigned char* dictBase;   /* alternate base for extDict */
+    unsigned int   dictLimit;        /* below that point, need extDict */
+    unsigned int   lowLimit;         /* below that point, no more dict */
+    unsigned int   nextToUpdate;     /* index from which to continue dictionary update */
+    short          compressionLevel;
+    short          favorDecSpeed;
+    const LZ4HC_CCtx_internal* dictCtx;
+};
+
+#endif
+
+#define LZ4_STREAMHCSIZE       (4*LZ4HC_HASHTABLESIZE + 2*LZ4HC_MAXD + 56) /* 262200 */
+#define LZ4_STREAMHCSIZE_SIZET (LZ4_STREAMHCSIZE / sizeof(size_t))
+union LZ4_streamHC_u {
+    size_t table[LZ4_STREAMHCSIZE_SIZET];
+    LZ4HC_CCtx_internal internal_donotuse;
+};   /* previously typedef'd to LZ4_streamHC_t */
+/*
+  LZ4_streamHC_t :
+  This structure allows static allocation of LZ4 HC streaming state.
+  State must be initialized using LZ4_resetStreamHC() before first use.
+
+  Static allocation shall only be used in combination with static linking.
+  When invoking LZ4 from a DLL, use create/free functions instead, which are API and ABI stable.
+*/
+
+
+/*-************************************
+*  Deprecated Functions
+**************************************/
+/* see lz4.h LZ4_DISABLE_DEPRECATE_WARNINGS to turn off deprecation warnings */
+
+/* deprecated compression functions */
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC               (const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2 (const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_withStateHC               (void* state, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_withStateHC (void* state, const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_withStateHC(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_continue               (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
+
+/* Obsolete streaming functions; degraded functionality; do not use!
+ *
+ * In order to perform streaming compression, these functions depended on data
+ * that is no longer tracked in the state. They have been preserved as well as
+ * possible: using them will still produce a correct output. However, use of
+ * LZ4_slideInputBufferHC() will truncate the history of the stream, rather
+ * than preserve a window-sized chunk of history.
+ */
+LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API void* LZ4_createHC (const char* inputBuffer);
+LZ4_DEPRECATED("use LZ4_saveDictHC() instead") LZ4LIB_API     char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
+LZ4_DEPRECATED("use LZ4_freeStreamHC() instead") LZ4LIB_API   int   LZ4_freeHC (void* LZ4HC_Data);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API int   LZ4_sizeofStreamStateHC(void);
+LZ4_DEPRECATED("use LZ4_resetStreamHC() instead") LZ4LIB_API  int   LZ4_resetStreamStateHC(void* state, char* inputBuffer);
+
+}
+
+#endif /* LZ4_HC_H_19834876238432 */
+
+
+/*-**************************************************
+ * !!!!!     STATIC LINKING ONLY     !!!!!
+ * Following definitions are considered experimental.
+ * They should not be linked from DLL,
+ * as there is no guarantee of API stability yet.
+ * Prototypes will be promoted to "stable" status
+ * after successfull usage in real-life scenarios.
+ ***************************************************/
+#ifdef LZ4_HC_STATIC_LINKING_ONLY   /* protection macro */
+#ifndef LZ4_HC_SLO_098092834
+#define LZ4_HC_SLO_098092834
+
+namespace tracy
+{
+
+/*! LZ4_compress_HC_destSize() : v1.8.0 (experimental)
+ *  Will try to compress as much data from `src` as possible
+ *  that can fit into `targetDstSize` budget.
+ *  Result is provided in 2 parts :
+ * @return : the number of bytes written into 'dst'
+ *           or 0 if compression fails.
+ * `srcSizePtr` : value will be updated to indicate how much bytes were read from `src`
+ */
+int LZ4_compress_HC_destSize(void* LZ4HC_Data,
+                             const char* src, char* dst,
+                             int* srcSizePtr, int targetDstSize,
+                             int compressionLevel);
+
+/*! LZ4_compress_HC_continue_destSize() : v1.8.0 (experimental)
+ *  Similar as LZ4_compress_HC_continue(),
+ *  but will read a variable nb of bytes from `src`
+ *  to fit into `targetDstSize` budget.
+ *  Result is provided in 2 parts :
+ * @return : the number of bytes written into 'dst'
+ *           or 0 if compression fails.
+ * `srcSizePtr` : value will be updated to indicate how much bytes were read from `src`.
+ */
+int LZ4_compress_HC_continue_destSize(LZ4_streamHC_t* LZ4_streamHCPtr,
+                            const char* src, char* dst,
+                            int* srcSizePtr, int targetDstSize);
+
+/*! LZ4_setCompressionLevel() : v1.8.0 (experimental)
+ *  It's possible to change compression level between 2 invocations of LZ4_compress_HC_continue*()
+ */
+void LZ4_setCompressionLevel(LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
+
+/*! LZ4_favorDecompressionSpeed() : v1.8.2 (experimental)
+ *  Parser will select decisions favoring decompression over compression ratio.
+ *  Only work at highest compression settings (level >= LZ4HC_CLEVEL_OPT_MIN)
+ */
+void LZ4_favorDecompressionSpeed(LZ4_streamHC_t* LZ4_streamHCPtr, int favor);
+
+/*! LZ4_resetStreamHC_fast() :
+ *  When an LZ4_streamHC_t is known to be in a internally coherent state,
+ *  it can often be prepared for a new compression with almost no work, only
+ *  sometimes falling back to the full, expensive reset that is always required
+ *  when the stream is in an indeterminate state (i.e., the reset performed by
+ *  LZ4_resetStreamHC()).
+ *
+ *  LZ4_streamHCs are guaranteed to be in a valid state when:
+ *  - returned from LZ4_createStreamHC()
+ *  - reset by LZ4_resetStreamHC()
+ *  - memset(stream, 0, sizeof(LZ4_streamHC_t))
+ *  - the stream was in a valid state and was reset by LZ4_resetStreamHC_fast()
+ *  - the stream was in a valid state and was then used in any compression call
+ *    that returned success
+ *  - the stream was in an indeterminate state and was used in a compression
+ *    call that fully reset the state (LZ4_compress_HC_extStateHC()) and that
+ *    returned success
+ */
+void LZ4_resetStreamHC_fast(LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
+
+/*! LZ4_compress_HC_extStateHC_fastReset() :
+ *  A variant of LZ4_compress_HC_extStateHC().
+ *
+ *  Using this variant avoids an expensive initialization step. It is only safe
+ *  to call if the state buffer is known to be correctly initialized already
+ *  (see above comment on LZ4_resetStreamHC_fast() for a definition of
+ *  "correctly initialized"). From a high level, the difference is that this
+ *  function initializes the provided state with a call to
+ *  LZ4_resetStreamHC_fast() while LZ4_compress_HC_extStateHC() starts with a
+ *  call to LZ4_resetStreamHC().
+ */
+int LZ4_compress_HC_extStateHC_fastReset (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int compressionLevel);
+
+/*! LZ4_attach_HC_dictionary() :
+ *  This is an experimental API that allows for the efficient use of a
+ *  static dictionary many times.
 *
 *  Rather than re-loading the dictionary buffer into a working context before
 *  each compression, or copying a pre-loaded dictionary's LZ4_streamHC_t into a
@@ -200,205 +339,7 @@ LZ4LIB_API int LZ4_saveDictHC (LZ4_streamHC_t* streamHCPtr, char* safeBuffer, in
 *  stream (and source buffer) must remain in-place / accessible / unchanged
 *  through the lifetime of the stream session.
 */
-LZ4LIB_API void
-LZ4_attach_HC_dictionary(LZ4_streamHC_t* working_stream,
-                   const LZ4_streamHC_t* dictionary_stream);
-
-
-/*^**********************************************
- * !!!!!!   STATIC LINKING ONLY   !!!!!!
- ***********************************************/
-
-/*-******************************************************************
- * PRIVATE DEFINITIONS :
- * Do not use these definitions directly.
- * They are merely exposed to allow static allocation of `LZ4_streamHC_t`.
- * Declare an `LZ4_streamHC_t` directly, rather than any type below.
- * Even then, only do so in the context of static linking, as definitions may change between versions.
- ********************************************************************/
-
-#define LZ4HC_DICTIONARY_LOGSIZE 16
-#define LZ4HC_MAXD (1<<LZ4HC_DICTIONARY_LOGSIZE)
-#define LZ4HC_MAXD_MASK (LZ4HC_MAXD - 1)
-
-#define LZ4HC_HASH_LOG 15
-#define LZ4HC_HASHTABLESIZE (1 << LZ4HC_HASH_LOG)
-#define LZ4HC_HASH_MASK (LZ4HC_HASHTABLESIZE - 1)
-
-
-/* Never ever use these definitions directly !
- * Declare or allocate an LZ4_streamHC_t instead.
-**/
-typedef struct LZ4HC_CCtx_internal LZ4HC_CCtx_internal;
-struct LZ4HC_CCtx_internal
-{
-    LZ4_u32 hashTable[LZ4HC_HASHTABLESIZE];
-    LZ4_u16 chainTable[LZ4HC_MAXD];
-    const LZ4_byte* end;     /* next block here to continue on current prefix */
-    const LZ4_byte* prefixStart;  /* Indexes relative to this position */
-    const LZ4_byte* dictStart; /* alternate reference for extDict */
-    LZ4_u32 dictLimit;       /* below that point, need extDict */
-    LZ4_u32 lowLimit;        /* below that point, no more history */
-    LZ4_u32 nextToUpdate;    /* index from which to continue dictionary update */
-    short   compressionLevel;
-    LZ4_i8  favorDecSpeed;   /* favor decompression speed if this flag set,
-                                otherwise, favor compression ratio */
-    LZ4_i8  dirty;           /* stream has to be fully reset if this flag is set */
-    const LZ4HC_CCtx_internal* dictCtx;
-};
-
-#define LZ4_STREAMHC_MINSIZE  262200  /* static size, for inter-version compatibility */
-union LZ4_streamHC_u {
-    char minStateSize[LZ4_STREAMHC_MINSIZE];
-    LZ4HC_CCtx_internal internal_donotuse;
-}; /* previously typedef'd to LZ4_streamHC_t */
-
-/* LZ4_streamHC_t :
- * This structure allows static allocation of LZ4 HC streaming state.
- * This can be used to allocate statically on stack, or as part of a larger structure.
- *
- * Such state **must** be initialized using LZ4_initStreamHC() before first use.
- *
- * Note that invoking LZ4_initStreamHC() is not required when
- * the state was created using LZ4_createStreamHC() (which is recommended).
- * Using the normal builder, a newly created state is automatically initialized.
- *
- * Static allocation shall only be used in combination with static linking.
- */
-
-/* LZ4_initStreamHC() : v1.9.0+
- * Required before first use of a statically allocated LZ4_streamHC_t.
- * Before v1.9.0 : use LZ4_resetStreamHC() instead
- */
-LZ4LIB_API LZ4_streamHC_t* LZ4_initStreamHC(void* buffer, size_t size);
-
-
-/*-************************************
-*  Deprecated Functions
-**************************************/
-/* see lz4.h LZ4_DISABLE_DEPRECATE_WARNINGS to turn off deprecation warnings */
-
-/* deprecated compression functions */
-LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC               (const char* source, char* dest, int inputSize);
-LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize);
-LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2              (const char* source, char* dest, int inputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_withStateHC               (void* state, const char* source, char* dest, int inputSize);
-LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
-LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_withStateHC              (void* state, const char* source, char* dest, int inputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_withStateHC(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_continue               (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
-
-/* Obsolete streaming functions; degraded functionality; do not use!
- *
- * In order to perform streaming compression, these functions depended on data
- * that is no longer tracked in the state. They have been preserved as well as
- * possible: using them will still produce a correct output. However, use of
- * LZ4_slideInputBufferHC() will truncate the history of the stream, rather
- * than preserve a window-sized chunk of history.
- */
-#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
-LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API void* LZ4_createHC (const char* inputBuffer);
-LZ4_DEPRECATED("use LZ4_freeStreamHC() instead") LZ4LIB_API   int   LZ4_freeHC (void* LZ4HC_Data);
-#endif
-LZ4_DEPRECATED("use LZ4_saveDictHC() instead") LZ4LIB_API     char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_continue               (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API int   LZ4_sizeofStreamStateHC(void);
-LZ4_DEPRECATED("use LZ4_initStreamHC() instead") LZ4LIB_API  int   LZ4_resetStreamStateHC(void* state, char* inputBuffer);
-
-
-/* LZ4_resetStreamHC() is now replaced by LZ4_initStreamHC().
- * The intention is to emphasize the difference with LZ4_resetStreamHC_fast(),
- * which is now the recommended function to start a new stream of blocks,
- * but cannot be used to initialize a memory segment containing arbitrary garbage data.
- *
- * It is recommended to switch to LZ4_initStreamHC().
- * LZ4_resetStreamHC() will generate deprecation warnings in a future version.
- */
-LZ4LIB_API void LZ4_resetStreamHC (LZ4_streamHC_t* streamHCPtr, int compressionLevel);
-
-}
-
-#endif /* LZ4_HC_H_19834876238432 */
-
-
-/*-**************************************************
- * !!!!!     STATIC LINKING ONLY     !!!!!
- * Following definitions are considered experimental.
- * They should not be linked from DLL,
- * as there is no guarantee of API stability yet.
- * Prototypes will be promoted to "stable" status
- * after successful usage in real-life scenarios.
- ***************************************************/
-#ifdef LZ4_HC_STATIC_LINKING_ONLY   /* protection macro */
-#ifndef TRACY_LZ4_HC_SLO_098092834
-#define TRACY_LZ4_HC_SLO_098092834
-
-#define LZ4_STATIC_LINKING_ONLY   /* LZ4LIB_STATIC_API */
-#include "tracy_lz4.hpp"
-
-namespace tracy
-{
-
-/*! LZ4_setCompressionLevel() : v1.8.0+ (experimental)
- *  It's possible to change compression level
- *  between successive invocations of LZ4_compress_HC_continue*()
- *  for dynamic adaptation.
- */
-LZ4LIB_STATIC_API void LZ4_setCompressionLevel(
-    LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
-
-/*! LZ4_favorDecompressionSpeed() : v1.8.2+ (experimental)
- *  Opt. Parser will favor decompression speed over compression ratio.
- *  Only applicable to levels >= LZ4HC_CLEVEL_OPT_MIN.
- */
-LZ4LIB_STATIC_API void LZ4_favorDecompressionSpeed(
-    LZ4_streamHC_t* LZ4_streamHCPtr, int favor);
-
-/*! LZ4_resetStreamHC_fast() : v1.9.0+
- *  When an LZ4_streamHC_t is known to be in a internally coherent state,
- *  it can often be prepared for a new compression with almost no work, only
- *  sometimes falling back to the full, expensive reset that is always required
- *  when the stream is in an indeterminate state (i.e., the reset performed by
- *  LZ4_resetStreamHC()).
- *
- *  LZ4_streamHCs are guaranteed to be in a valid state when:
- *  - returned from LZ4_createStreamHC()
- *  - reset by LZ4_resetStreamHC()
- *  - memset(stream, 0, sizeof(LZ4_streamHC_t))
- *  - the stream was in a valid state and was reset by LZ4_resetStreamHC_fast()
- *  - the stream was in a valid state and was then used in any compression call
- *    that returned success
- *  - the stream was in an indeterminate state and was used in a compression
- *    call that fully reset the state (LZ4_compress_HC_extStateHC()) and that
- *    returned success
- *
- *  Note:
- *  A stream that was last used in a compression call that returned an error
- *  may be passed to this function. However, it will be fully reset, which will
- *  clear any existing history and settings from the context.
- */
-LZ4LIB_STATIC_API void LZ4_resetStreamHC_fast(
-    LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
-
-/*! LZ4_compress_HC_extStateHC_fastReset() :
- *  A variant of LZ4_compress_HC_extStateHC().
- *
- *  Using this variant avoids an expensive initialization step. It is only safe
- *  to call if the state buffer is known to be correctly initialized already
- *  (see above comment on LZ4_resetStreamHC_fast() for a definition of
- *  "correctly initialized"). From a high level, the difference is that this
- *  function initializes the provided state with a call to
- *  LZ4_resetStreamHC_fast() while LZ4_compress_HC_extStateHC() starts with a
- *  call to LZ4_resetStreamHC().
- */
-LZ4LIB_STATIC_API int LZ4_compress_HC_extStateHC_fastReset (
-    void* state,
-    const char* src, char* dst,
-    int srcSize, int dstCapacity,
-    int compressionLevel);
+LZ4LIB_API void LZ4_attach_HC_dictionary(LZ4_streamHC_t *working_stream, const LZ4_streamHC_t *dictionary_stream);

 }

--- a/common/tracy_sema.h
+++ b/common/tracy_sema.h
@@ -0,0 +1,255 @@
+// Copyright (c) 2015 Jeff Preshing
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgement in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef __TRACY_CPP11OM_SEMAPHORE_H__
+#define __TRACY_CPP11OM_SEMAPHORE_H__
+
+#include <atomic>
+#include <cassert>
+
+#if defined(__MACH__)
+    #include <mach/mach.h>
+#elif defined(__unix__)
+    #include <semaphore.h>
+#endif
+
+namespace tracy
+{
+
+#if defined(_WIN32)
+//---------------------------------------------------------
+// Semaphore (Windows)
+//---------------------------------------------------------
+#ifndef MAXLONG
+enum { MAXLONG = 0x7fffffff };
+#endif
+
+#ifndef INFINITE
+enum { INFINITE = 0xFFFFFFFF };
+#endif
+
+#ifndef _WINDOWS_
+typedef void* HANDLE;
+
+extern "C" __declspec(dllimport) HANDLE __stdcall CreateSemaphoreA( void*, long, long, const char* );
+extern "C" __declspec(dllimport) int __stdcall CloseHandle( HANDLE );
+extern "C" __declspec(dllimport) unsigned long __stdcall WaitForSingleObject( HANDLE, unsigned long );
+extern "C" __declspec(dllimport) int __stdcall ReleaseSemaphore( HANDLE, long, long* );
+#endif
+
+class Semaphore
+{
+private:
+    HANDLE m_hSema;
+
+    Semaphore(const Semaphore& other) = delete;
+    Semaphore& operator=(const Semaphore& other) = delete;
+
+public:
+    Semaphore(int initialCount = 0)
+    {
+        assert(initialCount >= 0);
+        m_hSema = CreateSemaphoreA(NULL, initialCount, MAXLONG, NULL);
+    }
+
+    ~Semaphore()
+    {
+        CloseHandle(m_hSema);
+    }
+
+    void wait()
+    {
+        WaitForSingleObject(m_hSema, INFINITE);
+    }
+
+    void signal(int count = 1)
+    {
+        ReleaseSemaphore(m_hSema, count, NULL);
+    }
+};
+
+
+#elif defined(__MACH__)
+//---------------------------------------------------------
+// Semaphore (Apple iOS and OSX)
+// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
+//---------------------------------------------------------
+
+class Semaphore
+{
+private:
+    semaphore_t m_sema;
+
+    Semaphore(const Semaphore& other) = delete;
+    Semaphore& operator=(const Semaphore& other) = delete;
+
+public:
+    Semaphore(int initialCount = 0)
+    {
+        assert(initialCount >= 0);
+        semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
+    }
+
+    ~Semaphore()
+    {
+        semaphore_destroy(mach_task_self(), m_sema);
+    }
+
+    void wait()
+    {
+        semaphore_wait(m_sema);
+    }
+
+    void signal()
+    {
+        semaphore_signal(m_sema);
+    }
+
+    void signal(int count)
+    {
+        while (count-- > 0)
+        {
+            semaphore_signal(m_sema);
+        }
+    }
+};
+
+
+#elif defined(__unix__)
+//---------------------------------------------------------
+// Semaphore (POSIX, Linux)
+//---------------------------------------------------------
+
+class Semaphore
+{
+private:
+    sem_t m_sema;
+
+    Semaphore(const Semaphore& other) = delete;
+    Semaphore& operator=(const Semaphore& other) = delete;
+
+public:
+    Semaphore(int initialCount = 0)
+    {
+        assert(initialCount >= 0);
+        sem_init(&m_sema, 0, initialCount);
+    }
+
+    ~Semaphore()
+    {
+        sem_destroy(&m_sema);
+    }
+
+    void wait()
+    {
+        // http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
+        int rc;
+        do
+        {
+            rc = sem_wait(&m_sema);
+        }
+        while (rc == -1 && errno == EINTR);
+    }
+
+    void signal()
+    {
+        sem_post(&m_sema);
+    }
+
+    void signal(int count)
+    {
+        while (count-- > 0)
+        {
+            sem_post(&m_sema);
+        }
+    }
+};
+
+
+#else
+
+#error Unsupported platform!
+
+#endif
+
+
+//---------------------------------------------------------
+// LightweightSemaphore
+//---------------------------------------------------------
+class LightweightSemaphore
+{
+private:
+    std::atomic<int> m_count;
+    Semaphore m_sema;
+
+    void waitWithPartialSpinning()
+    {
+        int oldCount;
+        // Is there a better way to set the initial spin count?
+        // If we lower it to 1000, testBenaphore becomes 15x slower on my Core i7-5930K Windows PC,
+        // as threads start hitting the kernel semaphore.
+        int spin = 10000;
+        while (spin--)
+        {
+            oldCount = m_count.load(std::memory_order_relaxed);
+            if ((oldCount > 0) && m_count.compare_exchange_strong(oldCount, oldCount - 1, std::memory_order_acquire))
+                return;
+            std::atomic_signal_fence(std::memory_order_acquire);     // Prevent the compiler from collapsing the loop.
+        }
+        oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
+        if (oldCount <= 0)
+        {
+            m_sema.wait();
+        }
+    }
+
+public:
+    LightweightSemaphore(int initialCount = 0) : m_count(initialCount)
+    {
+        assert(initialCount >= 0);
+    }
+
+    bool tryWait()
+    {
+        int oldCount = m_count.load(std::memory_order_relaxed);
+        return (oldCount > 0 && m_count.compare_exchange_strong(oldCount, oldCount - 1, std::memory_order_acquire));
+    }
+
+    void wait()
+    {
+        if (!tryWait())
+            waitWithPartialSpinning();
+    }
+
+    void signal(int count = 1)
+    {
+        int oldCount = m_count.fetch_add(count, std::memory_order_release);
+        int toRelease = -oldCount < count ? -oldCount : count;
+        if (toRelease > 0)
+        {
+            m_sema.signal(toRelease);
+        }
+    }
+};
+
+
+typedef LightweightSemaphore DefaultSemaphoreType;
+
+}
+
+#endif // __CPP11OM_SEMAPHORE_H__
--- a/Show More
+++ b/Show More