Merge pull request #1038 from simonvanbernem/save-ui-scale

Added saving of user ui scale via global configuration.

.clang-format

@@ -0,0 +1,18 @@
+# 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: LLVM
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Allman
+BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: false
+ColumnLimit: 120
+FixNamespaceComments: false
+IndentPPDirectives: AfterHash
+IndentWidth: 4
+PointerAlignment: Left
+SpaceBeforeParens: Never
+SpacesInParentheses: true
+TabWidth: 4

.clang-tidy

@@ -0,0 +1,61 @@
+---
+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,
+	-modernize-avoid-c-arrays,
+	-modernize-deprecated-headers,
+	-modernize-use-default-member-init,
+	-modernize-use-trailing-return-type,
+	-performance-no-int-to-ptr,
+	-readability-braces-around-statements,
+	-readability-else-after-return,
+	-readability-function-cognitive-complexity,
+	-readability-identifier-length,
+	-readability-implicit-bool-conversion,
+	-readability-isolate-declaration,
+	-readability-magic-numbers,
+	-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'
+...
+

.github/workflows/build.yml

@@ -0,0 +1,83 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ windows-latest, macos-15 ]
+
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    steps:
+    - uses: actions/checkout@v4
+    - if: startsWith(matrix.os, 'windows')
+      uses: microsoft/setup-msbuild@v2
+    - if: startsWith(matrix.os, 'windows')
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - if: startsWith(matrix.os, 'windows')
+      run: pip install meson ninja
+    - if: startsWith(matrix.os, 'macos')
+      name: Install macos dependencies
+      run: brew install pkg-config glfw meson
+    - name: Trust git repo
+      run: git config --global --add safe.directory '*'
+    - name: Profiler GUI
+      run: |
+        cmake -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
+        cmake --build profiler/build --parallel --config Release
+    - name: Update utility
+      run: |
+        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release
+        cmake --build update/build --parallel --config Release
+    - name: Capture utility
+      run: |
+        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release
+        cmake --build capture/build --parallel --config Release
+    - name: Csvexport utility
+      run: |
+        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
+        cmake --build csvexport/build --parallel --config Release
+    - name: Import utilities
+      run: |
+        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
+        cmake --build import/build --parallel --config Release
+    - if: ${{ !startsWith(matrix.os, 'windows') }}
+      name: Library
+      run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
+    - if: ${{ !startsWith(matrix.os, 'windows') }}
+      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 csvexport/build/tracy-csvexport bin
+        cp import/build/tracy-import-chrome bin
+        cp import/build/tracy-import-fuchsia bin
+    - if: startsWith(matrix.os, 'windows')
+      name: Find Artifacts
+      id: find_artifacts_windows
+      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 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
+    - uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.os }}
+        path: bin

.github/workflows/emscripten.yml

@@ -0,0 +1,63 @@
+name: emscripten
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
+
+jobs:
+  build:
+    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
+    - name: Setup emscripten
+      uses: mymindstorm/setup-emsdk@v14
+      with:
+        version: 3.1.67
+    - name: Trust git repo
+      run: git config --global --add safe.directory '*'
+    - uses: actions/checkout@v4
+    - 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/tracy-profiler.data 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
+    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

.github/workflows/gcc.yml

@@ -1,44 +0,0 @@
-name: gcc
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macOS-latest]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install linux libraries
-      if: ${{ matrix.os == 'ubuntu-20.04' }}
-      run: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk-3-dev libcapstone-dev libtbb-dev
-    - name: Install macos libraries
-      if: ${{ matrix.os == 'macOS-latest' }}
-      run: brew install capstone tbb pkg-config glfw
-    - name: Profiler GUI
-      run: make -j -C profiler/build/unix debug release
-    - name: Update utility
-      run: make -j -C update/build/unix debug release
-    - name: Capture utility
-      run: make -j -C capture/build/unix debug release
-    - name: Csvexport utility
-      run: make -j -C csvexport/build/unix debug release
-    - name: Import-chrome utility
-      run: make -j -C import-chrome/build/unix debug release
-    - name: Library
-      run: make -j -C library/unix debug release
-    - name: Test application
-      run: |
-        make -j -C test
-        make -j -C test clean
-        make -j -C test TRACYFLAGS=-DTRACY_ON_DEMAND
-        make -j -C test clean
-        make -j -C test TRACYFLAGS="-DTRACY_DELAYED_INIT -DTRACY_MANUAL_LIFETIME"

.github/workflows/latex.yml

@@ -12,17 +12,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Fix stupidity
       run: |
-        cp AUTHORS AUTHORS.
         cp LICENSE LICENSE.
     - name: Compile LaTeX
-      uses: xu-cheng/latex-action@v2
+      uses: xu-cheng/latex-action@v3
       with:
         working_directory: manual
         root_file: tracy.tex
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: manual
         path: manual/tracy.pdf

.github/workflows/linux.yml

@@ -0,0 +1,80 @@
+name: linux
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
+
+jobs:
+  build:
+    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
+    - name: Trust git repo
+      run: git config --global --add safe.directory '*'
+    - uses: actions/checkout@v4
+    - name: Profiler GUI
+      run: |
+        cmake -B profiler/build -S profiler -DCMAKE_BUILD_TYPE=Release -DGIT_REV=${{ github.sha }}
+        cmake --build profiler/build --parallel
+    - name: Update utility
+      run: |
+        cmake -B update/build -S update -DCMAKE_BUILD_TYPE=Release
+        cmake --build update/build --parallel
+    - name: Capture utility
+      run: |
+        cmake -B capture/build -S capture -DCMAKE_BUILD_TYPE=Release
+        cmake --build capture/build --parallel
+    - name: Csvexport utility
+      run: |
+        cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
+        cmake --build csvexport/build --parallel
+    - name: Import utilities
+      run: |
+        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
+        cmake --build import/build --parallel
+    - name: Library
+      run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
+    - name: Test application
+      run: |
+        # test compilation with different flags
+        # we clean the build folder to reset cached variables between runs
+        cmake -B test/build -S test -DCMAKE_BUILD_TYPE=Release
+        cmake --build test/build --parallel
+        rm -rf test/build
+
+        # same with TRACY_ON_DEMAND
+        cmake -B test/build -S test -DCMAKE_BUILD_TYPE=Release -DTRACY_ON_DEMAND=ON .
+        cmake --build test/build --parallel
+        rm -rf test/build
+
+        # same with TRACY_DELAYED_INIT TRACY_MANUAL_LIFETIME
+        cmake -B test/build -S test -DCMAKE_BUILD_TYPE=Release -DTRACY_DELAYED_INIT=ON -DTRACY_MANUAL_LIFETIME=ON .
+        cmake --build test/build --parallel
+        rm -rf test/build
+
+        # same with TRACY_DEMANGLE
+        cmake -B test/build -S test -DCMAKE_BUILD_TYPE=Release -DTRACY_DEMANGLE=ON .
+        cmake --build test/build --parallel
+        rm -rf test/build
+    - 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 csvexport/build/tracy-csvexport bin
+        cp import/build/tracy-import-chrome bin
+        cp import/build/tracy-import-fuchsia bin
+        strip bin/tracy-*
+    - uses: actions/upload-artifact@v4
+      with:
+        name: arch-linux
+        path: bin

.github/workflows/msvc.yml

@@ -1,57 +0,0 @@
-name: MSVC
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: windows-2022
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: microsoft/setup-msbuild@v1.0.2
-    - name: Integrate vcpkg
-      run: vcpkg integrate install
-    - name: Build vcpkg libraries
-      run: vcpkg install freetype glfw3 capstone[arm,arm64,x86] --triplet x64-windows-static
-    - name: Profiler GUI Debug
-      run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Debug /property:Platform=x64
-    - name: Profiler GUI Release
-      run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Update utility Debug
-      run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Debug /property:Platform=x64
-    - name: Update utility Release
-      run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Capture utility Debug
-      run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Debug /property:Platform=x64
-    - name: Capture utility Release
-      run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Csvexport utility Debug
-      run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Debug /property:Platform=x64
-    - name: Csvexport utility Release
-      run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Import-chrome utility Debug
-      run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Debug /property:Platform=x64
-    - name: Import-chrome utility Release
-      run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Library
-      run: msbuild .\library\win32\TracyProfiler.vcxproj /property:Configuration=Release /property:Platform=x64
-    - name: Package binaries
-      run: |
-        mkdir bin
-        mkdir bin\dev
-        copy profiler\build\win32\x64\Release\Tracy.exe bin
-        copy update\build\win32\x64\Release\update.exe bin
-        copy capture\build\win32\x64\Release\capture.exe bin
-        copy import-chrome\build\win32\x64\Release\import-chrome.exe bin
-        copy csvexport\build\win32\x64\Release\csvexport.exe bin
-        copy library\win32\x64\Release\TracyProfiler.dll bin\dev
-        copy library\win32\x64\Release\TracyProfiler.lib bin\dev
-        7z a Tracy.7z bin
-    - uses: actions/upload-artifact@v2
-      with:
-        path: Tracy.7z

.gitignore

@@ -1,10 +1,4 @@
 .vs
-*.opendb
-*.db
-*.vcxproj.user
-x64
-Release
-Debug
 _build
 _compiler
 tools/*
@@ -12,6 +6,7 @@ tools/*
 *.o
 *.so
 *.swp
+*.obj
 imgui.ini
 test/tracy_test
 test/tracy_test.exe
@@ -24,16 +19,18 @@ manual/t*.synctex.gz
 manual/t*.toc
 manual/t*.bbl
 manual/t*.blg
+manual/t*.fdb_latexmk
+manual/t*.fls
 profiler/build/win32/packages
 profiler/build/win32/Tracy.aps
-# include the vcpkg install script but not the files it produces
-vcpkg/*
-!vcpkg/install_vcpkg_dependencies.bat
 .deps/
 .dirstamp
-.vscode/
-
 /_*/**
 /**/__pycache__/**
 extra/vswhere.exe
 extra/tracy-build
+.cache
+compile_commands.json
+profiler/build/wasm/Tracy-release.*
+profiler/build/wasm/Tracy-debug.*
+profiler/build/wasm/embed.tracy

.mailmap

@@ -0,0 +1,2 @@
+<wolf@nereid.pl> <wolf.pld@gmail.com>
+<wolf@nereid.pl> <bartosz.taudul@game-lion.com>

.vscode/c_cpp_properties.json

@@ -1,17 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "includePath": [
-                "${workspaceFolder}/**",
-                "/usr/include/freetype2"
-            ],
-            "defines": [],
-            "compilerPath": "/usr/bin/clang++",
-            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "intelliSenseMode": "clang-x64"
-        }
-    ],
-    "version": 4
-}

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "llvm-vs-code-extensions.vscode-clangd",
+        "vadimcn.vscode-lldb",
+        "ms-vscode.cmake-tools"
+    ]
+}

.vscode/launch.json

@@ -1,27 +1,13 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(gdb) Launch",
-            "type": "cppdbg",
+            "name": "Launch",
+            "type": "lldb",
             "request": "launch",
-            "program": "${workspaceFolder}/profiler/build/unix/Tracy-debug",
+            "program": "${command:cmake.launchTargetPath}",
             "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Włącz formatowanie kodu dla gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
+            "cwd": "${workspaceFolder}"
         }
     ]
-}
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "cmake.configureOnOpen": true,
+    "cmake.sourceDirectory": [
+        "${workspaceFolder}/profiler",
+        "${workspaceFolder}/capture",
+        "${workspaceFolder}/csvexport",
+        "${workspaceFolder}/import",
+        "${workspaceFolder}/update",
+        "${workspaceFolder}/test",
+        "${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"],
+}

.vscode/tasks.json

@@ -1,20 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Build Profiler",
-            "type": "shell",
-            "command": "make debug -C profiler/build/unix -j 24",
-            "problemMatcher": {
-                "base": "$gcc",
-                "fileLocation": ["relative", "${workspaceRoot}/profiler/build/unix"]
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        }
-    ]
-}

AUTHORS

@@ -1,20 +0,0 @@
-Bartosz Taudul <wolf@nereid.pl>
-Kamil Klimek <kamil.klimek@sharkbits.com>           (initial find zone implementation)
-Bartosz Szreder <zgredder@gmail.com>                (view/worker split)
-Arvid Gerstmann <dev@arvid-g.de>                    (compatibility fixes)
-Rokas Kupstys <rokups@zoho.com>                     (compatibility fixes, initial CI work, MingW support)
-Till Rathmann <till.rathmann@gmx.de>                (DLL support)
-Sherief Farouk <sherief.personal@gmail.com>         (compatibility fixes)
-Dedmen Miller <dedmen@dedmen.de>                    (find zone bug fixes, improvements)
-Michał Cichoń <michcic@gmail.com>                   (OSX call stack decoding backport)
-Thales Sabino <thales@codeplay.com>                 (OpenCL support)
-Andrew Depke <andrewdepke@gmail.com>                (Direct3D 12 support)
-Simonas Kazlauskas <git@kazlauskas.me>              (OSX CI, external bindings)
-Jakub Žádník <kubouch@gmail.com>                    (csvexport utility)
-Andrey Voroshilov <andrew.voroshilov@gmail.com>     (multi-DLL fixes)
-Benoit Jacob <benoitjacob@google.com>               (Android improvements)
-David Farrel <dafarrel@adobe.com>                   (Direct3D 11 support)
-Terence Rokop <rokopt@sharpears.net>                (Non-reentrant zones)
-Lukas Berbuer <lukas.berbuer@gmail.com>             (CMake integration)
-Xavier Bouchoux <xavierb@gmail.com>                 (sample data in find zone)
-Balazs Kovacsics <kovab93@gmail.com>                (Universal Windows Platform)

CMakeLists.txt

@@ -1,13 +1,54 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(Tracy LANGUAGES CXX)
+# 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)
 
-add_library(TracyClient TracyClient.cpp)
+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)
-target_include_directories(TracyClient SYSTEM PUBLIC 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> 
+set_target_properties(TracyClient PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${LTO_SUPPORTED})
+target_include_directories(TracyClient SYSTEM PUBLIC
+    $<BUILD_INTERFACE:${TRACY_PUBLIC_DIR}>
     $<INSTALL_INTERFACE:include>)
 target_link_libraries(
     TracyClient
@@ -16,12 +57,48 @@ target_link_libraries(
         ${CMAKE_DL_LIBS}
 )
 
+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>)
+    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)
+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()
 
 macro(set_option option help value)
     option(${option} ${help} ${value})
@@ -35,7 +112,7 @@ endmacro()
 
 set_option(TRACY_ENABLE "Enable profiling" ON)
 set_option(TRACY_ON_DEMAND "On-demand profiling" OFF)
-set_option(TRACY_CALLSTACK "Enfore callstack collection for tracy regions" OFF)
+set_option(TRACY_CALLSTACK "Enforce callstack collection for tracy regions" OFF)
 set_option(TRACY_NO_CALLSTACK "Disable all callstack related functionality" OFF)
 set_option(TRACY_NO_CALLSTACK_INLINES "Disables the inline functions in callstacks" OFF)
 set_option(TRACY_ONLY_LOCALHOST "Only listen on the localhost interface" OFF)
@@ -44,16 +121,34 @@ set_option(TRACY_ONLY_IPV4 "Tracy will only accept connections on IPv4 addresses
 set_option(TRACY_NO_CODE_TRANSFER "Disable collection of source code" OFF)
 set_option(TRACY_NO_CONTEXT_SWITCH "Disable capture of context switches" OFF)
 set_option(TRACY_NO_EXIT "Client executable does not exit until all profile data is sent to server" OFF)
-set_option(TRACY_NO_FRAME_IMAGE "Disable capture of frame images" OFF)
 set_option(TRACY_NO_SAMPLING "Disable call stack sampling" OFF)
 set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF)
 set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF)
 set_option(TRACY_NO_FRAME_IMAGE  "Disable the frame image support and its thread" OFF)
+set_option(TRACY_NO_SYSTEM_TRACING  "Disable systrace sampling" OFF)
+set_option(TRACY_PATCHABLE_NOPSLEDS  "Enable nopsleds for efficient patching by system-level tools (e.g. rr)" OFF)
 set_option(TRACY_DELAYED_INIT "Enable delayed initialization of the library (init on first call)" OFF)
 set_option(TRACY_MANUAL_LIFETIME "Enable the manual lifetime management of the profile" OFF)
 set_option(TRACY_FIBERS "Enable fibers support" OFF)
+set_option(TRACY_NO_CRASH_HANDLER "Disable crash handling" OFF)
+set_option(TRACY_TIMER_FALLBACK "Use lower resolution timers" OFF)
+set_option(TRACY_LIBUNWIND_BACKTRACE "Use libunwind backtracing where supported" OFF)
+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)
+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)
+set_option(TRACY_DEBUGINFOD "Enable debuginfod support" OFF)
 
-if(BUILD_SHARED_LIBS)
+# advanced
+set_option(TRACY_VERBOSE "[advanced] Verbose output from the profiler" OFF)
+mark_as_advanced(TRACY_VERBOSE)
+set_option(TRACY_DEMANGLE "[advanced] Don't use default demangling function - You'll need to provide your own" OFF)
+mark_as_advanced(TRACY_DEMANGLE)
+
+# handle incompatible combinations
+if(TRACY_MANUAL_LIFETIME AND NOT TRACY_DELAYED_INIT)
+    message(FATAL_ERROR "TRACY_MANUAL_LIFETIME can not be activated with disabled TRACY_DELAYED_INIT")
+endif()
+
+if(NOT TRACY_STATIC)
     target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS)
     target_compile_definitions(TracyClient PUBLIC TRACY_IMPORTS)
 endif()
@@ -61,65 +156,116 @@ endif()
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
-set(includes
-    ${CMAKE_CURRENT_LIST_DIR}/TracyC.h
-    ${CMAKE_CURRENT_LIST_DIR}/Tracy.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyD3D11.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyD3D12.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyLua.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyOpenCL.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyOpenGL.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/TracyVulkan.hpp)
+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/TracyD3D11.hpp
+    ${TRACY_PUBLIC_DIR}/tracy/TracyD3D12.hpp
+    ${TRACY_PUBLIC_DIR}/tracy/TracyLua.hpp
+    ${TRACY_PUBLIC_DIR}/tracy/TracyOpenCL.hpp
+    ${TRACY_PUBLIC_DIR}/tracy/TracyOpenGL.hpp
+    ${TRACY_PUBLIC_DIR}/tracy/TracyVulkan.hpp)
 
 set(client_includes
-    ${CMAKE_CURRENT_LIST_DIR}/client/tracy_concurrentqueue.h
-    ${CMAKE_CURRENT_LIST_DIR}/client/tracy_rpmalloc.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/tracy_SPSCQueue.h
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyArmCpuTable.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.h
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyDebug.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyDxt1.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyFastVector.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyLock.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyProfiler.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyRingBuffer.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyScoped.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyStringHelpers.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTime.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTrace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/client/TracyThread.hpp)
+    ${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/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
-    ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4hc.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlign.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlign.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlloc.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyApi.h
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyColor.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyForceInline.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyMutex.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyProtocol.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyQueue.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracySocket.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyStackFrames.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracySystem.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyUwp.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common/TracyYield.hpp)
+    ${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/TracyColor.hpp
+    ${TRACY_PUBLIC_DIR}/common/TracyForceInline.hpp
+    ${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/TracySystem.hpp
+    ${TRACY_PUBLIC_DIR}/common/TracyUwp.hpp
+    ${TRACY_PUBLIC_DIR}/common/TracyYield.hpp)
 
 install(TARGETS TracyClient
         EXPORT TracyConfig
         RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+        ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        COMPONENT lib)
+if(TRACY_Fortran)
+    install(TARGETS TracyClientF90
+            EXPORT TracyConfig
+            RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            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}/client)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/client)
 install(FILES ${common_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common)
+        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 TracyConfig.cmake
-        DESTINATION share/Tracy)
+        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})
+
+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()

Config.cmake.in

@@ -0,0 +1,6 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(Threads REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake")

LICENSE

@@ -1,7 +1,7 @@
 Tracy Profiler (https://github.com/wolfpld/tracy) is licensed under the
 3-clause BSD license.
 
-Copyright (c) 2017-2022, Bartosz Taudul <wolf@nereid.pl>
+Copyright (c) 2017-2025, Bartosz Taudul <wolf@nereid.pl>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

NEWS

@@ -2,6 +2,454 @@ Note: There is no guarantee that version mismatched client and server will
 be able to talk with each other. Network protocol breakages won't be listed
 here.
 
+vx.xx.x (xxxx-xx-xx)
+--------------------
+
+- Enabled workaround for MSVC runtime library SNAFU, which manifested with
+  the profiler executables crashing at startup inside mutex code.
+- CPU topology data now includes CPU die information.
+- Clients running under Wine will now report that in the trace info.
+- Added flame graph.
+- The Git ref information for the build is now included in the about dialog.
+- Added support for clipboard copy and paste on Wayland.
+- The welcome dialog client address entry field will now trim the entered
+  address, so that stray spaces at the start and the end are removed. This
+  should reduce the amount of user precision required when copy pasting the
+  address from somewhere else.
+- Metal GPU profiling is now available.
+- Profiling zones can now optionally inherit their parent color.
+- It is no longer needed to have up-to-date copy of wayland-protocols
+  installed. CMake will download the required version from GitHub.
+- Added option to show the top inline in symbol statistics list in stead of
+  the symbol name.
+- Parallel sorting is now performed with PPQSort (which removes potential
+  dependency on TBB).
+- Added CMake option TRACY_DEBUGINFOD to enable use of libdebuginfod to
+  retrieve symbols on Linux clients.
+- Added a "custom" label as an option to select for GPU context type.
+- Symbol code retrieval is now protected against reading no longer available
+  memory.
+- Clicking on a symbol in the symbol statistics list will now open a popup
+  with two options. This change intends to make the useful but quite hidden
+  disassembly view more discoverable.
+  - "View symbol" shows the symbol code disassembly. It was previously
+    available by right-click on the source file name.
+  - "Sample entry stacks" shows the list window that was previously
+    opened when the symbol entry was clicked.
+- Plots are now extended to the end of the trace, instead of ending at the
+  last data point.
+- Added TracyMemoryDiscard macros to mark that all allocations made in a
+  certain memory pool were freed. This enables better support for arena
+  allocators.
+- It is now possible to fine-tune horizontal and vertical mouse wheel scroll
+  sensitivity.
+- Added p75 and p90 percentiles in the Find zone window.
+- Zone info window will now display (approximate) wall-clock time of when
+  the zone appeared, in addition to the previously displayed time from the
+  start of the program.
+- Zone values passed via ZoneValue macro will be now also displayed in hex.
+- The csvexport utility can now export plots.
+- Fortran integration is now available.
+
+
+v0.11.1 (2024-08-22)
+--------------------
+
+- Utilities import-chrome and import-fuchsia now live together in the import
+  directory.
+- Added TRACY_VERBOSE to available CMake options.
+- It is now possible to set TRACY_SAMPLING_HZ via a environment variable.
+- Thread group hints can be now used to group threads together in the
+  profiler UI.
+- Limit Lua file names to 255 characters, as the source string can contain
+  the whole script, if loaded with loadstring().
+
+
+v0.11.0 (2024-07-16)
+--------------------
+
+- Support for pre-0.9 traces has been dropped.
+- The old server-side build system has been replaced by CMake. The client
+  integration is not affected. Refer to the manual for details.
+  - Most importantly, a known version of the capstone library is now
+    downloaded from GitHub. You will need to have git installed for this
+    to work (there is a CMake option to use the capstone installed on the
+    system, as was done previously).
+- Various Meson fixes.
+- Proper way of loading Vulkan calibrated timestamps extension.
+- Fixed C API support for GPU tracing when on demand mode is enabled.
+- Added a way to resynchronize CPU and GPU timestamps.
+  - Using calibrated contexts should always be preferred.
+  - Each synchronization event requires a sync of CPU and GPU, which is
+    something you always want to avoid.
+  - This is not exposed as an easy-to-use API available through the GPU
+    wrappers.
+- Added TracyIsStarted macro to check if the profiler has been started.
+  Using this functionality only makes sense in the manual lifetime mode,
+  and will always return true in any other mode of operation.
+- Added basic QNX support.
+- Zmmword is now recognized as an assemble size directive.
+- Libunwind can be used for call stack capture on Linux if you build with
+  the TRACY_LIBUNWIND_BACKTRACE define.
+- Preloading symbols for all modules on Windows, which is always performed
+  on program init, and which can be quite slow, may now be omitted through
+  the TRACY_NO_DBGHELP_INIT_LOAD define. In this mode, symbols will be
+  loaded as needed.
+- Validation of discontinuous frames has been disabled in on-demand mode.
+  It's quite likely to connect in the middle of a discontinuous frame,
+  which resulted in frame end event for a frame that hasn't been started.
+- Symbols can be now resolved offline on Windows and Linux.
+  - Enabled with the TRACY_SYMBOL_OFFLINE_RESOLVE define or env variable.
+  - The update utility has two additional options:
+    - -r, which enables resolving symbol and patching stack frames in the
+      trace.
+    - -p, which you can use to modify the paths used for symbol resolution.
+  - Some functionality will be missing if this mode is used. For example,
+    symbol statistics are unavailable.
+- Resolving symbol names on Linux will now use image cache to reduce the
+  number of dladdr() calls.
+- Compiling with the TRACY_LIBBACKTRACE_ELF_DYNLOAD_SUPPORT define will
+  enable support for run-time updating of known elf ranges in libbacktrace
+  on Linux. Previously, shared objects dlopened() after libbacktrace init
+  would not be visible during symbol resolution.
+- Zone group count in the Find zone window is now explicitly displayed.
+- Instrumentation statistics now display in how many threads each source
+  location has appeared in.
+- Added import tool for fuchsia traces.
+  - https://fuchsia.dev/fuchsia-src/reference/tracing/trace-format
+- Added checks for overflow of source locations.
+  - As a reminder, Tracy only allows to have 64K unique source locations,
+    split in half between static and dynamic locations.
+  - Runtime checks are active during capture and will stop a trace that
+    goes beyond the limit.
+  - Load-time checks will stop any broken trace file from loading.
+- Opening the source code view that has no associated address in code
+  (i.e., from the list of instrumented zones, or from the find zone
+  window) will now search the list of symbols for a function name match.
+  - In many cases this will result in displaying the full disassembly view
+    where previously you would only see the source code.
+  - Matching is performed by string comparisons, which in rare cases may
+    result in showing false data.
+  - Press ctrl key while opening source view to keep the old behavior.
+  - If more than one matching symbol is found (e.g., if two classes have
+    methods with the same name, or if a template is instantiated in multiple
+    places in code), it is not possible to tell which of the code locations
+    the source location corresponds to and only the source code will be
+    displayed.
+- Added TracyNoop macro, which inserts a reference to Tracy's object file
+  into your application. Use it if you want to use Tracy in sampling mode,
+  without any manual instrumentation (so no references of your own exist)
+  and link Tracy as a static library. Linkers will only include library code
+  if code references it, and this doesn't work as intended with Tracy, as it
+  ignores global constructors that have side effects.
+- ZoneText and ZoneName macros now have a printf-like variant, denoted with
+  a 'F' postfix.
+- The 'tracy_shared_libs' Meson option was removed. Use interface provided
+  by Meson to set the library type instead.
+- Dropped the 'tracy_' prefix from Meson options. The `tracy_enable` option
+  remains as it was, as it can be inherited from parent projects.
+- Fixed display of active / inactive allocations in memory call tree.
+- Instrumentation statistics can be now sorted by source location.
+- Added option to hide external code frames in call stack view.
+- There's now a copy to clipboard button in the statistics view. It copies
+  the visible rows of either the instrumentation or GPU statistics view to
+  a CSV string matching a subset of the csvexport format.
+- Source file contents can be copied to the clipboard.
+- Added key binding for immediate reconnect: Ctrl+Shift+Alt+R.
+- Lock markup is now available through the C API.
+- Symbol statistics window now allows aggregation of inlined functions in
+  symbols.
+- Cost measurements of inlined functions in the symbol statistics window
+  can be now relative to the base symbol instead of total program run time.
+- ScopedZone and AllocSourceLocation now accept color parameter. Impact on
+  existing code should be minimal.
+  - AllocSourceLocation has a new parameter with a default value.
+  - __tracy_alloc_srcloc and __tracy_alloc_srcloc_name break the existing
+    API. This can be easily fixed by setting the last parameter to zero.
+- To build the profiler GUI with Wayland you now need wayland-scanner and
+  wayland-protocols to be installed. A reasonably recent release of the
+  protocols is required, which, as always, is not available on Ubuntu.
+  Seriously, stop trying to build modern software with that broken distro.
+- Fractional DPI scaling is now properly supported on Wayland.
+- Added Python bindings.
+- The per-line sampling statistics are now also displayed as a percentage
+  of total program run time.
+- The out-of-focus render frame rate reduction can be now disabled in
+  global settings.
+- It is now possible to load source files that are newer than the trace.
+  The default setting is still to reject such files.
+- Memory limit for a capture can be now set, both in the GUI profiler and
+  in the capture utility.
+- Thread list can be now sorted alphabetically.
+- It is now possible to adjust plot height.
+- Trace comparison statistics were expanded and made more clear.
+- Implemented retrieval of kernel symbol code on Linux.
+- Added support for multiple compression streams in trace files. This
+  effectively parallelizes both load and save operations.
+  - The default save setup is now set to Zstd level 3 with 4 compression
+    streams. This gives both faster compression time and smaller file size.
+- New users will be now eased into the profiler with a set of tutorial
+  achievements.
+- You can now set the timeline options default values in global settings.
+- Added a check for program memory being available before symbol retrieval
+  on Windows.
+
+
+v0.10.0 (2023-10-16)
+--------------------
+
+- Missed frames region of on-demand captures will be now ignored when
+  calculating trace time span, zone percentages, etc.
+  - Due to technicalities information about locks, frame statistics in trace
+    information window and csvexport utility still include the missed frames
+    time.
+- When source location dynamic zone coloring mode is enabled, collapsed
+  zones will be now gray-colored. Previously such regions falled back to
+  showing thread colors, which may have been confusing to users.
+- Vulkan contexts can now use VK_EXT_host_query_reset extension.
+- System power usage is now reported on x86 Linux.
+- Program name displayed in broadcast messages can be now changed with the
+  TracySetProgramName() macro.
+- Zone error markers (red regions and error bars) have been removed for
+  consistency with how all other profiling events are displayed.
+- It is now possible to export messages in the csvexport utility.
+- Major overhaul of how timeline items are processed in GUI.
+  - The process of figuring out what needs to be drawn on the timeline has
+    been heavily parallelized.
+  - The impact is especially visible with traces containing large amounts
+    of data. The framerate improvement in such cases can be ~30x.
+  - Consequently, the profiler GUI will now produce multi-core spikes when
+    rendering frames. This may have impact on the profiled application's
+    performance, if both the application and the profiler GUI are running
+    on the same machine. If this is a problem, you may consider the capture
+    utility instead, which is not affected by these changes. Alternatively,
+    you may disable parallelization in the options menu.
+  - Most of the timeline item logic has been written from scratch, which
+    may have taken care of some elusive bugs.
+- Added global configuration settings dialog. You can find it in the
+  profiler's about menu (the wrench icon in the welcome dialog).
+- List of found zones in the Find zone menu can be filtered by user text.
+- Fixed div-by-zero in cvsexport utility when there was only one zone of
+  a kind.
+- Fixed compatibility problems with FreeBSD.
+- Added support for dynamically loaded Vulkan symbols.
+- Trace description or filename is now displayed on the window title bar.
+- The csvexport utility will now export thread id data.
+- Improved compatibility with MSVC projects not defining NOMINMAX.
+- Improved compatibility with Linux setups targeting musl as libc.
+- Thread safety of Vulkan instrumentation has been reviewed.
+- D3D11 and D3D12 instrumentation was rewritten.
+- Added support for efficient profiling when running under rr, the record-
+  replaying debugger. This is enabled with TRACY_PATCHABLE_NOPSLEDS define.
+- History of viewed symbols is now preserved and you can go back to
+  previously displayed entries.
+
+
+v0.9.1 (2023-02-26)
+-------------------
+
+- Support for pre-0.8 traces has been dropped.
+- Profiled programs will ignore dlclose() calls.
+- Added warning when the profiler interface is run with privilege elevation.
+  Advice is given to instead run the client with admin rights.
+- Switched to official ZEN4 uarch data.
+- Handle cases when thread name is set, but not through Tracy facilities.
+- Allow customization of source location data through the following macros:
+  - TracyFunction - defaults to __FUNCTION__
+  - TracyFile - defaults to __FILE__
+  - TracyLine - defaults to __LINE__
+- Tracy on Linux now targets and requires Wayland by default.
+  - Please don't ask about window decorations on Gnome. Current behavior is
+    the intended behavior. Gnome does not want windows to have decorations,
+    and Tracy respects this choice. If you find this problematic, use a
+    desktop environment that actually listens to its users.
+  - Pass LEGACY=1 parameter to make, if you want to instead rely on the GLFW
+    library, like before.
+  - Other platforms still use GLFW.
+- Compare traces menu can now display source code differences between two
+  traces.
+- Assembly listings saved to files have been improved.
+  - Listings are now annotated with source line information.
+  - To improve compatibility with external tools comments are now prefixed
+    with '#' instead of ';'.
+- Histogram tooltip will now also show left/right counts.
+- Tracy now actively manages timeline vertical scroll offset in order to keep
+  the thread under the mouse cursor in the same place on screen.
+- Removed support for AT&T assembly syntax.
+- Tracy will not display notification if the file selector can't be used.
+  Possible reasons for failure include lack of xdg-desktop-portal.
+- Using the TRACY_NO_CRASH_HANDLER define will disable handling of
+  application crashes by the profiler.
+- Tracy will now query jump and call target addresses. This enables discovery
+  of target function names, even if such function has no samples and is not
+  present in any call stack.
+
+
+v0.9.0 (2022-10-26)
+-------------------
+
+- Attention! All the header and source files used for integrating Tracy with
+  applications were moved to the public/ directory. This will break your
+  integration!
+  - To fix this, update the source and include directories lists to point to
+    the new location.
+  - Tracy include files directly referenced by the client were moved to
+    tracy/ subdirectory, to facilitate setups which previously had Tracy
+    checkout parent directory in the include paths list (i.e. when you
+    included "tracy/Tracy.hpp").
+  - Previously, if you have included the Tracy checkout directory in your
+    project include directories list (i.e. you could include "Tracy.hpp"),
+    this could result in third-party library conflicts, e.g. with ImGui.
+    Such scenarios are no longer the case.
+- Tracy macros now require to be terminated with a semicolon.
+- The undocumented ___tracy_demangle() function API has been changed. Please
+  refer to the source code for further instructions.
+- The parameter callback and its registration macro have been extended to
+  include user data pointer. You will need to update your code accordingly.
+- Plots visualization has been improved.
+  - Each plot now has its own color, which can also be defined by the user.
+  - The area below the plot is now optionally filled with a color.
+  - Plots can now also be configured to be staircase instead of smooth. This
+    new setting is appropriate for many inputs where only discrete values
+    make sense, e.g. the memory allocation plot.
+  - The API for TracyPlotConfig() macro has been changed. Please refer to
+    the manual to see how you can fix this.
+- Some text labels in the user interface are now more easy to read.
+- The profiler will now instruct the user in the UI on what can be done, if
+  the send queue is slow to process (typically due to symbol resolution).
+- If a client with an incompatible protocol is discovered, Tracy will now
+  try to show which versions can be used to handle the connection.
+- Messages list in zone info window can now show messages exclusive to the
+  zone, filtering out the messages emitted from child zones.
+- Added capture of vertical synchronization timings on Linux.
+- The range of frame bar colors in the frames overview on top of the screen
+  can be now controlled with the "Target FPS" entry box in the options menu.
+  - The "Draw frame targets" option does not need to be selected.
+  - Previously the hardcoded FPS target thresholds were: 30, 60, 144 FPS.
+  - Currently the FPS target threshold is: half of target, target, twice the
+    target.
+- Reworked the way zone names are shortened.
+  - Previously shortening supported only namespace removal, in a way that
+    didn't consider function parameters or template arguments.
+    - Shortening to one-letter namespace chains is no longer available.
+  - The new shortening rules first perform normalization of the function name.
+    - The function const qualifier is removed.
+    - Common return types are removed.
+    - All function parameters and all template arguments are removed.
+  - The next steps consist of repeated removal of namespaces, starting with
+    the most outermost one.
+    - While the old process was all or nothing, the new implementation by
+      default will dynamically adjust to the space available, trying to show
+      the most context possible.
+  - It is also possible to completely disable shortening, or require that it
+    is always performed in full.
+  - Function name normalization is enabled by default, even if there is space
+    to show full function name. This can be changed in options.
+  - Previously shortening was only applied to the zone names displayed on the
+    timeline. Currently this process will also apply to all other places in
+    the UI where function names are displayed. However, in these cases the
+    function names will only be normalized.
+    - Full function names are still available as tooltips, or in fine print if
+      the normalized name is already displayed in a tooltip.
+    - This functionality is disabled if zone name shortening is disabled.
+- Added context menu for timeline labels. Currently the only option is to hide
+  the selected thread, plot, etc.
+- You can now provide custom source file contents through a profiler callback.
+- Exposed Tracy version to client applications (available through the
+  common/TracyVersion.hpp header file).
+- D3D12 instrumentation is now thread-safe.
+- Timeline can be now navigated with WASD keys.
+- Symbol file paths are now normalized on libbacktrace systems. For example,
+  instead of "/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../
+  include/c++/12.2.0/bits/std_mutex.h" Tracy will now report such file as
+  "/usr/include/c++/12.2.0/bits/std_mutex.h".
+- The import-chrome utility interprets Instant (`i`/`I`) events where the
+  `name` field contains the word `frame` as a frame event. The `name` is the
+  frame set name.
+- Frame data won't be displayed if there was no frame instrumentation in the
+  profiling session.
+  - Note that some automated functionality (e.g. vertical synchronization
+    capture) may automatically generate frame data, which will force frames to
+    be displayed.
+- Tracy threads will now be collapsed by default on the timeline.
+- Clicking on a local thread in the CPU data view will make the thread visible
+  and uncollapsed on the timeline.
+- Assembly view is now in color.
+- The profiler UI will no longer unnecessarily redraw the screen if nothing
+  was changed. This should have a profound impact on power usage.
+- Added microarchitecture data for Zen 4.
+- Implemented optional propagation of inline cost down the local call stack.
+  - This feature may be useful when trying to get a general outlook of the
+    cost at the top-level function in the symbol.
+  - It is possible to get nonsense data when this is enabled, for example
+    total cost exceeding 100%. This is by design.
+  - Assembly line costs are not affected.
+- Available clients now also broadcast their PID.
+- Reversed mouse button assignments for jumping to source / assembly line in
+  symbol view. The left mouse button will now focus the target line.
+- Assembly lines tooltip will now display local call stack of inline functions
+  (within the symbol).
+  - Right-clicking the source location entry in assembly line will show the
+    local call stack, along with source code preview of each entry and ability
+    to navigate to any selected inline function.
+- The profiler UI will now indicate that it needs attention if the window is
+  not focused and something interesting happens. For example when a connection
+  is established, or when a saved trace finishes loading, etc. How the
+  attention request is indicated depends on the operating system.
+- Clicking on the red microarchitecture icon in the symbol view assembly pane
+  will switch the selected microarchitecture to one the profiled application
+  was running on.
+- Removed option to display instruction latencies in a graphical form. Latency
+  data is still available in instruction tooltip.
+
+
+v0.8.2 (2022-06-28)
+-------------------
+
+- Added support for debuginfod debug information services. Note that
+  since this depends on proper system configuration, vendors providing
+  the debug information, and network retrieval, it is disabled by
+  default. To enable, compile the profiled application with the
+  TRACY_DEBUGINFOD define and link with libdebuginfod.
+- When Tracy server-side utilities are build with MSVC, the required
+  libraries will be now automatically retrieved and built with vcpkg.
+- Added microarchitecture data for: Bonnell, Airmont, Goldmont, Goldmont
+  Plus, Tremont.
+- Recognize additional CPUIDs of Zen 3, Alder Lake, Ice Lake
+  microarchitectures.
+- Assembly line width will be now extended, if needed. Previously the line
+  width was calculated for the initial layout and changing amount of
+  displayed data (especially listing the read/written registers) didn't
+  affect this, which may have made some lines partially unreadable.
+- Added ability to filter call stacks in memory tab by inactive allocations.
+  Filtering by inactive allocations helps to pinpoint wasteful allocations
+  in the program.
+- Plot graph will no longer display min/max values interpolated for
+  animation, but rather true values.
+- The CPU topology tree structure was replaced by a CPU schematic showing
+  the same thing in a more concise way.
+
+
+v0.8.1 (2022-04-21)
+-------------------
+
+- Support for pre-0.7 traces has been dropped.
+- Update utility can now scan for source files missing in the trace cache,
+  if the '-c' parameter is given. Found files will be added to the cache.
+- Added high-priority queue for fast queries to bypass slow symbol queries.
+- Fixed Android documentation to show how to enable context switch tracing.
+- Workaround MSVC 2015 stupidity which prevented compilation as C++11.
+- Added support for showing branch cost data for CPUs that don't report
+  branch retirement events (but do report branch misses).
+- The right-click context menu available for jump arrows in the symbol view
+  window will now additionally display jump context, i.e. jump sources and
+  jump target source code fragments.
+- Added freedesktop.org compliant desktop entry and MIME type definition.
+- The call stack column in list of messages will now be only displayed when
+  at least one message on the list has call stack data.
+- File dialogs on Unix will be now native to the desktop environment you are
+  using. Note that this relies on xdg-desktop-portal and dbus.
+
 
 v0.8.0 (2022-03-28)
 -------------------

README.md

@@ -4,19 +4,25 @@
 
 ### A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
 
-Tracy supports profiling CPU (C, C++11, Lua), GPU (OpenGL, Vulkan, OpenCL, Direct3D 11/12), memory, locks, context switches, per-frame screenshots and more.
+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 graphic APIs: OpenGL, Vulkan, Direct3D 11/12, Metal, OpenCL.), 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/)
 
 ![](doc/profiler.png)
 
 ![](doc/profiler2.png)
 
+![](doc/profiler3.png)
+
+[An Introduction to Tracy Profiler in C++ - Marcos Slomp - CppCon 2023](https://youtu.be/ghXk3Bk5F2U?t=37)
+
 [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.7](https://www.youtube.com/watch?v=_hU7vw00MZ4)  
+[New features in Tracy Profiler v0.8](https://www.youtube.com/watch?v=30wpRpHTTag)

TODO

@@ -1,7 +0,0 @@
-"Would be nice to have" list for 1.0 release:
-=============================================
-
-* Pack queue items tightly in the queues.
-* Use level-of-detail system for plots.
-* Use per-thread lock data structures.
-* Use DTrace for BSD/OSX context switch capture.

Tracy.hpp

@@ -1,267 +0,0 @@
-#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 ZoneTransient(x,y)
-#define ZoneTransientN(x,y,z)
-
-#define ZoneScoped
-#define ZoneScopedN(x)
-#define ZoneScopedC(x)
-#define ZoneScopedNC(x,y)
-
-#define ZoneText(x,y)
-#define ZoneTextV(x,y,z)
-#define ZoneName(x,y)
-#define ZoneNameV(x,y,z)
-#define ZoneColor(x)
-#define ZoneColorV(x,y)
-#define ZoneValue(x)
-#define ZoneValueV(x,y)
-#define ZoneIsActive false
-#define ZoneIsActiveV(x) false
-
-#define FrameMark
-#define FrameMarkNamed(x)
-#define FrameMarkStart(x)
-#define FrameMarkEnd(x)
-
-#define FrameImage(x,y,z,w,a)
-
-#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 LockableName(x,y,z);
-
-#define TracyPlot(x,y)
-#define TracyPlotConfig(x,y)
-
-#define TracyMessage(x,y)
-#define TracyMessageL(x)
-#define TracyMessageC(x,y,z)
-#define TracyMessageLC(x,y)
-#define TracyAppInfo(x,y)
-
-#define TracyAlloc(x,y)
-#define TracyFree(x)
-#define TracySecureAlloc(x,y)
-#define TracySecureFree(x)
-
-#define TracyAllocN(x,y,z)
-#define TracyFreeN(x,y)
-#define TracySecureAllocN(x,y,z)
-#define TracySecureFreeN(x,y)
-
-#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 ZoneTransientS(x,y,z)
-#define ZoneTransientNS(x,y,z,w)
-
-#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)
-#define TracySecureAllocS(x,y,z)
-#define TracySecureFreeS(x,y)
-
-#define TracyAllocNS(x,y,z,w)
-#define TracyFreeNS(x,y,z)
-#define TracySecureAllocNS(x,y,z,w)
-#define TracySecureFreeNS(x,y,z)
-
-#define TracyMessageS(x,y,z)
-#define TracyMessageLS(x,y)
-#define TracyMessageCS(x,y,z,w)
-#define TracyMessageLCS(x,y,z)
-
-#define TracyParameterRegister(x)
-#define TracyParameterSetup(x,y,z,w)
-#define TracyIsConnected false
-
-#define TracyFiberEnter(x)
-#define TracyFiberLeave
-
-#else
-
-#include <string.h>
-
-#include "client/TracyLock.hpp"
-#include "client/TracyProfiler.hpp"
-#include "client/TracyScoped.hpp"
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define ZoneNamed( varname, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define ZoneNamedN( varname, name, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define ZoneNamedC( varname, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define ZoneNamedNC( varname, name, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-
-#  define ZoneTransient( varname, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), nullptr, 0, TRACY_CALLSTACK, active );
-#  define ZoneTransientN( varname, name, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), name, strlen( name ), TRACY_CALLSTACK, active );
-#else
-#  define ZoneNamed( varname, active ) static constexpr 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 constexpr 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 constexpr 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 constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::ScopedZone varname( &TracyConcat(__tracy_source_location,__LINE__), active );
-
-#  define ZoneTransient( varname, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), nullptr, 0, active );
-#  define ZoneTransientN( varname, name, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), name, strlen( name ), active );
-#endif
-
-#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 ZoneTextV( varname, txt, size ) varname.Text( txt, size );
-#define ZoneName( txt, size ) ___tracy_scoped_zone.Name( txt, size );
-#define ZoneNameV( varname, txt, size ) varname.Name( txt, size );
-#define ZoneColor( color ) ___tracy_scoped_zone.Color( color );
-#define ZoneColorV( varname, color ) varname.Color( color );
-#define ZoneValue( value ) ___tracy_scoped_zone.Value( value );
-#define ZoneValueV( varname, value ) varname.Value( value );
-#define ZoneIsActive ___tracy_scoped_zone.IsActive()
-#define ZoneIsActiveV( varname ) varname.IsActive()
-
-#define FrameMark tracy::Profiler::SendFrameMark( nullptr );
-#define FrameMarkNamed( name ) tracy::Profiler::SendFrameMark( name );
-#define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart );
-#define FrameMarkEnd( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgEnd );
-
-#define FrameImage( image, width, height, offset, flip ) tracy::Profiler::SendFrameImage( image, width, height, offset, flip );
-
-#define TracyLockable( type, varname ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static constexpr tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
-#define TracyLockableN( type, varname, desc ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static constexpr tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() };
-#define TracySharedLockable( type, varname ) tracy::SharedLockable<type> varname { [] () -> const tracy::SourceLocationData* { static constexpr tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
-#define TracySharedLockableN( type, varname, desc ) tracy::SharedLockable<type> varname { [] () -> const tracy::SourceLocationData* { static constexpr 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 constexpr tracy::SourceLocationData __tracy_lock_location_##varname { nullptr, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; varname.Mark( &__tracy_lock_location_##varname );
-#define LockableName( varname, txt, size ) varname.CustomName( txt, size );
-
-#define TracyPlot( name, val ) tracy::Profiler::PlotData( name, val );
-#define TracyPlotConfig( name, type ) tracy::Profiler::ConfigurePlot( name, type );
-
-#define TracyAppInfo( txt, size ) tracy::Profiler::MessageAppInfo( txt, size );
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyMessage( txt, size ) tracy::Profiler::Message( txt, size, TRACY_CALLSTACK );
-#  define TracyMessageL( txt ) tracy::Profiler::Message( txt, TRACY_CALLSTACK );
-#  define TracyMessageC( txt, size, color ) tracy::Profiler::MessageColor( txt, size, color, TRACY_CALLSTACK );
-#  define TracyMessageLC( txt, color ) tracy::Profiler::MessageColor( txt, color, TRACY_CALLSTACK );
-
-#  define TracyAlloc( ptr, size ) tracy::Profiler::MemAllocCallstack( ptr, size, TRACY_CALLSTACK, false );
-#  define TracyFree( ptr ) tracy::Profiler::MemFreeCallstack( ptr, TRACY_CALLSTACK, false );
-#  define TracySecureAlloc( ptr, size ) tracy::Profiler::MemAllocCallstack( ptr, size, TRACY_CALLSTACK, true );
-#  define TracySecureFree( ptr ) tracy::Profiler::MemFreeCallstack( ptr, TRACY_CALLSTACK, true );
-
-#  define TracyAllocN( ptr, size, name ) tracy::Profiler::MemAllocCallstackNamed( ptr, size, TRACY_CALLSTACK, false, name );
-#  define TracyFreeN( ptr, name ) tracy::Profiler::MemFreeCallstackNamed( ptr, TRACY_CALLSTACK, false, name );
-#  define TracySecureAllocN( ptr, size, name ) tracy::Profiler::MemAllocCallstackNamed( ptr, size, TRACY_CALLSTACK, true, name );
-#  define TracySecureFreeN( ptr, name ) tracy::Profiler::MemFreeCallstackNamed( ptr, TRACY_CALLSTACK, true, name );
-#else
-#  define TracyMessage( txt, size ) tracy::Profiler::Message( txt, size, 0 );
-#  define TracyMessageL( txt ) tracy::Profiler::Message( txt, 0 );
-#  define TracyMessageC( txt, size, color ) tracy::Profiler::MessageColor( txt, size, color, 0 );
-#  define TracyMessageLC( txt, color ) tracy::Profiler::MessageColor( txt, color, 0 );
-
-#  define TracyAlloc( ptr, size ) tracy::Profiler::MemAlloc( ptr, size, false );
-#  define TracyFree( ptr ) tracy::Profiler::MemFree( ptr, false );
-#  define TracySecureAlloc( ptr, size ) tracy::Profiler::MemAlloc( ptr, size, true );
-#  define TracySecureFree( ptr ) tracy::Profiler::MemFree( ptr, true );
-
-#  define TracyAllocN( ptr, size, name ) tracy::Profiler::MemAllocNamed( ptr, size, false, name );
-#  define TracyFreeN( ptr, name ) tracy::Profiler::MemFreeNamed( ptr, false, name );
-#  define TracySecureAllocN( ptr, size, name ) tracy::Profiler::MemAllocNamed( ptr, size, true, name );
-#  define TracySecureFreeN( ptr, name ) tracy::Profiler::MemFreeNamed( ptr, true, name );
-#endif
-
-#ifdef TRACY_HAS_CALLSTACK
-#  define ZoneNamedS( varname, depth, active ) static constexpr 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 constexpr 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 constexpr 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 constexpr 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 ZoneTransientS( varname, depth, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), nullptr, 0, depth, active );
-#  define ZoneTransientNS( varname, name, depth, active ) tracy::ScopedZone varname( __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), name, strlen( name ), 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, false );
-#  define TracyFreeS( ptr, depth ) tracy::Profiler::MemFreeCallstack( ptr, depth, false );
-#  define TracySecureAllocS( ptr, size, depth ) tracy::Profiler::MemAllocCallstack( ptr, size, depth, true );
-#  define TracySecureFreeS( ptr, depth ) tracy::Profiler::MemFreeCallstack( ptr, depth, true );
-
-#  define TracyAllocNS( ptr, size, depth, name ) tracy::Profiler::MemAllocCallstackNamed( ptr, size, depth, false, name );
-#  define TracyFreeNS( ptr, depth, name ) tracy::Profiler::MemFreeCallstackNamed( ptr, depth, false, name );
-#  define TracySecureAllocNS( ptr, size, depth, name ) tracy::Profiler::MemAllocCallstackNamed( ptr, size, depth, true, name );
-#  define TracySecureFreeNS( ptr, depth, name ) tracy::Profiler::MemFreeCallstackNamed( ptr, depth, true, name );
-
-#  define TracyMessageS( txt, size, depth ) tracy::Profiler::Message( txt, size, depth );
-#  define TracyMessageLS( txt, depth ) tracy::Profiler::Message( txt, depth );
-#  define TracyMessageCS( txt, size, color, depth ) tracy::Profiler::MessageColor( txt, size, color, depth );
-#  define TracyMessageLCS( txt, color, depth ) tracy::Profiler::MessageColor( txt, color, 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 ZoneTransientS( varname, depth, active ) ZoneTransient( varname, active )
-#  define ZoneTransientNS( varname, name, depth, active ) ZoneTransientN( varname, name, 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 )
-#  define TracySecureAllocS( ptr, size, depth ) TracySecureAlloc( ptr, size )
-#  define TracySecureFreeS( ptr, depth ) TracySecureFree( ptr )
-
-#  define TracyAllocNS( ptr, size, depth, name ) TracyAlloc( ptr, size, name )
-#  define TracyFreeNS( ptr, depth, name ) TracyFree( ptr, name )
-#  define TracySecureAllocNS( ptr, size, depth, name ) TracySecureAlloc( ptr, size, name )
-#  define TracySecureFreeNS( ptr, depth, name ) TracySecureFree( ptr, name )
-
-#  define TracyMessageS( txt, size, depth ) TracyMessage( txt, size )
-#  define TracyMessageLS( txt, depth ) TracyMessageL( txt )
-#  define TracyMessageCS( txt, size, color, depth ) TracyMessageC( txt, size, color )
-#  define TracyMessageLCS( txt, color, depth ) TracyMessageLC( txt, color )
-#endif
-
-#define TracyParameterRegister( cb ) tracy::Profiler::ParameterRegister( cb );
-#define TracyParameterSetup( idx, name, isBool, val ) tracy::Profiler::ParameterSetup( idx, name, isBool, val );
-#define TracyIsConnected tracy::GetProfiler().IsConnected()
-
-#ifdef TRACY_FIBERS
-#  define TracyFiberEnter( fiber ) tracy::Profiler::EnterFiber( fiber );
-#  define TracyFiberLeave tracy::Profiler::LeaveFiber();
-#endif
-
-#endif
-
-#endif

TracyC.h

@@ -1,320 +0,0 @@
-#ifndef __TRACYC_HPP__
-#define __TRACYC_HPP__
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "client/TracyCallstack.h"
-#include "common/TracyApi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-TRACY_API void ___tracy_set_thread_name( const char* name );
-
-#define TracyCSetThreadName( name ) ___tracy_set_thread_name( name );
-
-
-#ifndef TRACY_ENABLE
-
-typedef const void* TracyCZoneCtx;
-
-#define TracyCZone(c,x)
-#define TracyCZoneN(c,x,y)
-#define TracyCZoneC(c,x,y)
-#define TracyCZoneNC(c,x,y,z)
-#define TracyCZoneEnd(c)
-#define TracyCZoneText(c,x,y)
-#define TracyCZoneName(c,x,y)
-#define TracyCZoneColor(c,x)
-#define TracyCZoneValue(c,x)
-
-#define TracyCAlloc(x,y)
-#define TracyCFree(x)
-#define TracyCSecureAlloc(x,y)
-#define TracyCSecureFree(x)
-
-#define TracyCAllocN(x,y,z)
-#define TracyCFreeN(x,y)
-#define TracyCSecureAllocN(x,y,z)
-#define TracyCSecureFreeN(x,y)
-
-#define TracyCFrameMark
-#define TracyCFrameMarkNamed(x)
-#define TracyCFrameMarkStart(x)
-#define TracyCFrameMarkEnd(x)
-#define TracyCFrameImage(x,y,z,w,a)
-
-#define TracyCPlot(x,y)
-#define TracyCMessage(x,y)
-#define TracyCMessageL(x)
-#define TracyCMessageC(x,y,z)
-#define TracyCMessageLC(x,y)
-#define TracyCAppInfo(x,y)
-
-#define TracyCZoneS(x,y,z)
-#define TracyCZoneNS(x,y,z,w)
-#define TracyCZoneCS(x,y,z,w)
-#define TracyCZoneNCS(x,y,z,w,a)
-
-#define TracyCAllocS(x,y,z)
-#define TracyCFreeS(x,y)
-#define TracyCSecureAllocS(x,y,z)
-#define TracyCSecureFreeS(x,y)
-
-#define TracyCAllocNS(x,y,z,w)
-#define TracyCFreeNS(x,y,z)
-#define TracyCSecureAllocNS(x,y,z,w)
-#define TracyCSecureFreeNS(x,y,z)
-
-#define TracyCMessageS(x,y,z)
-#define TracyCMessageLS(x,y)
-#define TracyCMessageCS(x,y,z,w)
-#define TracyCMessageLCS(x,y,z)
-
-#define TracyCIsConnected 0
-
-#ifdef TRACY_FIBERS
-#  define TracyCFiberEnter(fiber)
-#  define TracyCFiberLeave
-#endif
-
-#else
-
-#ifndef TracyConcat
-#  define TracyConcat(x,y) TracyConcatIndirect(x,y)
-#endif
-#ifndef TracyConcatIndirect
-#  define TracyConcatIndirect(x,y) x##y
-#endif
-
-struct ___tracy_source_location_data
-{
-    const char* name;
-    const char* function;
-    const char* file;
-    uint32_t line;
-    uint32_t color;
-};
-
-struct ___tracy_c_zone_context
-{
-    uint32_t id;
-    int active;
-};
-
-struct ___tracy_gpu_time_data
-{
-    int64_t gpuTime;
-    uint16_t queryId;
-    uint8_t context;
-};
-
-struct ___tracy_gpu_zone_begin_data {
-    uint64_t srcloc;
-    uint16_t queryId;
-    uint8_t context;
-};
-
-struct ___tracy_gpu_zone_end_data {
-    uint16_t queryId;
-    uint8_t context;
-};
-
-struct ___tracy_gpu_new_context_data {
-    int64_t gpuTime;
-    float period;
-    uint8_t context;
-    uint8_t flags;
-    uint8_t type;
-};
-
-struct ___tracy_gpu_context_name_data {
-    uint8_t context;
-    const char* name;
-    uint16_t len;
-};
-
-// Some containers don't support storing const types.
-// This struct, as visible to user, is immutable, so treat it as if const was declared here.
-typedef /*const*/ struct ___tracy_c_zone_context TracyCZoneCtx;
-
-
-#ifdef TRACY_MANUAL_LIFETIME
-TRACY_API void ___tracy_startup_profiler(void);
-TRACY_API void ___tracy_shutdown_profiler(void);
-#endif
-
-TRACY_API uint64_t ___tracy_alloc_srcloc( uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz );
-TRACY_API uint64_t ___tracy_alloc_srcloc_name( uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz );
-
-TRACY_API TracyCZoneCtx ___tracy_emit_zone_begin( const struct ___tracy_source_location_data* srcloc, int active );
-TRACY_API TracyCZoneCtx ___tracy_emit_zone_begin_callstack( const struct ___tracy_source_location_data* srcloc, int depth, int active );
-TRACY_API TracyCZoneCtx ___tracy_emit_zone_begin_alloc( uint64_t srcloc, int active );
-TRACY_API TracyCZoneCtx ___tracy_emit_zone_begin_alloc_callstack( uint64_t srcloc, int depth, int active );
-TRACY_API void ___tracy_emit_zone_end( TracyCZoneCtx ctx );
-TRACY_API void ___tracy_emit_zone_text( TracyCZoneCtx ctx, const char* txt, size_t size );
-TRACY_API void ___tracy_emit_zone_name( TracyCZoneCtx ctx, const char* txt, size_t size );
-TRACY_API void ___tracy_emit_zone_color( TracyCZoneCtx ctx, uint32_t color );
-TRACY_API void ___tracy_emit_zone_value( TracyCZoneCtx ctx, uint64_t value );
-
-TRACY_API void ___tracy_emit_gpu_zone_begin_alloc( const struct ___tracy_gpu_zone_begin_data );
-TRACY_API void ___tracy_emit_gpu_zone_end( const struct ___tracy_gpu_zone_end_data data );
-TRACY_API void ___tracy_emit_gpu_time( const struct ___tracy_gpu_time_data );
-TRACY_API void ___tracy_emit_gpu_new_context( const struct ___tracy_gpu_new_context_data );
-TRACY_API void ___tracy_emit_gpu_context_name( const struct ___tracy_gpu_context_name_data );
-
-TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_serial( const struct ___tracy_gpu_zone_begin_data );
-TRACY_API void ___tracy_emit_gpu_zone_end_serial( const struct ___tracy_gpu_zone_end_data data );
-TRACY_API void ___tracy_emit_gpu_time_serial( const struct ___tracy_gpu_time_data );
-TRACY_API void ___tracy_emit_gpu_new_context_serial( const struct ___tracy_gpu_new_context_data );
-TRACY_API void ___tracy_emit_gpu_context_name_serial( const struct ___tracy_gpu_context_name_data );
-
-TRACY_API int ___tracy_connected(void);
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyCZone( ctx, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define TracyCZoneN( ctx, name, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define TracyCZoneC( ctx, color, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define TracyCZoneNC( ctx, name, color, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), TRACY_CALLSTACK, active );
-#else
-#  define TracyCZone( ctx, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin( &TracyConcat(__tracy_source_location,__LINE__), active );
-#  define TracyCZoneN( ctx, name, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin( &TracyConcat(__tracy_source_location,__LINE__), active );
-#  define TracyCZoneC( ctx, color, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin( &TracyConcat(__tracy_source_location,__LINE__), active );
-#  define TracyCZoneNC( ctx, name, color, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin( &TracyConcat(__tracy_source_location,__LINE__), active );
-#endif
-
-#define TracyCZoneEnd( ctx ) ___tracy_emit_zone_end( ctx );
-
-#define TracyCZoneText( ctx, txt, size ) ___tracy_emit_zone_text( ctx, txt, size );
-#define TracyCZoneName( ctx, txt, size ) ___tracy_emit_zone_name( ctx, txt, size );
-#define TracyCZoneColor( ctx, color ) ___tracy_emit_zone_color( ctx, color );
-#define TracyCZoneValue( ctx, value ) ___tracy_emit_zone_value( ctx, value );
-
-
-TRACY_API void ___tracy_emit_memory_alloc( const void* ptr, size_t size, int secure );
-TRACY_API void ___tracy_emit_memory_alloc_callstack( const void* ptr, size_t size, int depth, int secure );
-TRACY_API void ___tracy_emit_memory_free( const void* ptr, int secure );
-TRACY_API void ___tracy_emit_memory_free_callstack( const void* ptr, int depth, int secure );
-TRACY_API void ___tracy_emit_memory_alloc_named( const void* ptr, size_t size, int secure, const char* name );
-TRACY_API void ___tracy_emit_memory_alloc_callstack_named( const void* ptr, size_t size, int depth, int secure, const char* name );
-TRACY_API void ___tracy_emit_memory_free_named( const void* ptr, int secure, const char* name );
-TRACY_API void ___tracy_emit_memory_free_callstack_named( const void* ptr, int depth, int secure, const char* name );
-
-TRACY_API void ___tracy_emit_message( const char* txt, size_t size, int callstack );
-TRACY_API void ___tracy_emit_messageL( const char* txt, int callstack );
-TRACY_API void ___tracy_emit_messageC( const char* txt, size_t size, uint32_t color, int callstack );
-TRACY_API void ___tracy_emit_messageLC( const char* txt, uint32_t color, int callstack );
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyCAlloc( ptr, size ) ___tracy_emit_memory_alloc_callstack( ptr, size, TRACY_CALLSTACK, 0 )
-#  define TracyCFree( ptr ) ___tracy_emit_memory_free_callstack( ptr, TRACY_CALLSTACK, 0 )
-#  define TracyCSecureAlloc( ptr, size ) ___tracy_emit_memory_alloc_callstack( ptr, size, TRACY_CALLSTACK, 1 )
-#  define TracyCSecureFree( ptr ) ___tracy_emit_memory_free_callstack( ptr, TRACY_CALLSTACK, 1 )
-
-#  define TracyCAllocN( ptr, size, name ) ___tracy_emit_memory_alloc_callstack_named( ptr, size, TRACY_CALLSTACK, 0, name )
-#  define TracyCFreeN( ptr, name ) ___tracy_emit_memory_free_callstack_named( ptr, TRACY_CALLSTACK, 0, name )
-#  define TracyCSecureAllocN( ptr, size, name ) ___tracy_emit_memory_alloc_callstack_named( ptr, size, TRACY_CALLSTACK, 1, name )
-#  define TracyCSecureFreeN( ptr, name ) ___tracy_emit_memory_free_callstack_named( ptr, TRACY_CALLSTACK, 1, name )
-
-#  define TracyCMessage( txt, size ) ___tracy_emit_message( txt, size, TRACY_CALLSTACK );
-#  define TracyCMessageL( txt ) ___tracy_emit_messageL( txt, TRACY_CALLSTACK );
-#  define TracyCMessageC( txt, size, color ) ___tracy_emit_messageC( txt, size, color, TRACY_CALLSTACK );
-#  define TracyCMessageLC( txt, color ) ___tracy_emit_messageLC( txt, color, TRACY_CALLSTACK );
-#else
-#  define TracyCAlloc( ptr, size ) ___tracy_emit_memory_alloc( ptr, size, 0 );
-#  define TracyCFree( ptr ) ___tracy_emit_memory_free( ptr, 0 );
-#  define TracyCSecureAlloc( ptr, size ) ___tracy_emit_memory_alloc( ptr, size, 1 );
-#  define TracyCSecureFree( ptr ) ___tracy_emit_memory_free( ptr, 1 );
-
-#  define TracyCAllocN( ptr, size, name ) ___tracy_emit_memory_alloc_named( ptr, size, 0, name );
-#  define TracyCFreeN( ptr, name ) ___tracy_emit_memory_free_named( ptr, 0, name );
-#  define TracyCSecureAllocN( ptr, size, name ) ___tracy_emit_memory_alloc_named( ptr, size, 1, name );
-#  define TracyCSecureFreeN( ptr, name ) ___tracy_emit_memory_free_named( ptr, 1, name );
-
-#  define TracyCMessage( txt, size ) ___tracy_emit_message( txt, size, 0 );
-#  define TracyCMessageL( txt ) ___tracy_emit_messageL( txt, 0 );
-#  define TracyCMessageC( txt, size, color ) ___tracy_emit_messageC( txt, size, color, 0 );
-#  define TracyCMessageLC( txt, color ) ___tracy_emit_messageLC( txt, color, 0 );
-#endif
-
-
-TRACY_API void ___tracy_emit_frame_mark( const char* name );
-TRACY_API void ___tracy_emit_frame_mark_start( const char* name );
-TRACY_API void ___tracy_emit_frame_mark_end( const char* name );
-TRACY_API void ___tracy_emit_frame_image( const void* image, uint16_t w, uint16_t h, uint8_t offset, int flip );
-
-#define TracyCFrameMark ___tracy_emit_frame_mark( 0 );
-#define TracyCFrameMarkNamed( name ) ___tracy_emit_frame_mark( name );
-#define TracyCFrameMarkStart( name ) ___tracy_emit_frame_mark_start( name );
-#define TracyCFrameMarkEnd( name ) ___tracy_emit_frame_mark_end( name );
-#define TracyCFrameImage( image, width, height, offset, flip ) ___tracy_emit_frame_image( image, width, height, offset, flip );
-
-
-TRACY_API void ___tracy_emit_plot( const char* name, double val );
-TRACY_API void ___tracy_emit_message_appinfo( const char* txt, size_t size );
-
-#define TracyCPlot( name, val ) ___tracy_emit_plot( name, val );
-#define TracyCAppInfo( txt, size ) ___tracy_emit_message_appinfo( txt, size );
-
-
-#ifdef TRACY_HAS_CALLSTACK
-#  define TracyCZoneS( ctx, depth, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
-#  define TracyCZoneNS( ctx, name, depth, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, 0 }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
-#  define TracyCZoneCS( ctx, color, depth, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { NULL, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
-#  define TracyCZoneNCS( ctx, name, color, depth, active ) static const struct ___tracy_source_location_data TracyConcat(__tracy_source_location,__LINE__) = { name, __func__,  __FILE__, (uint32_t)__LINE__, color }; TracyCZoneCtx ctx = ___tracy_emit_zone_begin_callstack( &TracyConcat(__tracy_source_location,__LINE__), depth, active );
-
-#  define TracyCAllocS( ptr, size, depth ) ___tracy_emit_memory_alloc_callstack( ptr, size, depth, 0 )
-#  define TracyCFreeS( ptr, depth ) ___tracy_emit_memory_free_callstack( ptr, depth, 0 )
-#  define TracyCSecureAllocS( ptr, size, depth ) ___tracy_emit_memory_alloc_callstack( ptr, size, depth, 1 )
-#  define TracyCSecureFreeS( ptr, depth ) ___tracy_emit_memory_free_callstack( ptr, depth, 1 )
-
-#  define TracyCAllocNS( ptr, size, depth, name ) ___tracy_emit_memory_alloc_callstack_named( ptr, size, depth, 0, name )
-#  define TracyCFreeNS( ptr, depth, name ) ___tracy_emit_memory_free_callstack_named( ptr, depth, 0, name )
-#  define TracyCSecureAllocNS( ptr, size, depth, name ) ___tracy_emit_memory_alloc_callstack_named( ptr, size, depth, 1, name )
-#  define TracyCSecureFreeNS( ptr, depth, name ) ___tracy_emit_memory_free_callstack_named( ptr, depth, 1, name )
-
-#  define TracyCMessageS( txt, size, depth ) ___tracy_emit_message( txt, size, depth );
-#  define TracyCMessageLS( txt, depth ) ___tracy_emit_messageL( txt, depth );
-#  define TracyCMessageCS( txt, size, color, depth ) ___tracy_emit_messageC( txt, size, color, depth );
-#  define TracyCMessageLCS( txt, color, depth ) ___tracy_emit_messageLC( txt, color, depth );
-#else
-#  define TracyCZoneS( ctx, depth, active ) TracyCZone( ctx, active )
-#  define TracyCZoneNS( ctx, name, depth, active ) TracyCZoneN( ctx, name, active )
-#  define TracyCZoneCS( ctx, color, depth, active ) TracyCZoneC( ctx, color, active )
-#  define TracyCZoneNCS( ctx, name, color, depth, active ) TracyCZoneNC( ctx, name, color, active )
-
-#  define TracyCAllocS( ptr, size, depth ) TracyCAlloc( ptr, size )
-#  define TracyCFreeS( ptr, depth ) TracyCFree( ptr )
-#  define TracyCSecureAllocS( ptr, size, depth ) TracyCSecureAlloc( ptr, size )
-#  define TracyCSecureFreeS( ptr, depth ) TracyCSecureFree( ptr )
-
-#  define TracyCAllocNS( ptr, size, depth, name ) TracyCAllocN( ptr, size, name )
-#  define TracyCFreeNS( ptr, depth, name ) TracyCFreeN( ptr, name )
-#  define TracyCSecureAllocNS( ptr, size, depth, name ) TracyCSecureAllocN( ptr, size, name )
-#  define TracyCSecureFreeNS( ptr, depth, name ) TracyCSecureFreeN( ptr, name )
-
-#  define TracyCMessageS( txt, size, depth ) TracyCMessage( txt, size )
-#  define TracyCMessageLS( txt, depth ) TracyCMessageL( txt )
-#  define TracyCMessageCS( txt, size, color, depth ) TracyCMessageC( txt, size, color )
-#  define TracyCMessageLCS( txt, color, depth ) TracyCMessageLC( txt, color )
-#endif
-
-#define TracyCIsConnected ___tracy_connected()
-
-TRACY_API void ___tracy_fiber_enter( const char* fiber );
-TRACY_API void ___tracy_fiber_leave( void );
-
-#ifdef TRACY_FIBERS
-#  define TracyCFiberEnter( fiber ) ___tracy_fiber_enter( fiber );
-#  define TracyCFiberLeave ___tracy_fiber_leave();
-#endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

TracyD3D11.hpp

@@ -1,442 +0,0 @@
-#ifndef __TRACYD3D11_HPP__
-#define __TRACYD3D11_HPP__
-
-#ifndef TRACY_ENABLE
-
-#define TracyD3D11Context(device,queue) nullptr
-#define TracyD3D11Destroy(ctx)
-#define TracyD3D11ContextName(ctx, name, size)
-
-#define TracyD3D11NewFrame(ctx)
-
-#define TracyD3D11Zone(ctx, name)
-#define TracyD3D11ZoneC(ctx, name, color)
-#define TracyD3D11NamedZone(ctx, varname, name, active)
-#define TracyD3D11NamedZoneC(ctx, varname, name, color, active)
-#define TracyD3D12ZoneTransient(ctx, varname, name, active)
-
-#define TracyD3D11ZoneS(ctx, name, depth)
-#define TracyD3D11ZoneCS(ctx, name, color, depth)
-#define TracyD3D11NamedZoneS(ctx, varname, name, depth, active)
-#define TracyD3D11NamedZoneCS(ctx, varname, name, color, depth, active)
-#define TracyD3D12ZoneTransientS(ctx, varname, name, depth, active)
-
-#define TracyD3D11Collect(ctx)
-
-namespace tracy
-{
-class D3D11ZoneScope {};
-}
-
-using TracyD3D11Ctx = void*;
-
-#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"
-
-namespace tracy
-{
-
-class D3D11Ctx
-{
-    friend class D3D11ZoneScope;
-
-    enum { QueryCount = 64 * 1024 };
-
-public:
-    D3D11Ctx( ID3D11Device* device, ID3D11DeviceContext* devicectx )
-        : m_device( device )
-        , m_devicectx( devicectx )
-        , m_context( GetGpuCtxCounter().fetch_add( 1, std::memory_order_relaxed ) )
-        , m_head( 0 )
-        , m_tail( 0 )
-    {
-        assert( m_context != 255 );
-
-        for (int i = 0; i < QueryCount; i++)
-        {
-            HRESULT hr = S_OK;
-            D3D11_QUERY_DESC desc;
-            desc.MiscFlags = 0;
-
-            desc.Query = D3D11_QUERY_TIMESTAMP;
-            hr |= device->CreateQuery(&desc, &m_queries[i]);
-
-            desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
-            hr |= device->CreateQuery(&desc, &m_disjoints[i]);
-
-            m_disjointMap[i] = nullptr;
-
-            assert(SUCCEEDED(hr));
-        }
-
-        // Force query the initial GPU timestamp (pipeline stall)
-        D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
-        UINT64 timestamp;
-        for (int attempts = 0; attempts < 50; attempts++)
-        {
-            devicectx->Begin(m_disjoints[0]);
-            devicectx->End(m_queries[0]);
-            devicectx->End(m_disjoints[0]);
-            devicectx->Flush();
-
-            while (devicectx->GetData(m_disjoints[0], &disjoint, sizeof(disjoint), 0) == S_FALSE)
-                /* Nothing */;
-
-            if (disjoint.Disjoint)
-                continue;
-
-            while (devicectx->GetData(m_queries[0], &timestamp, sizeof(timestamp), 0) == S_FALSE)
-                /* Nothing */;
-
-            break;
-        }
-
-        int64_t tgpu = timestamp * (1000000000ull / disjoint.Frequency);
-        int64_t tcpu = Profiler::GetTime();
-
-        uint8_t flags = 0;
-
-        const float period = 1.f;
-        auto* item = Profiler::QueueSerial();
-        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.flags, flags );
-        MemWrite( &item->gpuNewContext.type, GpuContextType::Direct3D11 );
-
-#ifdef TRACY_ON_DEMAND
-        GetProfiler().DeferItem( *item );
-#endif
-
-        Profiler::QueueSerialFinish();
-    }
-
-    ~D3D11Ctx()
-    {
-        for (int i = 0; i < QueryCount; i++)
-        {
-            m_queries[i]->Release();
-            m_disjoints[i]->Release();
-            m_disjointMap[i] = nullptr;
-        }
-    }
-
-    void Name( const char* name, uint16_t len )
-    {
-        auto ptr = (char*)tracy_malloc( len );
-        memcpy( ptr, name, len );
-
-        auto item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuContextName );
-        MemWrite( &item->gpuContextNameFat.context, m_context );
-        MemWrite( &item->gpuContextNameFat.ptr, (uint64_t)ptr );
-        MemWrite( &item->gpuContextNameFat.size, len );
-#ifdef TRACY_ON_DEMAND
-        GetProfiler().DeferItem( *item );
-#endif
-        Profiler::QueueSerialFinish();
-    }
-
-    void Collect()
-    {
-        ZoneScopedC( Color::Red4 );
-
-        if( m_tail == m_head ) return;
-
-#ifdef TRACY_ON_DEMAND
-        if( !GetProfiler().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;
-
-            bool available =
-                m_devicectx->GetData(m_disjointMap[mid % QueryCount], nullptr, 0, D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
-                m_devicectx->GetData(m_queries[mid % QueryCount], nullptr, 0, D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK;
-
-            if (available)
-            {
-                start = mid;
-            }
-            else
-            {
-                end = mid;
-            }
-            cnt = (end - start) % QueryCount;
-        }
-
-        start %= QueryCount;
-
-        while (m_tail != start)
-        {
-            D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
-            UINT64 time;
-
-            m_devicectx->GetData(m_disjointMap[m_tail], &disjoint, sizeof(disjoint), 0);
-            m_devicectx->GetData(m_queries[m_tail], &time, sizeof(time), 0);
-
-            time *= (1000000000ull / disjoint.Frequency);
-
-            auto* item = Profiler::QueueSerial();
-            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);
-            Profiler::QueueSerialFinish();
-
-            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 ID3D11Query* TranslateQueryId( unsigned int id )
-    {
-        return m_queries[id];
-    }
-
-    tracy_force_inline ID3D11Query* MapDisjointQueryId( unsigned int id, unsigned int disjointId )
-    {
-        m_disjointMap[id] = m_disjoints[disjointId];
-        return m_disjoints[disjointId];
-    }
-
-    tracy_force_inline uint8_t GetId() const
-    {
-        return m_context;
-    }
-
-    ID3D11Device* m_device;
-    ID3D11DeviceContext* m_devicectx;
-
-    ID3D11Query* m_queries[QueryCount];
-    ID3D11Query* m_disjoints[QueryCount];
-    ID3D11Query* m_disjointMap[QueryCount]; // Multiple time queries can have one disjoint query
-    uint8_t m_context;
-
-    unsigned int m_head;
-    unsigned int m_tail;
-};
-
-class D3D11ZoneScope
-{
-public:
-    tracy_force_inline D3D11ZoneScope( D3D11Ctx* ctx, const SourceLocationData* srcloc, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        ctx->m_devicectx->Begin(ctx->MapDisjointQueryId(queryId, queryId));
-        ctx->m_devicectx->End(ctx->TranslateQueryId(queryId));
-
-        m_disjointId = queryId;
-
-        auto* item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginSerial );
-        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() );
-
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline D3D11ZoneScope( D3D11Ctx* ctx, const SourceLocationData* srcloc, int depth, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        ctx->m_devicectx->Begin(ctx->MapDisjointQueryId(queryId, queryId));
-        ctx->m_devicectx->End(ctx->TranslateQueryId(queryId));
-
-        m_disjointId = queryId;
-
-        auto* item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstackSerial );
-        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() );
-
-        Profiler::QueueSerialFinish();
-
-        GetProfiler().SendCallstack( depth );
-    }
-
-    tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, bool active)
-#ifdef TRACY_ON_DEMAND
-        : m_active(active&& GetProfiler().IsConnected())
-#else
-        : m_active(active)
-#endif
-    {
-        if( !m_active ) return;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        ctx->m_devicectx->Begin(ctx->MapDisjointQueryId(queryId, queryId));
-        ctx->m_devicectx->End(ctx->TranslateQueryId(queryId));
-
-        m_disjointId = queryId;
-
-        const auto sourceLocation = Profiler::AllocSourceLocation(line, source, sourceSz, function, functionSz, name, nameSz);
-
-        auto* item = Profiler::QueueSerial();
-        MemWrite(&item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocSerial);
-        MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-        MemWrite(&item->gpuZoneBegin.srcloc, sourceLocation);
-        MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-        MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(queryId));
-        MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, int depth, bool active)
-#ifdef TRACY_ON_DEMAND
-        : m_active(active&& GetProfiler().IsConnected())
-#else
-        : m_active(active)
-#endif
-    {
-        if( !m_active ) return;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        ctx->m_devicectx->Begin(ctx->MapDisjointQueryId(queryId, queryId));
-        ctx->m_devicectx->End(ctx->TranslateQueryId(queryId));
-
-        m_disjointId = queryId;
-
-        const auto sourceLocation = Profiler::AllocSourceLocation(line, source, sourceSz, function, functionSz, name, nameSz);
-
-        auto* item = Profiler::QueueSerialCallstack(Callstack(depth));
-        MemWrite(&item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocCallstackSerial);
-        MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-        MemWrite(&item->gpuZoneBegin.srcloc, sourceLocation);
-        MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-        MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(queryId));
-        MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline ~D3D11ZoneScope()
-    {
-        if( !m_active ) return;
-
-        const auto queryId = m_ctx->NextQueryId();
-        m_ctx->m_devicectx->End(m_ctx->TranslateQueryId(queryId));
-        m_ctx->m_devicectx->End(m_ctx->MapDisjointQueryId(queryId, m_disjointId));
-
-        auto* item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneEndSerial );
-        MemWrite( &item->gpuZoneEnd.cpuTime, Profiler::GetTime() );
-        MemWrite( &item->gpuZoneEnd.thread, GetThreadHandle() );
-        MemWrite( &item->gpuZoneEnd.queryId, uint16_t( queryId ) );
-        MemWrite( &item->gpuZoneEnd.context, m_ctx->GetId() );
-
-        Profiler::QueueSerialFinish();
-    }
-
-private:
-    const bool m_active;
-
-    D3D11Ctx* m_ctx;
-    unsigned int m_disjointId;
-};
-
-static inline D3D11Ctx* CreateD3D11Context( ID3D11Device* device, ID3D11DeviceContext* devicectx )
-{
-    auto ctx = (D3D11Ctx*)tracy_malloc( sizeof( D3D11Ctx ) );
-    new(ctx) D3D11Ctx( device, devicectx );
-    return ctx;
-}
-
-static inline void DestroyD3D11Context( D3D11Ctx* ctx )
-{
-    ctx->~D3D11Ctx();
-    tracy_free( ctx );
-}
-}
-
-using TracyD3D11Ctx = tracy::D3D11Ctx*;
-
-#define TracyD3D11Context( device, devicectx ) tracy::CreateD3D11Context( device, devicectx );
-#define TracyD3D11Destroy(ctx) tracy::DestroyD3D11Context(ctx);
-#define TracyD3D11ContextName(ctx, name, size) ctx->Name(name, size);
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyD3D11Zone( ctx, name ) TracyD3D11NamedZoneS( ctx, ___tracy_gpu_zone, name, TRACY_CALLSTACK, true )
-#  define TracyD3D11ZoneC( ctx, name, color ) TracyD3D11NamedZoneCS( ctx, ___tracy_gpu_zone, name, color, TRACY_CALLSTACK, true )
-#  define TracyD3D11NamedZone( ctx, varname, name, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define TracyD3D11NamedZoneC( ctx, varname, name, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), TRACY_CALLSTACK, active );
-#  define TracyD3D11ZoneTransient(ctx, varname, name, active) TracyD3D11ZoneTransientS(ctx, varname, cmdList, name, TRACY_CALLSTACK, active)
-#else
-#  define TracyD3D11Zone( ctx, name ) TracyD3D11NamedZone( ctx, ___tracy_gpu_zone, name, true )
-#  define TracyD3D11ZoneC( ctx, name, color ) TracyD3D11NamedZoneC( ctx, ___tracy_gpu_zone, name, color, true )
-#  define TracyD3D11NamedZone( ctx, varname, name, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), active );
-#  define TracyD3D11NamedZoneC( ctx, varname, name, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), active );
-#  define TracyD3D11ZoneTransient(ctx, varname, name, active) tracy::D3D11ZoneScope varname{ ctx, __LINE__, __FILE__, strlen(__FILE__), __FUNCTION__, strlen(__FUNCTION__), name, strlen(name), active };
-#endif
-
-#ifdef TRACY_HAS_CALLSTACK
-#  define TracyD3D11ZoneS( ctx, name, depth ) TracyD3D11NamedZoneS( ctx, ___tracy_gpu_zone, name, depth, true )
-#  define TracyD3D11ZoneCS( ctx, name, color, depth ) TracyD3D11NamedZoneCS( ctx, ___tracy_gpu_zone, name, color, depth, true )
-#  define TracyD3D11NamedZoneS( ctx, varname, name, depth, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), depth, active );
-#  define TracyD3D11NamedZoneCS( ctx, varname, name, color, depth, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::D3D11ZoneScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), depth, active );
-#  define TracyD3D11ZoneTransientS(ctx, varname, name, depth, active) tracy::D3D11ZoneScope varname{ ctx, __LINE__, __FILE__, strlen(__FILE__), __FUNCTION__, strlen(__FUNCTION__), name, strlen(name), depth, active };
-#else
-#  define TracyD3D11ZoneS( ctx, name, depth, active ) TracyD3D11Zone( ctx, name )
-#  define TracyD3D11ZoneCS( ctx, name, color, depth, active ) TracyD3D11ZoneC( name, color )
-#  define TracyD3D11NamedZoneS( ctx, varname, name, depth, active ) TracyD3D11NamedZone( ctx, varname, name, active )
-#  define TracyD3D11NamedZoneCS( ctx, varname, name, color, depth, active ) TracyD3D11NamedZoneC( ctx, varname, name, color, active )
-#  define TracyD3D11ZoneTransientS(ctx, varname, name, depth, active) TracyD3D12ZoneTransient(ctx, varname, name, active)
-#endif
-
-#define TracyD3D11Collect( ctx ) ctx->Collect();
-
-#endif
-
-#endif

TracyD3D12.hpp

@@ -1,506 +0,0 @@
-#ifndef __TRACYD3D12_HPP__
-#define __TRACYD3D12_HPP__
-
-#ifndef TRACY_ENABLE
-
-#define TracyD3D12Context(device, queue) nullptr
-#define TracyD3D12Destroy(ctx)
-#define TracyD3D12ContextName(ctx, name, size)
-
-#define TracyD3D12NewFrame(ctx)
-
-#define TracyD3D12Zone(ctx, cmdList, name)
-#define TracyD3D12ZoneC(ctx, cmdList, name, color)
-#define TracyD3D12NamedZone(ctx, varname, cmdList, name, active)
-#define TracyD3D12NamedZoneC(ctx, varname, cmdList, name, color, active)
-#define TracyD3D12ZoneTransient(ctx, varname, cmdList, name, active)
-
-#define TracyD3D12ZoneS(ctx, cmdList, name, depth)
-#define TracyD3D12ZoneCS(ctx, cmdList, name, color, depth)
-#define TracyD3D12NamedZoneS(ctx, varname, cmdList, name, depth, active)
-#define TracyD3D12NamedZoneCS(ctx, varname, cmdList, name, color, depth, active)
-#define TracyD3D12ZoneTransientS(ctx, varname, cmdList, name, depth, active)
-
-#define TracyD3D12Collect(ctx)
-
-namespace tracy
-{
-	class D3D12ZoneScope {};
-}
-
-using TracyD3D12Ctx = void*;
-
-#else
-
-#include "Tracy.hpp"
-#include "client/TracyProfiler.hpp"
-#include "client/TracyCallstack.hpp"
-
-#include <cstdlib>
-#include <cassert>
-#include <d3d12.h>
-#include <dxgi.h>
-#include <wrl/client.h>
-#include <queue>
-
-namespace tracy
-{
-
-	struct D3D12QueryPayload
-	{
-		uint32_t m_queryIdStart = 0;
-		uint32_t m_queryCount = 0;
-	};
-
-	// Command queue context.
-	class D3D12QueueCtx
-	{
-		friend class D3D12ZoneScope;
-
-		static constexpr uint32_t MaxQueries = 64 * 1024;  // Queries are begin and end markers, so we can store half as many total time durations. Must be even!
-
-		bool m_initialized = false;
-
-		ID3D12Device* m_device = nullptr;
-		ID3D12CommandQueue* m_queue = nullptr;
-		uint8_t m_context;
-		Microsoft::WRL::ComPtr<ID3D12QueryHeap> m_queryHeap;
-		Microsoft::WRL::ComPtr<ID3D12Resource> m_readbackBuffer;
-
-		// In-progress payload.
-		uint32_t m_queryLimit = MaxQueries;
-		uint32_t m_queryCounter = 0;
-		uint32_t m_previousQueryCounter = 0;
-
-		uint32_t m_activePayload = 0;
-		Microsoft::WRL::ComPtr<ID3D12Fence> m_payloadFence;
-		std::queue<D3D12QueryPayload> m_payloadQueue;
-
-		int64_t m_prevCalibration = 0;
-		int64_t m_qpcToNs = int64_t{ 1000000000 / GetFrequencyQpc() };
-
-	public:
-		D3D12QueueCtx(ID3D12Device* device, ID3D12CommandQueue* queue)
-			: m_device(device)
-			, m_queue(queue)
-			, m_context(GetGpuCtxCounter().fetch_add(1, std::memory_order_relaxed))
-		{
-			// Verify we support timestamp queries on this queue.
-
-			if (queue->GetDesc().Type == D3D12_COMMAND_LIST_TYPE_COPY)
-			{
-				D3D12_FEATURE_DATA_D3D12_OPTIONS3 featureData{};
-
-				bool Success = SUCCEEDED(device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS3, &featureData, sizeof(featureData)));
-				assert(Success && featureData.CopyQueueTimestampQueriesSupported && "Platform does not support profiling of copy queues.");
-			}
-
-			uint64_t timestampFrequency;
-
-			if (FAILED(queue->GetTimestampFrequency(&timestampFrequency)))
-			{
-				assert(false && "Failed to get timestamp frequency.");
-			}
-
-			uint64_t cpuTimestamp;
-			uint64_t gpuTimestamp;
-
-			if (FAILED(queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp)))
-			{
-				assert(false && "Failed to get queue clock calibration.");
-			}
-
-			// Save the device cpu timestamp, not the profiler's timestamp.
-			m_prevCalibration = cpuTimestamp * m_qpcToNs;
-
-			cpuTimestamp = Profiler::GetTime();
-
-			D3D12_QUERY_HEAP_DESC heapDesc{};
-			heapDesc.Type = queue->GetDesc().Type == D3D12_COMMAND_LIST_TYPE_COPY ? D3D12_QUERY_HEAP_TYPE_COPY_QUEUE_TIMESTAMP : D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
-			heapDesc.Count = m_queryLimit;
-			heapDesc.NodeMask = 0;  // #TODO: Support multiple adapters.
-
-			while (FAILED(device->CreateQueryHeap(&heapDesc, IID_PPV_ARGS(&m_queryHeap))))
-			{
-				m_queryLimit /= 2;
-				heapDesc.Count = m_queryLimit;
-			}
-
-			// Create a readback buffer, which will be used as a destination for the query data.
-
-			D3D12_RESOURCE_DESC readbackBufferDesc{};
-			readbackBufferDesc.Alignment = 0;
-			readbackBufferDesc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
-			readbackBufferDesc.Width = m_queryLimit * sizeof(uint64_t);
-			readbackBufferDesc.Height = 1;
-			readbackBufferDesc.DepthOrArraySize = 1;
-			readbackBufferDesc.Format = DXGI_FORMAT_UNKNOWN;
-			readbackBufferDesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;  // Buffers are always row major.
-			readbackBufferDesc.MipLevels = 1;
-			readbackBufferDesc.SampleDesc.Count = 1;
-			readbackBufferDesc.SampleDesc.Quality = 0;
-			readbackBufferDesc.Flags = D3D12_RESOURCE_FLAG_NONE;
-
-			D3D12_HEAP_PROPERTIES readbackHeapProps{};
-			readbackHeapProps.Type = D3D12_HEAP_TYPE_READBACK;
-			readbackHeapProps.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
-			readbackHeapProps.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
-			readbackHeapProps.CreationNodeMask = 0;
-			readbackHeapProps.VisibleNodeMask = 0;  // #TODO: Support multiple adapters.
-
-			if (FAILED(device->CreateCommittedResource(&readbackHeapProps, D3D12_HEAP_FLAG_NONE, &readbackBufferDesc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS(&m_readbackBuffer))))
-			{
-				assert(false && "Failed to create query readback buffer.");
-			}
-
-			if (FAILED(device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&m_payloadFence))))
-			{
-				assert(false && "Failed to create payload fence.");
-			}
-
-			auto* item = Profiler::QueueSerial();
-			MemWrite(&item->hdr.type, QueueType::GpuNewContext);
-			MemWrite(&item->gpuNewContext.cpuTime, cpuTimestamp);
-			MemWrite(&item->gpuNewContext.gpuTime, gpuTimestamp);
-			memset(&item->gpuNewContext.thread, 0, sizeof(item->gpuNewContext.thread));
-			MemWrite(&item->gpuNewContext.period, 1E+09f / static_cast<float>(timestampFrequency));
-			MemWrite(&item->gpuNewContext.context, m_context);
-			MemWrite(&item->gpuNewContext.flags, GpuContextCalibration);
-			MemWrite(&item->gpuNewContext.type, GpuContextType::Direct3D12);
-
-#ifdef TRACY_ON_DEMAND
-			GetProfiler().DeferItem(*item);
-#endif
-
-			Profiler::QueueSerialFinish();
-
-			m_initialized = true;
-		}
-
-		void NewFrame()
-		{
-			m_payloadQueue.emplace(D3D12QueryPayload{ m_previousQueryCounter, m_queryCounter });
-			m_previousQueryCounter += m_queryCounter;
-			m_queryCounter = 0;
-
-			if (m_previousQueryCounter >= m_queryLimit)
-			{
-				m_previousQueryCounter -= m_queryLimit;
-			}
-
-			m_queue->Signal(m_payloadFence.Get(), ++m_activePayload);
-		}
-
-		void Name( const char* name, uint16_t len )
-		{
-			auto ptr = (char*)tracy_malloc( len );
-			memcpy( ptr, name, len );
-
-			auto item = Profiler::QueueSerial();
-			MemWrite( &item->hdr.type, QueueType::GpuContextName );
-			MemWrite( &item->gpuContextNameFat.context, m_context );
-			MemWrite( &item->gpuContextNameFat.ptr, (uint64_t)ptr );
-			MemWrite( &item->gpuContextNameFat.size, len );
-#ifdef TRACY_ON_DEMAND
-			GetProfiler().DeferItem( *item );
-#endif
-			Profiler::QueueSerialFinish();
-		}
-
-		void Collect()
-		{
-			ZoneScopedC(Color::Red4);
-
-#ifdef TRACY_ON_DEMAND
-			if (!GetProfiler().IsConnected())
-			{
-				m_queryCounter = 0;
-
-				return;
-			}
-#endif
-
-			// Find out what payloads are available.
-			const auto newestReadyPayload = m_payloadFence->GetCompletedValue();
-			const auto payloadCount = m_payloadQueue.size() - (m_activePayload - newestReadyPayload);
-
-			if (!payloadCount)
-			{
-				return;  // No payloads are available yet, exit out.
-			}
-
-			D3D12_RANGE mapRange{ 0, m_queryLimit * sizeof(uint64_t) };
-
-			// Map the readback buffer so we can fetch the query data from the GPU.
-			void* readbackBufferMapping = nullptr;
-
-			if (FAILED(m_readbackBuffer->Map(0, &mapRange, &readbackBufferMapping)))
-			{
-				assert(false && "Failed to map readback buffer.");
-			}
-
-			auto* timestampData = static_cast<uint64_t*>(readbackBufferMapping);
-
-			for (uint32_t i = 0; i < payloadCount; ++i)
-			{
-				const auto& payload = m_payloadQueue.front();
-
-				for (uint32_t j = 0; j < payload.m_queryCount; ++j)
-				{
-					const auto counter = (payload.m_queryIdStart + j) % m_queryLimit;
-					const auto timestamp = timestampData[counter];
-					const auto queryId = counter;
-
-					auto* item = Profiler::QueueSerial();
-					MemWrite(&item->hdr.type, QueueType::GpuTime);
-					MemWrite(&item->gpuTime.gpuTime, timestamp);
-					MemWrite(&item->gpuTime.queryId, static_cast<uint16_t>(queryId));
-					MemWrite(&item->gpuTime.context, m_context);
-
-					Profiler::QueueSerialFinish();
-				}
-
-				m_payloadQueue.pop();
-			}
-
-			m_readbackBuffer->Unmap(0, nullptr);
-
-			// Recalibrate to account for drift.
-
-			uint64_t cpuTimestamp;
-			uint64_t gpuTimestamp;
-
-			if (FAILED(m_queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp)))
-			{
-				assert(false && "Failed to get queue clock calibration.");
-			}
-
-			cpuTimestamp *= m_qpcToNs;
-
-			const auto cpuDelta = cpuTimestamp - m_prevCalibration;
-			if (cpuDelta > 0)
-			{
-				m_prevCalibration = cpuTimestamp;
-				cpuTimestamp = Profiler::GetTime();
-
-				auto* item = Profiler::QueueSerial();
-				MemWrite(&item->hdr.type, QueueType::GpuCalibration);
-				MemWrite(&item->gpuCalibration.gpuTime, gpuTimestamp);
-				MemWrite(&item->gpuCalibration.cpuTime, cpuTimestamp);
-				MemWrite(&item->gpuCalibration.cpuDelta, cpuDelta);
-				MemWrite(&item->gpuCalibration.context, m_context);
-
-				Profiler::QueueSerialFinish();
-			}
-		}
-
-	private:
-		tracy_force_inline uint32_t NextQueryId()
-		{
-			assert(m_queryCounter < m_queryLimit && "Submitted too many GPU queries! Consider increasing MaxQueries.");
-
-			const uint32_t id = (m_previousQueryCounter + m_queryCounter) % m_queryLimit;
-			m_queryCounter += 2;  // Allocate space for a begin and end query.
-
-			return id;
-		}
-
-		tracy_force_inline uint8_t GetId() const
-		{
-			return m_context;
-		}
-	};
-
-	class D3D12ZoneScope
-	{
-		const bool m_active;
-		D3D12QueueCtx* m_ctx = nullptr;
-		ID3D12GraphicsCommandList* m_cmdList = nullptr;
-		uint32_t m_queryId = 0;  // Used for tracking in nested zones.
-
-	public:
-		tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, ID3D12GraphicsCommandList* cmdList, const SourceLocationData* srcLocation, bool active)
-#ifdef TRACY_ON_DEMAND
-			: m_active(active && GetProfiler().IsConnected())
-#else
-			: m_active(active)
-#endif
-		{
-			if (!m_active) return;
-
-			m_ctx = ctx;
-			m_cmdList = cmdList;
-
-			m_queryId = ctx->NextQueryId();
-			cmdList->EndQuery(ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, m_queryId);
-
-			auto* item = Profiler::QueueSerial();
-			MemWrite(&item->hdr.type, QueueType::GpuZoneBeginSerial);
-			MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-			MemWrite(&item->gpuZoneBegin.srcloc, reinterpret_cast<uint64_t>(srcLocation));
-			MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-			MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(m_queryId));
-			MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-			Profiler::QueueSerialFinish();
-		}
-
-		tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, ID3D12GraphicsCommandList* cmdList, const SourceLocationData* srcLocation, int depth, bool active)
-#ifdef TRACY_ON_DEMAND
-			: m_active(active&& GetProfiler().IsConnected())
-#else
-			: m_active(active)
-#endif
-		{
-			if (!m_active) return;
-
-			m_ctx = ctx;
-			m_cmdList = cmdList;
-
-			m_queryId = ctx->NextQueryId();
-			cmdList->EndQuery(ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, m_queryId);
-
-			auto* item = Profiler::QueueSerialCallstack(Callstack(depth));
-			MemWrite(&item->hdr.type, QueueType::GpuZoneBeginCallstackSerial);
-			MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-			MemWrite(&item->gpuZoneBegin.srcloc, reinterpret_cast<uint64_t>(srcLocation));
-			MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-			MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(m_queryId));
-			MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-			Profiler::QueueSerialFinish();
-		}
-
-		tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, bool active)
-#ifdef TRACY_ON_DEMAND
-			: m_active(active&& GetProfiler().IsConnected())
-#else
-			: m_active(active)
-#endif
-		{
-			if (!m_active) return;
-
-			m_ctx = ctx;
-			m_cmdList = cmdList;
-
-			m_queryId = ctx->NextQueryId();
-			cmdList->EndQuery(ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, m_queryId);
-
-			const auto sourceLocation = Profiler::AllocSourceLocation(line, source, sourceSz, function, functionSz, name, nameSz);
-
-			auto* item = Profiler::QueueSerial();
-			MemWrite(&item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocSerial);
-			MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-			MemWrite(&item->gpuZoneBegin.srcloc, sourceLocation);
-			MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-			MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(m_queryId));
-			MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-			Profiler::QueueSerialFinish();
-		}
-
-		tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, int depth, bool active)
-#ifdef TRACY_ON_DEMAND
-			: m_active(active&& GetProfiler().IsConnected())
-#else
-			: m_active(active)
-#endif
-		{
-			if (!m_active) return;
-
-			m_ctx = ctx;
-			m_cmdList = cmdList;
-
-			m_queryId = ctx->NextQueryId();
-			cmdList->EndQuery(ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, m_queryId);
-
-			const auto sourceLocation = Profiler::AllocSourceLocation(line, source, sourceSz, function, functionSz, name, nameSz);
-
-			auto* item = Profiler::QueueSerialCallstack(Callstack(depth));
-			MemWrite(&item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocCallstackSerial);
-			MemWrite(&item->gpuZoneBegin.cpuTime, Profiler::GetTime());
-			MemWrite(&item->gpuZoneBegin.srcloc, sourceLocation);
-			MemWrite(&item->gpuZoneBegin.thread, GetThreadHandle());
-			MemWrite(&item->gpuZoneBegin.queryId, static_cast<uint16_t>(m_queryId));
-			MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
-
-			Profiler::QueueSerialFinish();
-		}
-
-		tracy_force_inline ~D3D12ZoneScope()
-		{
-			if (!m_active) return;
-
-			const auto queryId = m_queryId + 1;  // Our end query slot is immediately after the begin slot.
-			m_cmdList->EndQuery(m_ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, queryId);
-
-			auto* item = Profiler::QueueSerial();
-			MemWrite(&item->hdr.type, QueueType::GpuZoneEndSerial);
-			MemWrite(&item->gpuZoneEnd.cpuTime, Profiler::GetTime());
-			MemWrite(&item->gpuZoneEnd.thread, GetThreadHandle());
-			MemWrite(&item->gpuZoneEnd.queryId, static_cast<uint16_t>(queryId));
-			MemWrite(&item->gpuZoneEnd.context, m_ctx->GetId());
-
-			Profiler::QueueSerialFinish();
-
-			m_cmdList->ResolveQueryData(m_ctx->m_queryHeap.Get(), D3D12_QUERY_TYPE_TIMESTAMP, m_queryId, 2, m_ctx->m_readbackBuffer.Get(), m_queryId * sizeof(uint64_t));
-		}
-	};
-
-	static inline D3D12QueueCtx* CreateD3D12Context(ID3D12Device* device, ID3D12CommandQueue* queue)
-	{
-		auto* ctx = static_cast<D3D12QueueCtx*>(tracy_malloc(sizeof(D3D12QueueCtx)));
-		new (ctx) D3D12QueueCtx{ device, queue };
-
-		return ctx;
-	}
-
-	static inline void DestroyD3D12Context(D3D12QueueCtx* ctx)
-	{
-		ctx->~D3D12QueueCtx();
-		tracy_free(ctx);
-	}
-
-}
-
-using TracyD3D12Ctx = tracy::D3D12QueueCtx*;
-
-#define TracyD3D12Context(device, queue) tracy::CreateD3D12Context(device, queue);
-#define TracyD3D12Destroy(ctx) tracy::DestroyD3D12Context(ctx);
-#define TracyD3D12ContextName(ctx, name, size) ctx->Name(name, size);
-
-#define TracyD3D12NewFrame(ctx) ctx->NewFrame();
-
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyD3D12Zone(ctx, cmdList, name) TracyD3D12NamedZoneS(ctx, ___tracy_gpu_zone, cmdList, name, TRACY_CALLSTACK, true)
-#  define TracyD3D12ZoneC(ctx, cmdList, name, color) TracyD3D12NamedZoneCS(ctx, ___tracy_gpu_zone, cmdList, name, color, TRACY_CALLSTACK, true)
-#  define TracyD3D12NamedZone(ctx, varname, cmdList, name, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), TRACY_CALLSTACK, active };
-#  define TracyD3D12NamedZoneC(ctx, varname, cmdList, name, color, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, color }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), TRACY_CALLSTACK, active };
-#  define TracyD3D12ZoneTransient(ctx, varname, cmdList, name, active) TracyD3D12ZoneTransientS(ctx, varname, cmdList, name, TRACY_CALLSTACK, active)
-#else
-#  define TracyD3D12Zone(ctx, cmdList, name) TracyD3D12NamedZone(ctx, ___tracy_gpu_zone, cmdList, name, true)
-#  define TracyD3D12ZoneC(ctx, cmdList, name, color) TracyD3D12NamedZoneC(ctx, ___tracy_gpu_zone, cmdList, name, color, true)
-#  define TracyD3D12NamedZone(ctx, varname, cmdList, name, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), active };
-#  define TracyD3D12NamedZoneC(ctx, varname, cmdList, name, color, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, color }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), active };
-#  define TracyD3D12ZoneTransient(ctx, varname, cmdList, name, active) tracy::D3D12ZoneScope varname{ ctx, __LINE__, __FILE__, strlen(__FILE__), __FUNCTION__, strlen(__FUNCTION__), name, strlen(name), cmdList, active };
-#endif
-
-#ifdef TRACY_HAS_CALLSTACK
-#  define TracyD3D12ZoneS(ctx, cmdList, name, depth) TracyD3D12NamedZoneS(ctx, ___tracy_gpu_zone, cmdList, name, depth, true)
-#  define TracyD3D12ZoneCS(ctx, cmdList, name, color, depth) TracyD3D12NamedZoneCS(ctx, ___tracy_gpu_zone, cmdList, name, color, depth, true)
-#  define TracyD3D12NamedZoneS(ctx, varname, cmdList, name, depth, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), depth, active };
-#  define TracyD3D12NamedZoneCS(ctx, varname, cmdList, name, color, depth, active) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location, __LINE__) { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, color }; tracy::D3D12ZoneScope varname{ ctx, cmdList, &TracyConcat(__tracy_gpu_source_location, __LINE__), depth, active };
-#  define TracyD3D12ZoneTransientS(ctx, varname, cmdList, name, depth, active) tracy::D3D12ZoneScope varname{ ctx, __LINE__, __FILE__, strlen(__FILE__), __FUNCTION__, strlen(__FUNCTION__), name, strlen(name), cmdList, depth, active };
-#else
-#  define TracyD3D12ZoneS(ctx, cmdList, name, depth) TracyD3D12Zone(ctx, cmdList, name)
-#  define TracyD3D12ZoneCS(ctx, cmdList, name, color, depth) TracyD3D12Zone(ctx, cmdList, name, color)
-#  define TracyD3D12NamedZoneS(ctx, varname, cmdList, name, depth, active) TracyD3D12NamedZone(ctx, varname, cmdList, name, active)
-#  define TracyD3D12NamedZoneCS(ctx, varname, cmdList, name, color, depth, active) TracyD3D12NamedZoneC(ctx, varname, cmdList, name, color, active)
-#  define TracyD3D12ZoneTransientS(ctx, varname, cmdList, name, depth, active) TracyD3D12ZoneTransient(ctx, varname, cmdList, name, active)
-#endif
-
-#define TracyD3D12Collect(ctx) ctx->Collect();
-
-#endif
-
-#endif

TracyVulkan.hpp

@@ -1,512 +0,0 @@
-#ifndef __TRACYVULKAN_HPP__
-#define __TRACYVULKAN_HPP__
-
-#if !defined TRACY_ENABLE
-
-#define TracyVkContext(x,y,z,w) nullptr
-#define TracyVkContextCalibrated(x,y,z,w,a,b) nullptr
-#define TracyVkDestroy(x)
-#define TracyVkContextName(c,x,y)
-#define TracyVkNamedZone(c,x,y,z,w)
-#define TracyVkNamedZoneC(c,x,y,z,w,a)
-#define TracyVkZone(c,x,y)
-#define TracyVkZoneC(c,x,y,z)
-#define TracyVkZoneTransient(c,x,y,z,w)
-#define TracyVkCollect(c,x)
-
-#define TracyVkNamedZoneS(c,x,y,z,w,a)
-#define TracyVkNamedZoneCS(c,x,y,z,w,v,a)
-#define TracyVkZoneS(c,x,y,z)
-#define TracyVkZoneCS(c,x,y,z,w)
-#define TracyVkZoneTransientS(c,x,y,z,w,a)
-
-namespace tracy
-{
-class VkCtxScope {};
-}
-
-using TracyVkCtx = void*;
-
-#else
-
-#if !defined VK_NULL_HANDLE
-#  error "You must include Vulkan headers before including TracyVulkan.hpp"
-#endif
-
-#include <assert.h>
-#include <stdlib.h>
-#include "Tracy.hpp"
-#include "client/TracyProfiler.hpp"
-#include "client/TracyCallstack.hpp"
-
-namespace tracy
-{
-
-class VkCtx
-{
-    friend class VkCtxScope;
-
-    enum { QueryCount = 64 * 1024 };
-
-public:
-    VkCtx( VkPhysicalDevice physdev, VkDevice device, VkQueue queue, VkCommandBuffer cmdbuf, PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT _vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, PFN_vkGetCalibratedTimestampsEXT _vkGetCalibratedTimestampsEXT )
-        : m_device( device )
-        , m_timeDomain( VK_TIME_DOMAIN_DEVICE_EXT )
-        , m_context( GetGpuCtxCounter().fetch_add( 1, std::memory_order_relaxed ) )
-        , m_head( 0 )
-        , m_tail( 0 )
-        , m_oldCnt( 0 )
-        , m_queryCount( QueryCount )
-        , m_vkGetCalibratedTimestampsEXT( _vkGetCalibratedTimestampsEXT )
-    {
-        assert( m_context != 255 );
-
-        if( _vkGetPhysicalDeviceCalibrateableTimeDomainsEXT && _vkGetCalibratedTimestampsEXT )
-        {
-            uint32_t num;
-            _vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( physdev, &num, nullptr );
-            if( num > 4 ) num = 4;
-            VkTimeDomainEXT data[4];
-            _vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( physdev, &num, data );
-            VkTimeDomainEXT supportedDomain = (VkTimeDomainEXT)-1;
-#if defined _WIN32
-            supportedDomain = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT;
-#elif defined __linux__ && defined CLOCK_MONOTONIC_RAW
-            supportedDomain = VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT;
-#endif
-            for( uint32_t i=0; i<num; i++ )
-            {
-                if( data[i] == supportedDomain )
-                {
-                    m_timeDomain = data[i];
-                    break;
-                }
-            }
-        }
-
-        VkPhysicalDeviceProperties prop;
-        vkGetPhysicalDeviceProperties( physdev, &prop );
-        const float period = prop.limits.timestampPeriod;
-
-        VkQueryPoolCreateInfo poolInfo = {};
-        poolInfo.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
-        poolInfo.queryCount = m_queryCount;
-        poolInfo.queryType = VK_QUERY_TYPE_TIMESTAMP;
-        while( vkCreateQueryPool( device, &poolInfo, nullptr, &m_query ) != VK_SUCCESS )
-        {
-            m_queryCount /= 2;
-            poolInfo.queryCount = m_queryCount;
-        }
-
-        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, m_queryCount );
-        vkEndCommandBuffer( cmdbuf );
-        vkQueueSubmit( queue, 1, &submitInfo, VK_NULL_HANDLE );
-        vkQueueWaitIdle( queue );
-
-        int64_t tcpu, tgpu;
-        if( m_timeDomain == VK_TIME_DOMAIN_DEVICE_EXT )
-        {
-            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 );
-
-            tcpu = Profiler::GetTime();
-            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 );
-        }
-        else
-        {
-            enum { NumProbes = 32 };
-
-            VkCalibratedTimestampInfoEXT spec[2] = {
-                { VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT, nullptr, VK_TIME_DOMAIN_DEVICE_EXT },
-                { VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT, nullptr, m_timeDomain },
-            };
-            uint64_t ts[2];
-            uint64_t deviation[NumProbes];
-            for( int i=0; i<NumProbes; i++ )
-            {
-                _vkGetCalibratedTimestampsEXT( device, 2, spec, ts, deviation+i );
-            }
-            uint64_t minDeviation = deviation[0];
-            for( int i=1; i<NumProbes; i++ )
-            {
-                if( minDeviation > deviation[i] )
-                {
-                    minDeviation = deviation[i];
-                }
-            }
-            m_deviation = minDeviation * 3 / 2;
-
-#if defined _WIN32
-            m_qpcToNs = int64_t( 1000000000. / GetFrequencyQpc() );
-#endif
-
-            Calibrate( device, m_prevCalibration, tgpu );
-            tcpu = Profiler::GetTime();
-        }
-
-        uint8_t flags = 0;
-        if( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT ) flags |= GpuContextCalibration;
-
-        auto item = Profiler::QueueSerial();
-        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.flags, flags );
-        MemWrite( &item->gpuNewContext.type, GpuContextType::Vulkan );
-
-#ifdef TRACY_ON_DEMAND
-        GetProfiler().DeferItem( *item );
-#endif
-        Profiler::QueueSerialFinish();
-
-        m_res = (int64_t*)tracy_malloc( sizeof( int64_t ) * m_queryCount );
-    }
-
-    ~VkCtx()
-    {
-        tracy_free( m_res );
-        vkDestroyQueryPool( m_device, m_query, nullptr );
-    }
-
-    void Name( const char* name, uint16_t len )
-    {
-        auto ptr = (char*)tracy_malloc( len );
-        memcpy( ptr, name, len );
-
-        auto item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuContextName );
-        MemWrite( &item->gpuContextNameFat.context, m_context );
-        MemWrite( &item->gpuContextNameFat.ptr, (uint64_t)ptr );
-        MemWrite( &item->gpuContextNameFat.size, len );
-#ifdef TRACY_ON_DEMAND
-        GetProfiler().DeferItem( *item );
-#endif
-        Profiler::QueueSerialFinish();
-    }
-
-    void Collect( VkCommandBuffer cmdbuf )
-    {
-        ZoneScopedC( Color::Red4 );
-
-        if( m_tail == m_head ) return;
-
-#ifdef TRACY_ON_DEMAND
-        if( !GetProfiler().IsConnected() )
-        {
-            vkCmdResetQueryPool( cmdbuf, m_query, 0, m_queryCount );
-            m_head = m_tail = m_oldCnt = 0;
-            int64_t tgpu;
-            if( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT ) Calibrate( m_device, m_prevCalibration, tgpu );
-            return;
-        }
-#endif
-
-        unsigned int cnt;
-        if( m_oldCnt != 0 )
-        {
-            cnt = m_oldCnt;
-            m_oldCnt = 0;
-        }
-        else
-        {
-            cnt = m_head < m_tail ? m_queryCount - m_tail : m_head - m_tail;
-        }
-
-        if( vkGetQueryPoolResults( m_device, m_query, m_tail, cnt, sizeof( int64_t ) * m_queryCount, m_res, sizeof( int64_t ), VK_QUERY_RESULT_64_BIT ) == VK_NOT_READY )
-        {
-            m_oldCnt = cnt;
-            return;
-        }
-
-        for( unsigned int idx=0; idx<cnt; idx++ )
-        {
-            auto item = Profiler::QueueSerial();
-            MemWrite( &item->hdr.type, QueueType::GpuTime );
-            MemWrite( &item->gpuTime.gpuTime, m_res[idx] );
-            MemWrite( &item->gpuTime.queryId, uint16_t( m_tail + idx ) );
-            MemWrite( &item->gpuTime.context, m_context );
-            Profiler::QueueSerialFinish();
-        }
-
-        if( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT )
-        {
-            int64_t tgpu, tcpu;
-            Calibrate( m_device, tcpu, tgpu );
-            const auto refCpu = Profiler::GetTime();
-            const auto delta = tcpu - m_prevCalibration;
-            if( delta > 0 )
-            {
-                m_prevCalibration = tcpu;
-                auto item = Profiler::QueueSerial();
-                MemWrite( &item->hdr.type, QueueType::GpuCalibration );
-                MemWrite( &item->gpuCalibration.gpuTime, tgpu );
-                MemWrite( &item->gpuCalibration.cpuTime, refCpu );
-                MemWrite( &item->gpuCalibration.cpuDelta, delta );
-                MemWrite( &item->gpuCalibration.context, m_context );
-                Profiler::QueueSerialFinish();
-            }
-        }
-
-        vkCmdResetQueryPool( cmdbuf, m_query, m_tail, cnt );
-
-        m_tail += cnt;
-        if( m_tail == m_queryCount ) m_tail = 0;
-    }
-
-private:
-    tracy_force_inline unsigned int NextQueryId()
-    {
-        const auto id = m_head;
-        m_head = ( m_head + 1 ) % m_queryCount;
-        assert( m_head != m_tail );
-        return id;
-    }
-
-    tracy_force_inline uint8_t GetId() const
-    {
-        return m_context;
-    }
-
-    tracy_force_inline void Calibrate( VkDevice device, int64_t& tCpu, int64_t& tGpu )
-    {
-        assert( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT );
-        VkCalibratedTimestampInfoEXT spec[2] = {
-            { VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT, nullptr, VK_TIME_DOMAIN_DEVICE_EXT },
-            { VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT, nullptr, m_timeDomain },
-        };
-        uint64_t ts[2];
-        uint64_t deviation;
-        do
-        {
-            m_vkGetCalibratedTimestampsEXT( device, 2, spec, ts, &deviation );
-        }
-        while( deviation > m_deviation );
-
-#if defined _WIN32
-        tGpu = ts[0];
-        tCpu = ts[1] * m_qpcToNs;
-#elif defined __linux__ && defined CLOCK_MONOTONIC_RAW
-        tGpu = ts[0];
-        tCpu = ts[1];
-#else
-        assert( false );
-#endif
-    }
-
-    VkDevice m_device;
-    VkQueryPool m_query;
-    VkTimeDomainEXT m_timeDomain;
-    uint64_t m_deviation;
-    int64_t m_qpcToNs;
-    int64_t m_prevCalibration;
-    uint8_t m_context;
-
-    unsigned int m_head;
-    unsigned int m_tail;
-    unsigned int m_oldCnt;
-    unsigned int m_queryCount;
-
-    int64_t* m_res;
-
-    PFN_vkGetCalibratedTimestampsEXT m_vkGetCalibratedTimestampsEXT;
-};
-
-class VkCtxScope
-{
-public:
-    tracy_force_inline VkCtxScope( VkCtx* ctx, const SourceLocationData* srcloc, VkCommandBuffer cmdbuf, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_cmdbuf = cmdbuf;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, ctx->m_query, queryId );
-
-        auto item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginSerial );
-        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() );
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline VkCtxScope( VkCtx* ctx, const SourceLocationData* srcloc, VkCommandBuffer cmdbuf, int depth, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_cmdbuf = cmdbuf;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, ctx->m_query, queryId );
-
-        auto item = Profiler::QueueSerialCallstack( Callstack( depth ) );
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstackSerial );
-        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() );
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_cmdbuf = cmdbuf;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, ctx->m_query, queryId );
-
-        const auto srcloc = Profiler::AllocSourceLocation( line, source, sourceSz, function, functionSz, name, nameSz );
-        auto item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocSerial );
-        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
-        MemWrite( &item->gpuZoneBegin.srcloc, srcloc );
-        MemWrite( &item->gpuZoneBegin.thread, GetThreadHandle() );
-        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
-        MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, int depth, bool is_active )
-#ifdef TRACY_ON_DEMAND
-        : m_active( is_active && GetProfiler().IsConnected() )
-#else
-        : m_active( is_active )
-#endif
-    {
-        if( !m_active ) return;
-        m_cmdbuf = cmdbuf;
-        m_ctx = ctx;
-
-        const auto queryId = ctx->NextQueryId();
-        vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, ctx->m_query, queryId );
-
-        const auto srcloc = Profiler::AllocSourceLocation( line, source, sourceSz, function, functionSz, name, nameSz );
-        auto item = Profiler::QueueSerialCallstack( Callstack( depth ) );
-        MemWrite( &item->hdr.type, QueueType::GpuZoneBeginAllocSrcLocCallstackSerial );
-        MemWrite( &item->gpuZoneBegin.cpuTime, Profiler::GetTime() );
-        MemWrite( &item->gpuZoneBegin.srcloc, srcloc );
-        MemWrite( &item->gpuZoneBegin.thread, GetThreadHandle() );
-        MemWrite( &item->gpuZoneBegin.queryId, uint16_t( queryId ) );
-        MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
-        Profiler::QueueSerialFinish();
-    }
-
-    tracy_force_inline ~VkCtxScope()
-    {
-        if( !m_active ) return;
-
-        const auto queryId = m_ctx->NextQueryId();
-        vkCmdWriteTimestamp( m_cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, m_ctx->m_query, queryId );
-
-        auto item = Profiler::QueueSerial();
-        MemWrite( &item->hdr.type, QueueType::GpuZoneEndSerial );
-        MemWrite( &item->gpuZoneEnd.cpuTime, Profiler::GetTime() );
-        MemWrite( &item->gpuZoneEnd.thread, GetThreadHandle() );
-        MemWrite( &item->gpuZoneEnd.queryId, uint16_t( queryId ) );
-        MemWrite( &item->gpuZoneEnd.context, m_ctx->GetId() );
-        Profiler::QueueSerialFinish();
-    }
-
-private:
-    const bool m_active;
-
-    VkCommandBuffer m_cmdbuf;
-    VkCtx* m_ctx;
-};
-
-static inline VkCtx* CreateVkContext( VkPhysicalDevice physdev, VkDevice device, VkQueue queue, VkCommandBuffer cmdbuf, PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT gpdctd, PFN_vkGetCalibratedTimestampsEXT gct )
-{
-    auto ctx = (VkCtx*)tracy_malloc( sizeof( VkCtx ) );
-    new(ctx) VkCtx( physdev, device, queue, cmdbuf, gpdctd, gct );
-    return ctx;
-}
-
-static inline void DestroyVkContext( VkCtx* ctx )
-{
-    ctx->~VkCtx();
-    tracy_free( ctx );
-}
-
-}
-
-using TracyVkCtx = tracy::VkCtx*;
-
-#define TracyVkContext( physdev, device, queue, cmdbuf ) tracy::CreateVkContext( physdev, device, queue, cmdbuf, nullptr, nullptr );
-#define TracyVkContextCalibrated( physdev, device, queue, cmdbuf, gpdctd, gct ) tracy::CreateVkContext( physdev, device, queue, cmdbuf, gpdctd, gct );
-#define TracyVkDestroy( ctx ) tracy::DestroyVkContext( ctx );
-#define TracyVkContextName( ctx, name, size ) ctx->Name( name, size );
-#if defined TRACY_HAS_CALLSTACK && defined TRACY_CALLSTACK
-#  define TracyVkNamedZone( ctx, varname, cmdbuf, name, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, TRACY_CALLSTACK, active );
-#  define TracyVkNamedZoneC( ctx, varname, cmdbuf, name, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, TRACY_CALLSTACK, active );
-#  define TracyVkZone( ctx, cmdbuf, name ) TracyVkNamedZoneS( ctx, ___tracy_gpu_zone, cmdbuf, name, TRACY_CALLSTACK, true )
-#  define TracyVkZoneC( ctx, cmdbuf, name, color ) TracyVkNamedZoneCS( ctx, ___tracy_gpu_zone, cmdbuf, name, color, TRACY_CALLSTACK, true )
-#  define TracyVkZoneTransient( ctx, varname, cmdbuf, name, active ) TracyVkZoneTransientS( ctx, varname, cmdbuf, name, TRACY_CALLSTACK, active )
-#else
-#  define TracyVkNamedZone( ctx, varname, cmdbuf, name, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, active );
-#  define TracyVkNamedZoneC( ctx, varname, cmdbuf, name, color, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, active );
-#  define TracyVkZone( ctx, cmdbuf, name ) TracyVkNamedZone( ctx, ___tracy_gpu_zone, cmdbuf, name, true )
-#  define TracyVkZoneC( ctx, cmdbuf, name, color ) TracyVkNamedZoneC( ctx, ___tracy_gpu_zone, cmdbuf, name, color, true )
-#  define TracyVkZoneTransient( ctx, varname, cmdbuf, name, active ) tracy::VkCtxScope varname( ctx, __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), name, strlen( name ), cmdbuf, active );
-#endif
-#define TracyVkCollect( ctx, cmdbuf ) ctx->Collect( cmdbuf );
-
-#ifdef TRACY_HAS_CALLSTACK
-#  define TracyVkNamedZoneS( ctx, varname, cmdbuf, name, depth, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, 0 }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, depth, active );
-#  define TracyVkNamedZoneCS( ctx, varname, cmdbuf, name, color, depth, active ) static constexpr tracy::SourceLocationData TracyConcat(__tracy_gpu_source_location,__LINE__) { name, __FUNCTION__,  __FILE__, (uint32_t)__LINE__, color }; tracy::VkCtxScope varname( ctx, &TracyConcat(__tracy_gpu_source_location,__LINE__), cmdbuf, depth, active );
-#  define TracyVkZoneS( ctx, cmdbuf, name, depth ) TracyVkNamedZoneS( ctx, ___tracy_gpu_zone, cmdbuf, name, depth, true )
-#  define TracyVkZoneCS( ctx, cmdbuf, name, color, depth ) TracyVkNamedZoneCS( ctx, ___tracy_gpu_zone, cmdbuf, name, color, depth, true )
-#  define TracyVkZoneTransientS( ctx, varname, cmdbuf, name, depth, active ) tracy::VkCtxScope varname( ctx, __LINE__, __FILE__, strlen( __FILE__ ), __FUNCTION__, strlen( __FUNCTION__ ), name, strlen( name ), cmdbuf, depth, active );
-#else
-#  define TracyVkNamedZoneS( ctx, varname, cmdbuf, name, depth, active ) TracyVkNamedZone( ctx, varname, cmdbuf, name, active )
-#  define TracyVkNamedZoneCS( ctx, varname, cmdbuf, name, color, depth, active ) TracyVkNamedZoneC( ctx, varname, cmdbuf, name, color, active )
-#  define TracyVkZoneS( ctx, cmdbuf, name, depth ) TracyVkZone( ctx, cmdbuf, name )
-#  define TracyVkZoneCS( ctx, cmdbuf, name, color, depth ) TracyVkZoneC( ctx, cmdbuf, name, color )
-#  define TracyVkZoneTransientS( ctx, varname, cmdbuf, name, depth, active ) TracyVkZoneTransient( ctx, varname, cmdbuf, name, active )
-#endif
-
-#endif
-
-#endif

capture/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.16)
+
+option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF)
+option(NO_STATISTICS "Disable calculation of 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)
+
+set(PROGRAM_FILES
+    src/capture.cpp
+)
+
+add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
+target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyGetOpt)
+set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

capture/build/unix/Makefile

@@ -1,12 +0,0 @@
-all: release
-
-debug:
-	@+make -f debug.mk all
-
-release:
-	@+make -f release.mk all
-
-clean:
-	@+make -f build.mk clean
-
-.PHONY: all clean debug release

capture/build/unix/build.mk

@@ -1,12 +0,0 @@
-CFLAGS +=
-CXXFLAGS := $(CFLAGS) -std=gnu++17
-DEFINES += -DTRACY_NO_STATISTICS
-INCLUDES := $(shell pkg-config --cflags capstone)
-LIBS += $(shell pkg-config --libs capstone) -lpthread
-PROJECT := capture
-IMAGE := $(PROJECT)-$(BUILD)
-
-FILTER := ../../../getopt/getopt.c
-include ../../../common/src-from-vcxproj.mk
-
-include ../../../common/unix.mk

capture/build/unix/debug.mk

@@ -1,11 +0,0 @@
-ARCH := $(shell uname -m)
-
-CFLAGS := -g3 -Wall
-DEFINES := -DDEBUG
-BUILD := debug
-
-ifeq ($(ARCH),x86_64)
-CFLAGS += -msse4.1
-endif
-
-include build.mk

capture/build/unix/release.mk

@@ -1,6 +0,0 @@
-CFLAGS := -O3 -flto
-DEFINES := -DNDEBUG
-BUILD := release
-
-include ../../../common/unix-release.mk
-include build.mk

capture/build/win32/capture.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
-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

capture/build/win32/capture.vcxproj

@@ -1,203 +0,0 @@
-<?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|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</WindowsTargetPlatformVersion>
-    <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</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|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|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>
-      <AdditionalIncludeDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib</AdditionalLibraryDirectories>
-    </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>
-      <AdditionalIncludeDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\common\TracySocket.cpp" />
-    <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
-    <ClCompile Include="..\..\..\common\TracySystem.cpp" />
-    <ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
-    <ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
-    <ClCompile Include="..\..\..\getopt\getopt.c" />
-    <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
-    <ClCompile Include="..\..\..\server\TracyMmap.cpp" />
-    <ClCompile Include="..\..\..\server\TracyPrint.cpp" />
-    <ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp" />
-    <ClCompile Include="..\..\..\server\TracyTextureCompression.cpp" />
-    <ClCompile Include="..\..\..\server\TracyThreadCompress.cpp" />
-    <ClCompile Include="..\..\..\server\TracyWorker.cpp" />
-    <ClCompile Include="..\..\..\zstd\common\debug.c" />
-    <ClCompile Include="..\..\..\zstd\common\entropy_common.c" />
-    <ClCompile Include="..\..\..\zstd\common\error_private.c" />
-    <ClCompile Include="..\..\..\zstd\common\fse_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\common\pool.c" />
-    <ClCompile Include="..\..\..\zstd\common\threading.c" />
-    <ClCompile Include="..\..\..\zstd\common\xxhash.c" />
-    <ClCompile Include="..\..\..\zstd\common\zstd_common.c" />
-    <ClCompile Include="..\..\..\zstd\compress\fse_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\hist.c" />
-    <ClCompile Include="..\..\..\zstd\compress\huf_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstdmt_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_literals.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_sequences.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_superblock.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_double_fast.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_fast.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_lazy.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_ldm.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_opt.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\huf_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_ddict.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress_block.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\cover.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\divsufsort.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c" />
-    <ClCompile Include="..\..\src\capture.cpp" />
-  </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\TracyStackFrames.hpp" />
-    <ClInclude Include="..\..\..\common\TracySystem.hpp" />
-    <ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
-    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
-    <ClInclude Include="..\..\..\getopt\getopt.h" />
-    <ClInclude Include="..\..\..\server\TracyCharUtil.hpp" />
-    <ClInclude Include="..\..\..\server\TracyEvent.hpp" />
-    <ClInclude Include="..\..\..\server\TracyFileRead.hpp" />
-    <ClInclude Include="..\..\..\server\TracyFileWrite.hpp" />
-    <ClInclude Include="..\..\..\server\TracyMemory.hpp" />
-    <ClInclude Include="..\..\..\server\TracyMmap.hpp" />
-    <ClInclude Include="..\..\..\server\TracyPopcnt.hpp" />
-    <ClInclude Include="..\..\..\server\TracyPrint.hpp" />
-    <ClInclude Include="..\..\..\server\TracySlab.hpp" />
-    <ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp" />
-    <ClInclude Include="..\..\..\server\TracyTextureCompression.hpp" />
-    <ClInclude Include="..\..\..\server\TracyThreadCompress.hpp" />
-    <ClInclude Include="..\..\..\server\TracyVector.hpp" />
-    <ClInclude Include="..\..\..\server\TracyWorker.hpp" />
-    <ClInclude Include="..\..\..\zstd\common\bitstream.h" />
-    <ClInclude Include="..\..\..\zstd\common\compiler.h" />
-    <ClInclude Include="..\..\..\zstd\common\cpu.h" />
-    <ClInclude Include="..\..\..\zstd\common\debug.h" />
-    <ClInclude Include="..\..\..\zstd\common\error_private.h" />
-    <ClInclude Include="..\..\..\zstd\common\fse.h" />
-    <ClInclude Include="..\..\..\zstd\common\huf.h" />
-    <ClInclude Include="..\..\..\zstd\common\mem.h" />
-    <ClInclude Include="..\..\..\zstd\common\pool.h" />
-    <ClInclude Include="..\..\..\zstd\common\portability_macros.h" />
-    <ClInclude Include="..\..\..\zstd\common\threading.h" />
-    <ClInclude Include="..\..\..\zstd\common\xxhash.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_deps.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_internal.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_trace.h" />
-    <ClInclude Include="..\..\..\zstd\compress\clevels.h" />
-    <ClInclude Include="..\..\..\zstd\compress\hist.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstdmt_compress.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_internal.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_literals.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_sequences.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_superblock.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_cwksp.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_double_fast.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_fast.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_lazy.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm_geartab.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_opt.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_ddict.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_block.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_internal.h" />
-    <ClInclude Include="..\..\..\zstd\dictBuilder\cover.h" />
-    <ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h" />
-    <ClInclude Include="..\..\..\zstd\zdict.h" />
-    <ClInclude Include="..\..\..\zstd\zstd.h" />
-    <ClInclude Include="..\..\..\zstd\zstd_errors.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\zstd\decompress\huf_decompress_amd64.S" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

capture/build/win32/capture.vcxproj.filters

@@ -1,359 +0,0 @@
-<?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>
-    <Filter Include="getopt">
-      <UniqueIdentifier>{ee9737d2-69c7-44da-b9c7-539d18f9d4b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd">
-      <UniqueIdentifier>{f201463b-5e69-46fe-bdfc-1b5eed86c7f7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\common">
-      <UniqueIdentifier>{7e93ae33-6543-4bca-b05b-50818dbf24cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\compress">
-      <UniqueIdentifier>{3b0c32f5-9efb-4503-9394-5ab95909fb1c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\decompress">
-      <UniqueIdentifier>{c1f99170-d904-4af1-8010-0a3ded5736c8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\dictBuilder">
-      <UniqueIdentifier>{456e6786-ea57-42b8-ae38-829cd2d918bd}</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="..\..\..\common\tracy_lz4hc.cpp">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyPrint.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyThreadCompress.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyMmap.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyTextureCompression.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\getopt\getopt.c">
-      <Filter>getopt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\debug.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\entropy_common.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\error_private.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\fse_decompress.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\pool.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\threading.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\xxhash.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\zstd_common.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\fse_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\hist.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\huf_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_literals.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_sequences.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_superblock.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_double_fast.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_fast.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_lazy.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_ldm.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_opt.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstdmt_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\huf_decompress.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_ddict.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress_block.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\cover.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\divsufsort.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\TracyStackFrames.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\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="..\..\..\common\TracyAlign.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyPrint.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyThreadCompress.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyFileRead.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyMmap.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyTextureCompression.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\getopt\getopt.h">
-      <Filter>getopt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zstd.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zstd_errors.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\bitstream.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\compiler.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\cpu.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\debug.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\error_private.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\fse.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\huf.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\mem.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\pool.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\threading.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\xxhash.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_deps.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_internal.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_trace.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\hist.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_internal.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_literals.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_sequences.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_superblock.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_cwksp.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_double_fast.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_fast.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_lazy.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm_geartab.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_opt.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstdmt_compress.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_ddict.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_block.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_internal.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\dictBuilder\cover.h">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zdict.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\portability_macros.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\clevels.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\zstd\decompress\huf_decompress_amd64.S">
-      <Filter>zstd\decompress</Filter>
-    </None>
-  </ItemGroup>
-</Project>

capture/src/capture.cpp

@@ -1,23 +1,27 @@
 #ifdef _WIN32
 #  include <windows.h>
+#  include <io.h>
 #else
 #  include <unistd.h>
 #endif
 
+#include <atomic>
 #include <chrono>
 #include <inttypes.h>
 #include <mutex>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include "../../common/TracyProtocol.hpp"
-#include "../../common/TracyStackFrames.hpp"
+#include "../../public/common/TracyProtocol.hpp"
+#include "../../public/common/TracyStackFrames.hpp"
 #include "../../server/TracyFileWrite.hpp"
 #include "../../server/TracyMemory.hpp"
 #include "../../server/TracyPrint.hpp"
+#include "../../server/TracySysUtil.hpp"
 #include "../../server/TracyWorker.hpp"
 
 #ifdef _WIN32
@@ -25,16 +29,70 @@
 #endif
 
 
-bool disconnect = false;
+// 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 )
 {
-    disconnect = true;
+    // Relaxed order is closest to a traditional `volatile` write.
+    // We don't need stronger ordering since this signal handler doesn't do
+    // anything else that would need to be ordered relatively to this.
+    s_disconnect.store(true, std::memory_order_relaxed);
+}
+
+static bool s_isStdoutATerminal = false;
+
+void InitIsStdoutATerminal() {
+#ifdef _WIN32
+    s_isStdoutATerminal = _isatty( fileno( stdout ) );
+#else
+    s_isStdoutATerminal = isatty( fileno( stdout ) );
+#endif
+}
+
+bool IsStdoutATerminal() { return s_isStdoutATerminal; }
+
+#define ANSI_RESET "\033[0m"
+#define ANSI_BOLD "\033[1m"
+#define ANSI_BLACK "\033[30m"
+#define ANSI_RED "\033[31m"
+#define ANSI_GREEN "\033[32m"
+#define ANSI_YELLOW "\033[33m"
+#define ANSI_BLUE "\033[34m"
+#define ANSI_MAGENTA "\033[35m"
+#define ANSI_CYAN "\033[36m"
+#define ANSI_ERASE_LINE "\033[2K"
+
+// Like printf, but if stdout is a terminal, prepends the output with
+// the given `ansiEscape` and appends ANSI_RESET.
+void AnsiPrintf( const char* ansiEscape, const char* format, ... ) {
+    if( IsStdoutATerminal() )
+    {
+        // Prepend ansiEscape and append ANSI_RESET.
+        char buf[256];
+        va_list args;
+        va_start( args, format );
+        vsnprintf( buf, sizeof buf, format, args );
+        va_end( args );
+        printf( "%s%s" ANSI_RESET, ansiEscape, buf );
+    }
+    else
+    {
+        // Just a normal printf.
+        va_list args;
+        va_start( args, format );
+        vfprintf( stdout, format, args );
+        va_end( args );
+    }
 }
 
 [[noreturn]] void Usage()
 {
-    printf( "Usage: capture -o output.tracy [-a address] [-p port] [-f] [-s seconds]\n" );
+    printf( "Usage: capture -o output.tracy [-a address] [-p port] [-f] [-s seconds] [-m memlimit]\n" );
     exit( 1 );
 }
 
@@ -48,14 +106,17 @@ int main( int argc, char** argv )
     }
 #endif
 
+    InitIsStdoutATerminal();
+
     bool overwrite = false;
     const char* address = "127.0.0.1";
     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:" ) ) != -1 )
+    while( ( c = getopt( argc, argv, "a:o:p:fs:m:" ) ) != -1 )
     {
         switch( c )
         {
@@ -72,7 +133,10 @@ int main( int argc, char** argv )
             overwrite = true;
             break;
         case 's':
-            seconds = atoi (optarg);
+            seconds = atoi(optarg);
+            break;
+        case 'm':
+            memoryLimit = std::clamp( atoll( optarg ), 1ll, 999ll ) * tracy::GetPhysicalMemorySize() / 100;
             break;
         default:
             Usage();
@@ -100,8 +164,8 @@ int main( int argc, char** argv )
 
     printf( "Connecting to %s:%i...", address, port );
     fflush( stdout );
-    tracy::Worker worker( address, port );
-    while( !worker.IsConnected() )
+    tracy::Worker worker( address, port, memoryLimit );
+    while( !worker.HasData() )
     {
         const auto handshake = worker.GetHandshakeStatus();
         if( handshake == tracy::HandshakeProtocolMismatch )
@@ -119,8 +183,8 @@ int main( int argc, char** argv )
             printf( "\nThe client you are trying to connect to has disconnected during the initial\nconnection handshake. Please check your network configuration.\n" );
             return 3;
         }
+        std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
     }
-    while( !worker.HasData() ) std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
     printf( "\nQueue delay: %s\nTimer resolution: %s\n", tracy::TimeToString( worker.GetDelay() ), tracy::TimeToString( worker.GetResolution() ) );
 
 #ifdef _WIN32
@@ -132,15 +196,21 @@ int main( int argc, char** argv )
     sigaction( SIGINT, &sigint, &oldsigint );
 #endif
 
+    const auto firstTime = worker.GetFirstTime();
     auto& lock = worker.GetMbpsDataLock();
 
     const auto t0 = std::chrono::high_resolution_clock::now();
     while( worker.IsConnected() )
     {
-        if( disconnect )
+        // Relaxed order is sufficient here because `s_disconnect` is only ever
+        // set by this thread or by the SigInt handler, and that handler does
+        // nothing else than storing `s_disconnect`.
+        if( s_disconnect.load( std::memory_order_relaxed ) )
         {
             worker.Disconnect();
-            disconnect = false;
+            // Relaxed order is sufficient because only this thread ever reads
+            // this value.
+            s_disconnect.store(false, std::memory_order_relaxed );
             break;
         }
 
@@ -150,21 +220,36 @@ int main( int argc, char** argv )
         const auto netTotal = worker.GetDataTransferred();
         lock.unlock();
 
-        if( mbps < 0.1f )
+        // Output progress info only if destination is a TTY to avoid bloating
+        // log files (so this is not just about usage of ANSI color codes).
+        if( IsStdoutATerminal() )
         {
-            printf( "\33[2K\r\033[36;1m%7.2f Kbps", mbps * 1000.f );
+            const char* unit = "Mbps";
+            float unitsPerMbps = 1.f;
+            if( mbps < 0.1f )
+            {
+                unit = "Kbps";
+                unitsPerMbps = 1000.f;
+            }
+            AnsiPrintf( ANSI_ERASE_LINE ANSI_CYAN ANSI_BOLD, "\r%7.2f %s", mbps * unitsPerMbps, unit );
+            printf( " /");
+            AnsiPrintf( ANSI_CYAN ANSI_BOLD, "%5.1f%%", compRatio * 100.f );
+            printf( " =");
+            AnsiPrintf( ANSI_YELLOW ANSI_BOLD, "%7.2f Mbps", mbps / compRatio );
+            printf( " | ");
+            AnsiPrintf( ANSI_YELLOW, "Tx: ");
+            AnsiPrintf( ANSI_GREEN, "%s", tracy::MemSizeToString( netTotal ) );
+            printf( " | ");
+            AnsiPrintf( ANSI_RED ANSI_BOLD, "%s", tracy::MemSizeToString( tracy::memUsage.load( std::memory_order_relaxed ) ) );
+            if( memoryLimit > 0 )
+            {
+                printf( " / " );
+                AnsiPrintf( ANSI_BLUE ANSI_BOLD, "%s", tracy::MemSizeToString( memoryLimit ) );
+            }
+            printf( " | ");
+            AnsiPrintf( ANSI_RED, "%s", tracy::TimeToString( worker.GetLastTime() - firstTime ) );
+            fflush( stdout );
         }
-        else
-        {
-            printf( "\33[2K\r\033[36;1m%7.2f Mbps", mbps );
-        }
-        printf( " \033[0m /\033[36;1m%5.1f%% \033[0m=\033[33;1m%7.2f Mbps \033[0m| \033[33mTx: \033[32m%s \033[0m| \033[31;1m%s\033[0m | \033[33m%s\033[0m",
-            compRatio * 100.f,
-            mbps / compRatio,
-            tracy::MemSizeToString( netTotal ),
-            tracy::MemSizeToString( tracy::memUsage ),
-            tracy::TimeToString( worker.GetLastTime() ) );
-        fflush( stdout );
 
         std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
         if( seconds != -1 )
@@ -172,7 +257,9 @@ int main( int argc, char** argv )
             const auto dur = std::chrono::high_resolution_clock::now() - t0;
             if( std::chrono::duration_cast<std::chrono::seconds>(dur).count() >= seconds )
             {
-                disconnect = true;
+                // Relaxed order is sufficient because only this thread ever reads
+                // this value.
+                s_disconnect.store(true, std::memory_order_relaxed );
             }
         }
     }
@@ -181,7 +268,7 @@ int main( int argc, char** argv )
     const auto& failure = worker.GetFailureType();
     if( failure != tracy::Worker::Failure::None )
     {
-        printf( "\n\033[31;1mInstrumentation failure: %s\033[0m", tracy::Worker::GetFailureString( failure ) );
+        AnsiPrintf( ANSI_RED ANSI_BOLD, "\nInstrumentation failure: %s", tracy::Worker::GetFailureString( failure ) );
         auto& fd = worker.GetFailureData();
         if( !fd.message.empty() )
         {
@@ -189,10 +276,9 @@ int main( int argc, char** argv )
         }
         if( fd.callstack != 0 )
         {
-            printf( "\n\033[1mFailure callstack:\033[0m\n" );
+            AnsiPrintf( ANSI_BOLD, "\nFailure callstack:\n" );
             auto& cs = worker.GetCallstack( fd.callstack );
             int fidx = 0;
-            int bidx = 0;
             for( auto& entry : cs )
             {
                 auto frameData = worker.GetCallstackFrame( entry );
@@ -224,33 +310,31 @@ int main( int argc, char** argv )
                             if( match ) continue;
                         }
 
-                        bidx++;
-
                         if( f == fsz-1 )
                         {
                             printf( "%3i. ", fidx++ );
                         }
                         else
                         {
-                            printf( "\033[30;1minl. " );
+                            AnsiPrintf( ANSI_BLACK ANSI_BOLD, "inl. " );
                         }
-                        printf( "\033[0;36m%s  ", txt );
+                        AnsiPrintf( ANSI_CYAN, "%s  ", txt );
                         txt = worker.GetString( frame.file );
                         if( frame.line == 0 )
                         {
-                            printf( "\033[33m(%s)", txt );
+                            AnsiPrintf( ANSI_YELLOW, "(%s)", txt );
                         }
                         else
                         {
-                            printf( "\033[33m(%s:%" PRIu32 ")", txt, frame.line );
+                            AnsiPrintf( ANSI_YELLOW, "(%s:%" PRIu32 ")", txt, frame.line );
                         }
                         if( frameData->imageName.Active() )
                         {
-                            printf( "\033[35m %s\033[0m\n", worker.GetString( frameData->imageName ) );
+                            AnsiPrintf( ANSI_MAGENTA, " %s\n", worker.GetString( frameData->imageName ) );
                         }
                         else
                         {
-                            printf( "\033[0m\n" );
+                            printf( "\n" );
                         }
                     }
                 }
@@ -259,21 +343,21 @@ int main( int argc, char** argv )
     }
 
     printf( "\nFrames: %" PRIu64 "\nTime span: %s\nZones: %s\nElapsed time: %s\nSaving trace...",
-        worker.GetFrameCount( *worker.GetFramesBase() ), tracy::TimeToString( worker.GetLastTime() ), tracy::RealToString( worker.GetZoneCount() ),
+        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() ) );
     fflush( stdout );
-    auto f = std::unique_ptr<tracy::FileWrite>( tracy::FileWrite::Open( output ) );
+    auto f = std::unique_ptr<tracy::FileWrite>( tracy::FileWrite::Open( output, tracy::FileCompression::Zstd, 3, 4 ) );
     if( f )
     {
         worker.Write( *f, false );
-        printf( " \033[32;1mdone!\033[0m\n" );
+        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 );
     }
     else
     {
-        printf( " \033[31;1failed!\033[0m\n" );
+        AnsiPrintf( ANSI_RED ANSI_BOLD, " failed!\n");
     }
 
     return 0;

client/TracyStringHelpers.hpp

@@ -1,50 +0,0 @@
-#ifndef __TRACYSTRINGHELPERS_HPP__
-#define __TRACYSTRINGHELPERS_HPP__
-
-#include <assert.h>
-#include <string.h>
-
-#include "../common/TracyAlloc.hpp"
-
-namespace tracy
-{
-
-static inline char* CopyString( const char* src, size_t sz )
-{
-    assert( strlen( src ) == sz );
-    auto dst = (char*)tracy_malloc( sz + 1 );
-    memcpy( dst, src, sz );
-    dst[sz] = '\0';
-    return dst;
-}
-
-static inline char* CopyString( const char* src )
-{
-    const auto sz = strlen( src );
-    auto dst = (char*)tracy_malloc( sz + 1 );
-    memcpy( dst, src, sz );
-    dst[sz] = '\0';
-    return dst;
-}
-
-static inline char* CopyStringFast( const char* src, size_t sz )
-{
-    assert( strlen( src ) == sz );
-    auto dst = (char*)tracy_malloc_fast( sz + 1 );
-    memcpy( dst, src, sz );
-    dst[sz] = '\0';
-    return dst;
-}
-
-static inline char* CopyStringFast( const char* src )
-{
-    const auto sz = strlen( src );
-    auto dst = (char*)tracy_malloc_fast( sz + 1 );
-    memcpy( dst, src, sz );
-    dst[sz] = '\0';
-    return dst;
-}
-
-}
-
-#endif

cmake/ECMFindModuleHelpers.cmake

@@ -0,0 +1,300 @@
+#.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()

cmake/FindWaylandScanner.cmake

@@ -0,0 +1,170 @@
+#.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()

cmake/config.cmake

@@ -0,0 +1,62 @@
+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_MARCH_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(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fexperimental-library>)
+    endif()
+endif()
+
+if(WIN32)
+    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+    add_compile_options(/MP)
+endif()
+
+if(EMSCRIPTEN)
+    add_compile_options(-pthread -DIMGUI_IMPL_OPENGL_ES2)
+endif()
+
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT EMSCRIPTEN)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    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()
+
+find_program(CCACHE ccache)
+if(CCACHE)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) 
+endif()
+
+file(GENERATE OUTPUT .gitignore CONTENT "*")
+
+set(CMAKE_COLOR_DIAGNOSTICS ON)

cmake/gl3w-extra-symbols.patch

@@ -0,0 +1,12 @@
+diff --git a/extra_symbols.txt b/extra_symbols.txt
+index b95bb58..6b8f616 100644
+--- a/extra_symbols.txt
++++ b/extra_symbols.txt
+@@ -1,3 +1,7 @@
++glCompressedTexImage2D
++GL_LINEAR_MIPMAP_LINEAR
++GL_TEXTURE_WRAP_S
++GL_TEXTURE_WRAP_T
+ glReadPixels
+ glClearColor
+ glClear

cmake/imgui-emscripten.patch

@@ -0,0 +1,14 @@
+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;

cmake/imgui-loader.patch

@@ -0,0 +1,56 @@
+diff --git a/backends/imgui_impl_opengl3_loader.h b/backends/imgui_impl_opengl3_loader.h
+index d6ffa5a2d..e48372c64 100644
+--- a/backends/imgui_impl_opengl3_loader.h
++++ b/backends/imgui_impl_opengl3_loader.h
+@@ -179,6 +179,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
+@@ -241,8 +242,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
+@@ -478,7 +481,7 @@ GL3W_API GL3WglProc imgl3wGetProcAddress(const char *proc);
+ 
+ /* gl3w internal state */
+ union ImGL3WProcs {
+-    GL3WglProc ptr[59];
++    GL3WglProc ptr[60];
+     struct {
+         PFNGLACTIVETEXTUREPROC            ActiveTexture;
+         PFNGLATTACHSHADERPROC             AttachShader;
+@@ -494,6 +497,7 @@ union ImGL3WProcs {
+         PFNGLCLEARPROC                    Clear;
+         PFNGLCLEARCOLORPROC               ClearColor;
+         PFNGLCOMPILESHADERPROC            CompileShader;
++        PFNGLCOMPRESSEDTEXIMAGE2DPROC     CompressedTexImage2D;
+         PFNGLCREATEPROGRAMPROC            CreateProgram;
+         PFNGLCREATESHADERPROC             CreateShader;
+         PFNGLDELETEBUFFERSPROC            DeleteBuffers;
+@@ -559,6 +563,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
+@@ -854,6 +859,7 @@ static const char *proc_names[] = {
+     "glClear",
+     "glClearColor",
+     "glCompileShader",
++    "glCompressedTexImage2D",
+     "glCreateProgram",
+     "glCreateShader",
+     "glDeleteBuffers",

cmake/server.cmake

@@ -0,0 +1,35 @@
+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
+    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()

cmake/vendor.cmake

@@ -0,0 +1,222 @@
+# 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)
+
+option(DOWNLOAD_CAPSTONE "Force download capstone" ON)
+option(DOWNLOAD_GLFW "Force download glfw" OFF)
+option(DOWNLOAD_FREETYPE "Force download freetype" OFF)
+
+# 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-Alpha1
+        OPTIONS
+            "CAPSTONE_X86_ATT_DISABLE ON"
+            "CAPSTONE_ALPHA_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)
+endif()
+
+# 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.4
+            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-13-3
+        OPTIONS
+            "FT_DISABLE_HARFBUZZ ON"
+            "FT_WITH_HARFBUZZ OFF"
+        EXCLUDE_FROM_ALL TRUE
+    )
+    add_library(TracyFreetype INTERFACE)
+    target_link_libraries(TracyFreetype INTERFACE freetype)
+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})
+
+
+# ImGui
+
+CPMAddPackage(
+    NAME ImGui
+    GITHUB_REPOSITORY ocornut/imgui
+    GIT_TAG v1.91.8-docking
+    DOWNLOAD_ONLY TRUE
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/imgui-emscripten.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/imgui-loader.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)
+target_compile_definitions(TracyImGui PRIVATE "IMGUI_ENABLE_FREETYPE")
+
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    target_compile_definitions(TracyImGui PRIVATE "IMGUI_DISABLE_DEBUG_TOOLS")
+endif()
+
+# NFD
+
+if (NOT NO_FILESELECTOR AND NOT EMSCRIPTEN)
+    set(NFD_DIR "${ROOT_DIR}/nfd")
+
+    if (WIN32)
+        set(NFD_SOURCES "${NFD_DIR}/nfd_win.cpp")
+    elseif (APPLE)
+        set(NFD_SOURCES "${NFD_DIR}/nfd_cocoa.m")
+    else()
+        if (GTK_FILESELECTOR)
+            set(NFD_SOURCES "${NFD_DIR}/nfd_gtk.cpp")
+        else()
+            set(NFD_SOURCES "${NFD_DIR}/nfd_portal.cpp")
+        endif()
+    endif()
+
+    file(GLOB_RECURSE NFD_HEADERS CONFIGURE_DEPENDS RELATIVE ${NFD_DIR} "*.h")
+    add_library(TracyNfd STATIC EXCLUDE_FROM_ALL ${NFD_SOURCES} ${NFD_HEADERS})
+    target_include_directories(TracyNfd PUBLIC ${NFD_DIR})
+
+    if (APPLE)
+        find_library(APPKIT_LIBRARY AppKit)
+        find_library(UNIFORMTYPEIDENTIFIERS_LIBRARY UniformTypeIdentifiers)
+        target_link_libraries(TracyNfd PUBLIC ${APPKIT_LIBRARY} ${UNIFORMTYPEIDENTIFIERS_LIBRARY})
+    elseif (UNIX)
+        if (GTK_FILESELECTOR)
+            pkg_check_modules(GTK3 gtk+-3.0)
+            if (NOT GTK3_FOUND)
+                message(FATAL_ERROR "GTK3 not found. Please install it or set GTK_FILESELECTOR to OFF.")
+            endif()
+            add_library(TracyGtk3 INTERFACE)
+            target_include_directories(TracyGtk3 INTERFACE ${GTK3_INCLUDE_DIRS})
+            target_link_libraries(TracyGtk3 INTERFACE ${GTK3_LINK_LIBRARIES})
+            target_link_libraries(TracyNfd PUBLIC TracyGtk3)
+        else()
+            pkg_check_modules(DBUS dbus-1)
+            if (NOT DBUS_FOUND)
+                message(FATAL_ERROR "D-Bus not found. Please install it or set GTK_FILESELECTOR to ON.")
+            endif()
+            add_library(TracyDbus INTERFACE)
+            target_include_directories(TracyDbus INTERFACE ${DBUS_INCLUDE_DIRS})
+            target_link_libraries(TracyDbus INTERFACE ${DBUS_LINK_LIBRARIES})
+            target_link_libraries(TracyNfd PUBLIC TracyDbus)
+        endif()
+    endif()
+endif()
+
+# PPQSort
+
+CPMAddPackage(
+    NAME PPQSort
+    GITHUB_REPOSITORY GabTux/PPQSort
+    VERSION 1.0.5
+    EXCLUDE_FROM_ALL TRUE
+)

cmake/version.cmake

@@ -0,0 +1,24 @@
+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}")

common/src-from-vcxproj.mk

@@ -1,21 +0,0 @@
-# Extract the actual list of source files from a sibling Visual Studio project.
-
-# Ensure these are simply-substituted variables, without changing their values.
-SRC := $(SRC)
-SRC2 := $(SRC2)
-SRC3 := $(SRC3)
-SRC4 := $(SRC4)
-
-# Paths here are relative to the directory in which make was invoked, not to
-# this file, so ../win32/$(PROJECT).vcxproj refers to the Visual Studio project
-# of whichever tool is including this makefile fragment.
-
-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')
-BASE4 := $(shell egrep 'None.*S"' ../win32/$(PROJECT).vcxproj | sed -e 's/.*\"\(.*\)\".*/\1/' | sed -e 's@\\@/@g')
-
-# The tool-specific makefile may request that certain files be omitted.
-SRC += $(filter-out $(FILTER),$(BASE))
-SRC2 += $(filter-out $(FILTER),$(BASE2))
-SRC3 += $(filter-out $(FILTER),$(BASE3))
-SRC4 += $(filter-out $(FILTER),$(BASE4))

common/unix-release.mk

@@ -1,13 +0,0 @@
-ARCH := $(shell uname -m)
-
-ifeq (0,$(shell $(CC) --version | grep clang && echo 1 || echo 0))
-CFLAGS += -s
-else
-LDFLAGS := -s
-endif
-
-ifneq (,$(filter $(ARCH),aarch64 arm64))
-CFLAGS += -mcpu=native
-else
-CFLAGS += -march=native
-endif

common/unix.mk

@@ -1,82 +0,0 @@
-# Common code needed by most Tracy Unix Makefiles.
-
-# Ensure these are simply-substituted variables, without changing their values.
-LIBS := $(LIBS)
-
-# Tracy does not use TBB directly, but the implementation of parallel algorithms
-# in some versions of libstdc++ depends on TBB. When it does, you must
-# explicitly link against -ltbb.
-#
-# Some distributions have pgk-config files for TBB, others don't.
-ifeq (0,$(shell pkg-config --libs tbb >/dev/null 2>&1; echo $$?))
-	LIBS += $(shell pkg-config --libs tbb)
-else ifeq (0,$(shell ld -ltbb -o /dev/null 2>/dev/null; echo $$?))
-	LIBS += -ltbb
-endif
-
-OBJDIRBASE := obj/$(BUILD)
-OBJDIR := $(OBJDIRBASE)/o/o/o
-
-OBJ := $(addprefix $(OBJDIR)/,$(SRC:%.cpp=%.o))
-OBJ2 := $(addprefix $(OBJDIR)/,$(SRC2:%.c=%.o))
-OBJ3 := $(addprefix $(OBJDIR)/,$(SRC3:%.m=%.o))
-OBJ4 := $(addprefix $(OBJDIR)/,$(SRC4:%.S=%.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 $@.$$$$
-
-$(OBJDIR)/%.o: %.m
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-$(OBJDIR)/%.d : %.m
-	@echo Resolving dependencies of $<
-	@mkdir -p $(@D)
-	@$(CC) -MM $(INCLUDES) $(CFLAGS) $(DEFINES) $< > $@.$$$$; \
-	sed 's,.*\.o[ :]*,$(OBJDIR)/$(<:.m=.o) $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-$(OBJDIR)/%.o: %.S
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-$(OBJDIR)/%.d : %.S
-	@echo Resolving dependencies of $<
-	@mkdir -p $(@D)
-	@$(CC) -MM $(INCLUDES) $(CFLAGS) $(DEFINES) $< > $@.$$$$; \
-	sed 's,.*\.o[ :]*,$(OBJDIR)/$(<:.m=.o) $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-ifeq (yes,$(SHARED_LIBRARY))
-$(IMAGE): $(OBJ) $(OBJ2) $(OBJ4)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFINES) $(OBJ) $(OBJ2) $(OBJ4) $(LIBS) -shared -o $@
-else
-$(IMAGE): $(OBJ) $(OBJ2) $(OBJ3) $(OBJ4)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFINES) $(OBJ) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) -o $@
-endif
-
-ifneq "$(MAKECMDGOALS)" "clean"
--include $(addprefix $(OBJDIR)/,$(SRC:.cpp=.d)) $(addprefix $(OBJDIR)/,$(SRC2:.c=.d)) $(addprefix $(OBJDIR)/,$(SRC3:.m=.d)) $(addprefix $(OBJDIR)/,$(SRC4:.S=.d))
-endif
-
-clean:
-	rm -rf $(OBJDIRBASE) $(IMAGE)*
-
-.PHONY: clean all

csvexport/CMakeLists.txt

@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.16)
+
+option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF)
+
+set(NO_STATISTICS OFF)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
+
+set(CMAKE_CXX_STANDARD 20)
+
+project(
+    tracy-csvexport
+    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)
+
+set(PROGRAM_FILES
+    src/csvexport.cpp
+)
+
+add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
+target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyGetOpt)
+set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

csvexport/build/unix/Makefile

@@ -1,12 +0,0 @@
-all: release
-
-debug:
-	@+make -f debug.mk all
-
-release:
-	@+make -f release.mk all
-
-clean:
-	@+make -f build.mk clean
-
-.PHONY: all clean debug release

csvexport/build/unix/build.mk

@@ -1,12 +0,0 @@
-CFLAGS +=
-CXXFLAGS := $(CFLAGS) -std=gnu++17
-# DEFINES += -DTRACY_NO_STATISTICS
-INCLUDES := $(shell pkg-config --cflags capstone)
-LIBS := $(shell pkg-config --libs capstone) -lpthread
-PROJECT := csvexport
-IMAGE := $(PROJECT)-$(BUILD)
-
-FILTER :=
-include ../../../common/src-from-vcxproj.mk
-
-include ../../../common/unix.mk

csvexport/build/unix/debug.mk

@@ -1,11 +0,0 @@
-ARCH := $(shell uname -m)
-
-CFLAGS := -g3 -Wall
-DEFINES := -DDEBUG
-BUILD := debug
-
-ifeq ($(ARCH),x86_64)
-CFLAGS += -msse4.1
-endif
-
-include build.mk

csvexport/build/unix/release.mk

@@ -1,6 +0,0 @@
-CFLAGS := -O3 -flto
-DEFINES := -DNDEBUG
-BUILD := release
-
-include ../../../common/unix-release.mk
-include build.mk

csvexport/build/win32/csvexport.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csvexport", "csvexport.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

csvexport/build/win32/csvexport.vcxproj

@@ -1,203 +0,0 @@
-<?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|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</WindowsTargetPlatformVersion>
-    <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</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|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|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib</AdditionalLibraryDirectories>
-    </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>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>
-      <AdditionalIncludeDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\common\TracySocket.cpp" />
-    <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
-    <ClCompile Include="..\..\..\common\TracySystem.cpp" />
-    <ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
-    <ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
-    <ClCompile Include="..\..\..\getopt\getopt.c" />
-    <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
-    <ClCompile Include="..\..\..\server\TracyMmap.cpp" />
-    <ClCompile Include="..\..\..\server\TracyPrint.cpp" />
-    <ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp" />
-    <ClCompile Include="..\..\..\server\TracyTextureCompression.cpp" />
-    <ClCompile Include="..\..\..\server\TracyThreadCompress.cpp" />
-    <ClCompile Include="..\..\..\server\TracyWorker.cpp" />
-    <ClCompile Include="..\..\..\zstd\common\debug.c" />
-    <ClCompile Include="..\..\..\zstd\common\entropy_common.c" />
-    <ClCompile Include="..\..\..\zstd\common\error_private.c" />
-    <ClCompile Include="..\..\..\zstd\common\fse_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\common\pool.c" />
-    <ClCompile Include="..\..\..\zstd\common\threading.c" />
-    <ClCompile Include="..\..\..\zstd\common\xxhash.c" />
-    <ClCompile Include="..\..\..\zstd\common\zstd_common.c" />
-    <ClCompile Include="..\..\..\zstd\compress\fse_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\hist.c" />
-    <ClCompile Include="..\..\..\zstd\compress\huf_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstdmt_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_literals.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_sequences.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_superblock.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_double_fast.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_fast.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_lazy.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_ldm.c" />
-    <ClCompile Include="..\..\..\zstd\compress\zstd_opt.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\huf_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_ddict.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress.c" />
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress_block.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\cover.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\divsufsort.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c" />
-    <ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c" />
-    <ClCompile Include="..\..\src\csvexport.cpp" />
-  </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\TracyStackFrames.hpp" />
-    <ClInclude Include="..\..\..\common\TracySystem.hpp" />
-    <ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
-    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
-    <ClInclude Include="..\..\..\getopt\getopt.h" />
-    <ClInclude Include="..\..\..\server\TracyCharUtil.hpp" />
-    <ClInclude Include="..\..\..\server\TracyEvent.hpp" />
-    <ClInclude Include="..\..\..\server\TracyFileRead.hpp" />
-    <ClInclude Include="..\..\..\server\TracyFileWrite.hpp" />
-    <ClInclude Include="..\..\..\server\TracyMemory.hpp" />
-    <ClInclude Include="..\..\..\server\TracyMmap.hpp" />
-    <ClInclude Include="..\..\..\server\TracyPopcnt.hpp" />
-    <ClInclude Include="..\..\..\server\TracyPrint.hpp" />
-    <ClInclude Include="..\..\..\server\TracySlab.hpp" />
-    <ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp" />
-    <ClInclude Include="..\..\..\server\TracyTextureCompression.hpp" />
-    <ClInclude Include="..\..\..\server\TracyThreadCompress.hpp" />
-    <ClInclude Include="..\..\..\server\TracyVector.hpp" />
-    <ClInclude Include="..\..\..\server\TracyWorker.hpp" />
-    <ClInclude Include="..\..\..\zstd\common\bitstream.h" />
-    <ClInclude Include="..\..\..\zstd\common\compiler.h" />
-    <ClInclude Include="..\..\..\zstd\common\cpu.h" />
-    <ClInclude Include="..\..\..\zstd\common\debug.h" />
-    <ClInclude Include="..\..\..\zstd\common\error_private.h" />
-    <ClInclude Include="..\..\..\zstd\common\fse.h" />
-    <ClInclude Include="..\..\..\zstd\common\huf.h" />
-    <ClInclude Include="..\..\..\zstd\common\mem.h" />
-    <ClInclude Include="..\..\..\zstd\common\pool.h" />
-    <ClInclude Include="..\..\..\zstd\common\portability_macros.h" />
-    <ClInclude Include="..\..\..\zstd\common\threading.h" />
-    <ClInclude Include="..\..\..\zstd\common\xxhash.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_deps.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_internal.h" />
-    <ClInclude Include="..\..\..\zstd\common\zstd_trace.h" />
-    <ClInclude Include="..\..\..\zstd\compress\clevels.h" />
-    <ClInclude Include="..\..\..\zstd\compress\hist.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstdmt_compress.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_internal.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_literals.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_sequences.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_superblock.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_cwksp.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_double_fast.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_fast.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_lazy.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm_geartab.h" />
-    <ClInclude Include="..\..\..\zstd\compress\zstd_opt.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_ddict.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_block.h" />
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_internal.h" />
-    <ClInclude Include="..\..\..\zstd\dictBuilder\cover.h" />
-    <ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h" />
-    <ClInclude Include="..\..\..\zstd\zdict.h" />
-    <ClInclude Include="..\..\..\zstd\zstd.h" />
-    <ClInclude Include="..\..\..\zstd\zstd_errors.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\zstd\decompress\huf_decompress_amd64.S" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

csvexport/build/win32/csvexport.vcxproj.filters

@@ -1,359 +0,0 @@
-<?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>
-    <Filter Include="getopt">
-      <UniqueIdentifier>{ee9737d2-69c7-44da-b9c7-539d18f9d4b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd">
-      <UniqueIdentifier>{44ea1742-0fd9-40ba-879c-031868509600}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\common">
-      <UniqueIdentifier>{2d065bba-d78e-4e44-87f7-b44cf3248260}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\compress">
-      <UniqueIdentifier>{a19ca3bc-2a17-49c5-a0d9-5916213de774}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\decompress">
-      <UniqueIdentifier>{d4181058-2198-4931-ae31-b7eda0312458}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="zstd\dictBuilder">
-      <UniqueIdentifier>{873c22fe-b4d7-480d-ad67-48271296f4c1}</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="..\..\..\common\tracy_lz4hc.cpp">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyPrint.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyThreadCompress.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyMmap.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\server\TracyTextureCompression.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\getopt\getopt.c">
-      <Filter>getopt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\csvexport.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\debug.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\entropy_common.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\error_private.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\fse_decompress.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\pool.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\threading.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\xxhash.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\common\zstd_common.c">
-      <Filter>zstd\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\huf_decompress.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_ddict.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\decompress\zstd_decompress_block.c">
-      <Filter>zstd\decompress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\fse_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\hist.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\huf_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_literals.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_sequences.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_compress_superblock.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_double_fast.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_fast.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_lazy.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_ldm.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstd_opt.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\compress\zstdmt_compress.c">
-      <Filter>zstd\compress</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\cover.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\divsufsort.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\TracyStackFrames.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\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="..\..\..\common\TracyAlign.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\tracy_lz4hc.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyPrint.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyThreadCompress.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyFileRead.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyMmap.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\TracyTextureCompression.hpp">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\getopt\getopt.h">
-      <Filter>getopt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zstd.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zstd_errors.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\bitstream.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\compiler.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\cpu.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\debug.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\error_private.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\fse.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\huf.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\mem.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\pool.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\threading.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\xxhash.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_deps.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_internal.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\zstd_trace.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_ddict.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_block.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\decompress\zstd_decompress_internal.h">
-      <Filter>zstd\decompress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\hist.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_internal.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_literals.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_sequences.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_compress_superblock.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_cwksp.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_double_fast.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_fast.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_lazy.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_ldm_geartab.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstd_opt.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\zstdmt_compress.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\zdict.h">
-      <Filter>zstd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\dictBuilder\cover.h">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
-      <Filter>zstd\dictBuilder</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\common\portability_macros.h">
-      <Filter>zstd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zstd\compress\clevels.h">
-      <Filter>zstd\compress</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\zstd\decompress\huf_decompress_amd64.S">
-      <Filter>zstd\decompress</Filter>
-    </None>
-  </ItemGroup>
-</Project>

csvexport/src/csvexport.cpp

@@ -28,7 +28,10 @@ void print_usage_exit(int e)
     fprintf(stderr, "  -s, --sep arg     CSV separator (default: ,)\n");
     fprintf(stderr, "  -c, --case        Case sensitive filtering\n");
     fprintf(stderr, "  -e, --self        Get self times\n");
-    fprintf(stderr, "  -u, --unwrap      Report each zone event\n");
+    fprintf(stderr, "  -u, --unwrap      Report each cpu zone event\n");
+    fprintf(stderr, "  -g, --gpu         Report each gpu zone event\n" );
+    fprintf(stderr, "  -m, --messages    Report only messages\n");
+    fprintf(stderr, "  -p, --plot        Report plot data (only with -u)\n");
 
     exit(e);
 }
@@ -40,6 +43,9 @@ struct Args {
     bool case_sensitive;
     bool self_time;
     bool unwrap;
+    bool show_gpu;
+    bool unwrapMessages;
+    bool plot;
 };
 
 Args parse_args(int argc, char** argv)
@@ -49,7 +55,7 @@ Args parse_args(int argc, char** argv)
         print_usage_exit(1);
     }
 
-    Args args = { "", ",", "", false, false, false };
+    Args args = { "", ",", "", false, false, false, false, false, false };
 
     struct option long_opts[] = {
         { "help", no_argument, NULL, 'h' },
@@ -58,11 +64,14 @@ Args parse_args(int argc, char** argv)
         { "case", no_argument, NULL, 'c' },
         { "self", no_argument, NULL, 'e' },
         { "unwrap", no_argument, NULL, 'u' },
+        { "gpu", no_argument, NULL, 'g' },
+        { "messages", no_argument, NULL, 'm' },
+        { "plot", no_argument, NULL, 'p' },
         { NULL, 0, NULL, 0 }
     };
 
     int c;
-    while ((c = getopt_long(argc, argv, "hf:s:ceu", long_opts, NULL)) != -1)
+    while ((c = getopt_long(argc, argv, "hf:s:ceugmp", long_opts, NULL)) != -1)
     {
         switch (c)
         {
@@ -84,6 +93,15 @@ Args parse_args(int argc, char** argv)
         case 'u':
             args.unwrap = true;
             break;
+        case 'g':
+            args.show_gpu = true;
+            break;
+        case 'm':
+            args.unwrapMessages = true;
+            break;
+        case 'p':
+            args.plot = true;
+            break;
         default:
             print_usage_exit(1);
             break;
@@ -198,11 +216,105 @@ int main(int argc, char** argv)
 
     auto worker = tracy::Worker(*f);
 
+    if (args.unwrapMessages) 
+    {
+        const auto& msgs = worker.GetMessages();
+    
+        if (msgs.size() > 0)
+        {
+            std::vector<const char*> columnsForMessages;
+            columnsForMessages = {
+                    "MessageName", "total_ns"
+                };
+            std::string headerForMessages = join(columnsForMessages, args.separator);
+            printf("%s\n", headerForMessages.data());
+
+            for(auto& it : msgs)
+            {
+                std::vector<std::string> values(columnsForMessages.size());
+
+                values[0] = worker.GetString(it->ref);
+                values[1] = std::to_string(it->time);
+
+                std::string row = join(values, args.separator);
+                printf("%s\n", row.data());
+            }
+        }
+        else
+        {
+            printf("There are currently no messages!\n");
+        }
+    
+        return 0;
+    }
+
     while (!worker.AreSourceLocationZonesReady())
     {
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
 
+    if (args.show_gpu)
+    {
+        auto& gpu_slz = worker.GetGpuSourceLocationZones();
+        tracy::Vector<decltype( gpu_slz.begin() )> gpu_slz_selected;
+        gpu_slz_selected.reserve( gpu_slz.size() );
+
+        uint32_t total_cnt = 0;
+        for (auto it = gpu_slz.begin(); it != gpu_slz.end(); ++it)
+        {
+            if (it->second.total != 0)
+            {
+                ++total_cnt;
+                if (args.filter[0] == '\0')
+                {
+                    gpu_slz_selected.push_back_no_space_check( it );
+                }
+                else
+                {
+                    auto name = get_name( it->first, worker );
+                    if (is_substring( args.filter, name, args.case_sensitive))
+                    {
+                        gpu_slz_selected.push_back_no_space_check( it );
+                    }
+                }
+            }
+        }
+
+        std::vector<const char*> columns;
+        columns = {"name", "src_file", "Time from start of program", "GPU execution time"};
+
+        std::string header = join(columns, args.separator);
+        printf("%s\n", header.data());
+
+        const auto last_time = worker.GetLastTime();
+        for (auto& it : gpu_slz_selected)
+        {
+            std::vector<std::string> values( columns.size() );
+
+            values[0] = get_name( it->first, worker );
+
+            const auto& srcloc = worker.GetSourceLocation( it->first );
+            values[1] = worker.GetString( srcloc.file );
+
+            const auto& zone_data = it->second;
+            for (const auto& zone_thread_data : zone_data.zones)
+            {
+                tracy::GpuEvent* gpu_event = zone_thread_data.Zone();
+                const auto start = gpu_event->GpuStart();
+                const auto end = gpu_event->GpuEnd();
+
+                values[2] = std::to_string( start );
+
+                auto timespan = end - start;
+                values[3] = std::to_string( timespan );
+
+                std::string row = join( values, args.separator );
+                printf( "%s\n", row.data() );
+            }
+        }
+        return 0;
+    }
+
     auto& slz = worker.GetSourceLocationZones();
     tracy::Vector<decltype(slz.begin())> slz_selected;
     slz_selected.reserve(slz.size());
@@ -232,7 +344,7 @@ int main(int argc, char** argv)
     if (args.unwrap)
     {
         columns = {
-            "name", "src_file", "src_line", "ns_since_start", "exec_time_ns"
+            "name", "src_file", "src_line", "ns_since_start", "exec_time_ns", "thread", "value"
         };
     }
     else
@@ -263,6 +375,7 @@ int main(int argc, char** argv)
             int i = 0;
             for (const auto& zone_thread_data : zone_data.zones) {
                 const auto zone_event = zone_thread_data.Zone();
+                const auto tId = zone_thread_data.Thread();
                 const auto start = zone_event->Start();
                 const auto end = zone_event->End();
 
@@ -273,6 +386,13 @@ int main(int argc, char** argv)
                     timespan -= GetZoneChildTimeFast(worker, *zone_event);
                 }
                 values[4] = std::to_string(timespan);
+                values[5] = std::to_string(tId);
+                if (worker.HasZoneExtra(*zone_event)) {
+                    const auto& text = worker.GetZoneExtra(*zone_event).text;
+                    if (text.Active()) {
+                        values[6] = worker.GetString(text);
+                    }
+                }
 
                 std::string row = join(values, args.separator);
                 printf("%s\n", row.data());
@@ -299,7 +419,9 @@ int main(int argc, char** argv)
             const auto ss = zone_data.sumSq
                 - 2. * zone_data.total * avg
                 + avg * avg * sz;
-            const auto std = sqrt(ss / (sz - 1));
+            double std = 0;
+            if( sz > 1 )
+                std = sqrt(ss / (sz - 1));
             values[9] = std::to_string(std);
 
             std::string row = join(values, args.separator);
@@ -307,5 +429,26 @@ int main(int argc, char** argv)
         }
     }
 
+    if(args.plot && args.unwrap)
+    {
+        auto& plots = worker.GetPlots();
+        for(const auto& plot : plots)
+        {
+            std::vector<std::string> values(columns.size());
+            values[0] = worker.GetString(plot->name);
+
+            for(const auto& val : plot->data)
+            {
+                if (args.unwrap)
+                {
+                    values[3] = std::to_string(val.time.Val());
+                    values[6] = std::to_string(val.val);
+                }
+                std::string row = join(values, args.separator);
+                printf("%s\n", row.data());
+            }
+        }
+    }
+
     return 0;
 }

doc/design.svg

@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 139.17125 37.041668"
-   height="140"
-   width="526.00159">
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="marker6660"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path6658" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker6158"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path6156" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Send"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path4694" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker5984"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path5982" />
-    </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker5482"
-       style="overflow:visible">
-      <path
-         id="path5480"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker5472"
-       style="overflow:visible">
-      <path
-         id="path5470"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker5378"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path5376" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker5308"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path5306" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Mend"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path4688" />
-    </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker5170"
-       style="overflow:visible">
-      <path
-         id="path5168"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4963"
-       style="overflow:visible">
-      <path
-         id="path4961"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker6158-2"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path6156-2" />
-    </marker>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-18.388332,-17.864582)"
-     id="layer1">
-    <g
-       id="g4666">
-      <rect
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4607"
-         width="17.197916"
-         height="6.614583"
-         x="18.520834"
-         y="20.510416" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:6.61458302px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="20.968229"
-         y="24.869841"
-         id="text4611"><tspan
-           id="tspan4609"
-           x="20.968229"
-           y="24.869841"
-           style="stroke-width:0.26458332px">Thread 1</tspan></text>
-    </g>
-    <g
-       id="g4661">
-      <rect
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4607-4"
-         width="17.197916"
-         height="6.6145835"
-         x="18.520834"
-         y="32.416668" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:6.61458349px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="20.979254"
-         y="36.776093"
-         id="text4611-8"><tspan
-           id="tspan4609-9"
-           x="20.979254"
-           y="36.776093"
-           style="stroke-width:0.26458332px">Thread 2</tspan></text>
-    </g>
-    <g
-       id="g4671">
-      <rect
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4607-8"
-         width="17.197916"
-         height="6.6145835"
-         x="18.520832"
-         y="44.322918" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:6.61458349px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="20.951002"
-         y="48.682343"
-         id="text4611-89"><tspan
-           id="tspan4609-6"
-           x="20.951002"
-           y="48.682343"
-           style="stroke-width:0.26458332px">Thread 3</tspan></text>
-    </g>
-    <g
-       id="g5096">
-      <ellipse
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4644"
-         cx="67.775978"
-         cy="36.3787"
-         rx="10.583333"
-         ry="4.6302085" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="67.733261"
-         y="35.623535"
-         id="text4648"><tspan
-           id="tspan4646"
-           x="67.733261"
-           y="35.623535"
-           style="text-align:center;text-anchor:middle;stroke-width:0.26458332px">Tracy</tspan><tspan
-           x="67.733261"
-           y="39.151314"
-           style="text-align:center;text-anchor:middle;stroke-width:0.26458332px"
-           id="tspan4650">client</tspan></text>
-    </g>
-    <path
-       id="path4673"
-       d="m 37.041666,24.479166 19.84375,7.937502"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5472)" />
-    <path
-       id="path4675"
-       d="m 37.041666,46.968751 19.84375,-6.614584"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5482)" />
-    <path
-       id="path4677"
-       d="M 37.041667,36.385417 H 55.5625"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5378)" />
-    <path
-       id="path5059"
-       d="M 84.666667,17.864582 V 54.90625"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833327, 2.11666654;stroke-dashoffset:0;stroke-opacity:1" />
-    <g
-       id="g5106">
-      <ellipse
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4644-1"
-         cx="101.98283"
-         cy="36.56768"
-         rx="10.583333"
-         ry="4.6302085" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="101.90772"
-         y="35.812515"
-         id="text4648-2"><tspan
-           id="tspan4646-5"
-           x="101.90772"
-           y="35.812515"
-           style="text-align:center;text-anchor:middle;stroke-width:0.26458332px">Tracy</tspan><tspan
-           x="101.90772"
-           y="39.340294"
-           style="text-align:center;text-anchor:middle;stroke-width:0.26458332px"
-           id="tspan4650-1">server</tspan></text>
-    </g>
-    <path
-       id="path5108"
-       d="M 79.375,37.708333 H 89.958333"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker6660)" />
-    <path
-       id="path5110"
-       d="M 89.958333,35.0625 H 79.375"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5308)" />
-    <g
-       transform="translate(-2.64619,-1.3704153)"
-       id="g6152">
-      <ellipse
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6114"
-         cx="128.98439"
-         cy="33.692333"
-         rx="4.6302085"
-         ry="1.2756696" />
-      <path
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 124.36251,41.677042 c -0.004,0.01582 -0.007,0.03168 -0.008,0.04754 5.3e-4,0.704384 2.07327,1.275328 4.62995,1.275373 2.55689,3.5e-5 4.62988,-0.570931 4.63048,-1.275373 -10e-4,-0.01585 -0.003,-0.03171 -0.006,-0.04754"
-         id="path6114-1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 124.35417,33.739583 v 8.021022"
-         id="path6138" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 133.61458,33.739582 v 8.051744"
-         id="path6140" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:6.61458302px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="126.89217"
-         y="39.409225"
-         id="text6144"><tspan
-           id="tspan6142"
-           x="126.89217"
-           y="39.409225"
-           style="stroke-width:0.26458332px">DB</tspan></text>
-    </g>
-    <path
-       id="path6154"
-       d="m 113.77082,36.385418 h 6.61459"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker6158)" />
-    <g
-       transform="translate(2.6458333,1.2715659e-6)"
-       id="g6241">
-      <rect
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect6232"
-         width="17.197916"
-         height="5.291667"
-         x="137.58333"
-         y="33.739582" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:6.61458302px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="140.8851"
-         y="37.164005"
-         id="text6236"><tspan
-           id="tspan6234"
-           x="140.8851"
-           y="37.164005"
-           style="stroke-width:0.26458332px">Display</tspan></text>
-    </g>
-    <path
-       id="path6154-3"
-       d="m 132.29166,36.385417 h 6.61459"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker6158-2)" />
-  </g>
-</svg>

dtl/Diff.hpp

@@ -0,0 +1,706 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_DIFF_H
+#define DTL_DIFF_H
+
+namespace dtl {
+    
+    /**
+     * diff class template
+     * sequence must support random_access_iterator.
+     */
+    template <typename elem, typename sequence = vector< elem >, typename comparator = Compare< elem > >
+    class Diff
+    {
+    private :
+        dtl_typedefs(elem, sequence)
+        sequence           A;
+        sequence           B;
+        size_t             M;
+        size_t             N;
+        size_t             delta;
+        size_t             offset;
+        long long          *fp;
+        long long          editDistance;
+        Lcs< elem >        lcs;
+        Ses< elem >        ses;
+        editPath           path;
+        editPathCordinates pathCordinates;
+        bool               swapped;
+        bool               huge;
+        bool               trivial;
+        bool               editDistanceOnly;
+        uniHunkVec         uniHunks;
+        comparator         cmp;
+        long long          ox;
+        long long          oy;
+    public :
+        Diff () {}
+        
+        Diff (const sequence& a, 
+              const sequence& b) : A(a), B(b), ses(false) {
+            init();
+        }
+        
+        Diff (const sequence& a,
+              const sequence& b,
+              bool deletesFirst) : A(a), B(b), ses(deletesFirst) {
+            init();
+        }
+        
+        Diff (const sequence& a,
+              const sequence& b, 
+              const comparator& comp) : A(a), B(b), ses(false), cmp(comp) {
+            init();
+        }
+        
+        Diff (const sequence& a, 
+              const sequence& b, 
+              bool deleteFirst,
+              const comparator& comp) : A(a), B(b), ses(deleteFirst), cmp(comp) {
+            init();
+        }
+        
+        ~Diff() {}
+        
+        long long getEditDistance () const {
+            return editDistance;
+        }
+        
+        Lcs< elem > getLcs () const {
+            return lcs;
+        }
+        
+        elemVec getLcsVec () const {
+            return lcs.getSequence();
+        }
+        
+        Ses< elem > getSes () const {
+            return ses;
+        }
+        
+        uniHunkVec getUniHunks () const {
+            return uniHunks;
+        }
+        
+        /* These should be deprecated */
+        bool isHuge () const {
+            return huge;
+        }
+        
+        void onHuge () {
+            this->huge = true;
+        }
+        
+        void offHuge () {
+            this->huge = false;
+        }
+        
+        bool isUnserious () const {
+            return trivial;
+        }
+        
+        void onUnserious () {
+            this->trivial = true;
+        }
+        
+        void offUnserious () {
+            this->trivial = false;
+        }
+        
+        void onOnlyEditDistance () {
+            this->editDistanceOnly = true;
+        }
+        
+        /* These are the replacements for the above */
+        bool hugeEnabled () const {
+            return huge;
+        }
+        
+        void enableHuge () {
+            this->huge = true;
+        }
+        
+        void disableHuge () {
+            this->huge = false;
+        }
+        
+        bool trivialEnabled () const {
+            return trivial;
+        }
+        
+        void enableTrivial () {
+            this->trivial = true;
+        }
+        
+        void disableTrivial () {
+            this->trivial = false;
+        }
+        
+        void editDistanceOnlyEnabled () {
+            this->editDistanceOnly = true;
+        }
+        
+        /**
+         * patching with Unified Format Hunks
+         */
+        sequence uniPatch (const sequence& seq) {
+            elemList        seqLst(seq.begin(), seq.end());
+            sesElemVec      shunk;
+            sesElemVec_iter vsesIt;
+            elemList_iter   lstIt         = seqLst.begin();
+            long long       inc_dec_total = 0;
+            long long       gap           = 1;
+            for (uniHunkVec_iter it=uniHunks.begin();it!=uniHunks.end();++it) {
+                joinSesVec(shunk, it->common[0]);
+                joinSesVec(shunk, it->change);
+                joinSesVec(shunk, it->common[1]);
+                it->a         += inc_dec_total;
+                inc_dec_total += it->inc_dec_count;
+                for (long long i=0;i<it->a - gap;++i) {
+                    ++lstIt;
+                }
+                gap = it->a + it->b + it->inc_dec_count;
+                vsesIt = shunk.begin();
+                while (vsesIt!=shunk.end()) {
+                    switch (vsesIt->second.type) {
+                    case SES_ADD :
+                        seqLst.insert(lstIt, vsesIt->first);
+                        break;
+                    case SES_DELETE :
+                        if (lstIt != seqLst.end()) {
+                            lstIt = seqLst.erase(lstIt);
+                        }
+                        break;
+                    case SES_COMMON :
+                        if (lstIt != seqLst.end()) {
+                            ++lstIt;
+                        }
+                        break;
+                    default :
+                        // no fall-through
+                        break;
+                    }
+                    ++vsesIt;
+                }
+                shunk.clear();
+            }
+            
+            sequence patchedSeq(seqLst.begin(), seqLst.end());
+            return patchedSeq;
+        }
+        
+        /**
+         * patching with Shortest Edit Script (SES)
+         */
+        sequence patch (const sequence& seq) const {
+            sesElemVec    sesSeq = ses.getSequence();
+            elemList      seqLst(seq.begin(), seq.end());
+            elemList_iter lstIt  = seqLst.begin();
+            for (sesElemVec_iter sesIt=sesSeq.begin();sesIt!=sesSeq.end();++sesIt) {
+                switch (sesIt->second.type) {
+                case SES_ADD :
+                    seqLst.insert(lstIt, sesIt->first);
+                    break;
+                case SES_DELETE :
+                    lstIt = seqLst.erase(lstIt);
+                    break;
+                case SES_COMMON :
+                    ++lstIt;
+                    break;
+                default :
+                    // no through
+                    break;
+                }
+            }
+            sequence patchedSeq(seqLst.begin(), seqLst.end());
+            return patchedSeq;
+        }
+        
+        /**
+         * compose Longest Common Subsequence and Shortest Edit Script.
+         * The algorithm implemented here is based on "An O(NP) Sequence Comparison Algorithm"
+         * described by Sun Wu, Udi Manber and Gene Myers
+         */
+        void compose() {
+            
+            if (isHuge()) {
+                pathCordinates.reserve(MAX_CORDINATES_SIZE);
+            }
+            ox = 0;
+            oy = 0;
+            long long p = -1;
+            fp = new long long[M + N + 3];
+            fill(&fp[0], &fp[M + N + 3], -1);
+            path = editPath(M + N + 3);
+            fill(path.begin(), path.end(), -1);
+        ONP:
+            do {
+                ++p;
+                for (long long k=-p;k<=static_cast<long long>(delta)-1;++k) {
+                    fp[k+offset] = snake(k, fp[k-1+offset]+1, fp[k+1+offset]);
+                }
+                for (long long k=static_cast<long long>(delta)+p;k>=static_cast<long long>(delta)+1;--k) {
+                    fp[k+offset] = snake(k, fp[k-1+offset]+1, fp[k+1+offset]);
+                }
+                fp[delta+offset] = snake(static_cast<long long>(delta), fp[delta-1+offset]+1, fp[delta+1+offset]);
+            } while (fp[delta+offset] != static_cast<long long>(N) && pathCordinates.size() < MAX_CORDINATES_SIZE);
+            
+            editDistance += static_cast<long long>(delta) + 2 * p;
+            long long r = path[delta+offset];
+            P cordinate;
+            editPathCordinates epc(0);
+            
+            // recording edit distance only
+            if (editDistanceOnly) {
+                delete[] this->fp;
+                return;
+            }
+            
+            while(r != -1) {
+                cordinate.x = pathCordinates[(size_t)r].x;
+                cordinate.y = pathCordinates[(size_t)r].y;
+                epc.push_back(cordinate);
+                r = pathCordinates[(size_t)r].k;
+            }
+            
+            // record Longest Common Subsequence & Shortest Edit Script
+            if (!recordSequence(epc)) {
+                pathCordinates.resize(0);
+                epc.resize(0);
+                p = -1;
+                goto ONP;
+            }
+            delete[] this->fp;
+        }
+
+        /**
+         * print difference between A and B as an SES
+         */
+        template < typename stream >
+        void printSES (stream& out) const {
+            sesElemVec ses_v = ses.getSequence();
+            for_each(ses_v.begin(), ses_v.end(), ChangePrinter< sesElem, stream >(out));
+        }
+        
+        void printSES (ostream& out = cout) const {
+            printSES< ostream >(out);
+        }
+        
+        /**
+         * print differences given an SES
+         */
+        template < typename stream >
+        static void printSES (const Ses< elem >& s, stream& out) {
+            sesElemVec ses_v = s.getSequence();
+            for_each(ses_v.begin(), ses_v.end(), ChangePrinter< sesElem, stream >(out));
+        }
+        
+        static void printSES (const Ses< elem >& s, ostream& out = cout) {
+            printSES< ostream >(s, out);
+        }
+
+        /**
+         * print difference between A and B as an SES with custom printer
+         */
+        template < typename stream, template < typename SEET, typename STRT > class PT >
+        void printSES (stream& out) const {
+            sesElemVec ses_v = ses.getSequence ();
+            for_each (ses_v.begin (), ses_v.end(), PT < sesElem, stream > (out));
+        }
+
+        /**
+         * store difference between A and B as an SES with custom storage
+         */
+        template < typename storedData, template < typename SEET, typename STRT > class ST >
+        void storeSES(storedData& sd) const {
+            sesElemVec ses_v = ses.getSequence();
+            for_each(ses_v.begin(), ses_v.end(), ST < sesElem, storedData >(sd));
+        }
+        
+        /**
+         * print difference between A and B in the Unified Format
+         */
+        template < typename stream >
+        void printUnifiedFormat (stream& out) const {
+            for_each(uniHunks.begin(), uniHunks.end(), UniHunkPrinter< sesElem, stream >(out));
+        }
+        
+        void printUnifiedFormat (ostream& out = cout) const {
+            printUnifiedFormat< ostream >(out);
+        }
+        
+        /**
+         * print unified format difference with given unified format hunks
+         */
+        template < typename stream >
+        static void printUnifiedFormat (const uniHunkVec& hunks, stream& out) {
+            for_each(hunks.begin(), hunks.end(), UniHunkPrinter< sesElem >(out));
+        }
+
+        static void printUnifiedFormat (const uniHunkVec& hunks, ostream& out = cout) {
+            printUnifiedFormat< ostream >(hunks, out);
+        }
+
+        /**
+         * compose Unified Format Hunks from Shortest Edit Script
+         */
+        void composeUnifiedHunks () {
+            sesElemVec         common[2];
+            sesElemVec         change;
+            sesElemVec         ses_v  = ses.getSequence();
+            long long          l_cnt  = 1;
+            long long          length = distance(ses_v.begin(), ses_v.end());
+            long long          middle = 0;
+            bool               isMiddle, isAfter;
+            elemInfo           einfo;
+            long long          a, b, c, d;        // @@ -a,b +c,d @@
+            long long          inc_dec_count = 0;
+            uniHunk< sesElem > hunk;
+            sesElemVec         adds;
+            sesElemVec         deletes;
+            
+            isMiddle = isAfter = false;
+            a = b = c = d = 0;
+            
+            for (sesElemVec_iter it=ses_v.begin();it!=ses_v.end();++it, ++l_cnt) {
+                einfo = it->second;
+                switch (einfo.type) {
+                case SES_ADD :
+                    middle = 0;
+                    ++inc_dec_count;
+                    adds.push_back(*it);
+                    if (!isMiddle)       isMiddle = true;
+                    if (isMiddle)        ++d;
+                    if (l_cnt >= length) {
+                        joinSesVec(change, deletes);
+                        joinSesVec(change, adds);
+                        isAfter = true;
+                    }
+                    break;
+                case SES_DELETE :
+                    middle = 0;
+                    --inc_dec_count;
+                    deletes.push_back(*it);
+                    if (!isMiddle)       isMiddle = true;
+                    if (isMiddle)        ++b;
+                    if (l_cnt >= length) {
+                        joinSesVec(change, deletes);
+                        joinSesVec(change, adds);
+                        isAfter = true;
+                    }
+                    break;
+                case SES_COMMON :
+                    ++b;++d;
+                    if (common[1].empty() && adds.empty() && deletes.empty() && change.empty()) {
+                        if (static_cast<long long>(common[0].size()) < DTL_CONTEXT_SIZE) {
+                            if (a == 0 && c == 0) {
+                                if (!wasSwapped()) {
+                                    a = einfo.beforeIdx;
+                                    c = einfo.afterIdx;
+                                } else {
+                                    a = einfo.afterIdx;
+                                    c = einfo.beforeIdx;
+                                }
+                            }
+                            common[0].push_back(*it);
+                        } else {
+                            rotate(common[0].begin(), common[0].begin() + 1, common[0].end());
+                            common[0].pop_back();
+                            common[0].push_back(*it);
+                            ++a;++c;
+                            --b;--d;
+                        }
+                    }
+                    if (isMiddle && !isAfter) {
+                        ++middle;
+                        joinSesVec(change, deletes);
+                        joinSesVec(change, adds);
+                        change.push_back(*it);
+                        if (middle >= DTL_SEPARATE_SIZE || l_cnt >= length) {
+                            isAfter = true;
+                        }
+                        adds.clear();
+                        deletes.clear();
+                    }
+                    break;
+                default :
+                    // no through
+                    break;
+                }
+                // compose unified format hunk
+                if (isAfter && !change.empty()) {
+                    sesElemVec_iter cit = it;
+                    long long       cnt = 0;
+                    for (long long i=0;i<DTL_SEPARATE_SIZE && (cit != ses_v.end());++i, ++cit) {
+                        if (cit->second.type == SES_COMMON) {
+                            ++cnt;
+                        }
+                    }
+                    if (cnt < DTL_SEPARATE_SIZE && l_cnt < length) {
+                        middle = 0;
+                        isAfter = false;
+                        continue;
+                    }
+                    if (static_cast<long long>(common[0].size()) >= DTL_SEPARATE_SIZE) {
+                        long long c0size = static_cast<long long>(common[0].size());
+                        rotate(common[0].begin(), 
+                               common[0].begin() + (size_t)c0size - DTL_SEPARATE_SIZE, 
+                               common[0].end());
+                        for (long long i=0;i<c0size - DTL_SEPARATE_SIZE;++i) {
+                            common[0].pop_back();
+                        }
+                        a += c0size - DTL_SEPARATE_SIZE;
+                        c += c0size - DTL_SEPARATE_SIZE;
+                    }
+                    if (a == 0) ++a;
+                    if (c == 0) ++c;
+                    if (wasSwapped()) swap(a, c);
+                    hunk.a = a;
+                    hunk.b = b;
+                    hunk.c = c;
+                    hunk.d = d;
+                    hunk.common[0]     = common[0];
+                    hunk.change        = change;
+                    hunk.common[1]     = common[1];
+                    hunk.inc_dec_count = inc_dec_count;
+                    uniHunks.push_back(hunk);
+                    isMiddle = false;
+                    isAfter  = false;
+                    common[0].clear();
+                    common[1].clear();
+                    adds.clear();
+                    deletes.clear();
+                    change.clear();
+                    a = b = c = d = middle = inc_dec_count = 0;
+                }
+            }
+        }
+        
+        /**
+         * compose ses from stream
+         */
+        template <typename stream>
+        static Ses< elem > composeSesFromStream (stream& st)
+        {
+            elem        line;
+            Ses< elem > ret;
+            long long   x_idx, y_idx;
+            x_idx = y_idx = 1;
+            while (getline(st, line)) {
+                elem mark(line.begin(), line.begin() + 1);
+                elem e(line.begin() + 1, line.end());
+                if (mark == SES_MARK_DELETE) {
+                    ret.addSequence(e, x_idx, 0, SES_DELETE);
+                    ++x_idx;
+                } else if (mark == SES_MARK_ADD) {
+                    ret.addSequence(e, y_idx, 0, SES_ADD);
+                    ++y_idx;
+                } else if (mark == SES_MARK_COMMON) {
+                    ret.addSequence(e, x_idx, y_idx, SES_COMMON);
+                    ++x_idx;
+                    ++y_idx;
+                }
+            }
+            return ret;
+        }
+        
+    private :
+        /**
+         * initialize
+         */
+        void init () {
+            M = distance(A.begin(), A.end());
+            N = distance(B.begin(), B.end());
+            if (M < N) {
+                swapped = false;
+            } else {
+                swap(A, B);
+                swap(M, N);
+                swapped = true;
+            }
+            editDistance     = 0;
+            delta            = N - M;
+            offset           = M + 1;
+            huge             = false;
+            trivial          = false;
+            editDistanceOnly = false;
+            fp               = NULL;
+        }
+        
+        /**
+         * search shortest path and record the path
+         */
+        long long snake(const long long& k, const long long& above, const long long& below) {
+            long long r = above > below ? path[(size_t)k-1+offset] : path[(size_t)k+1+offset];
+            long long y = max(above, below);
+            long long x = y - k;
+            while ((size_t)x < M && (size_t)y < N && (swapped ? cmp.impl(B[(size_t)y], A[(size_t)x]) : cmp.impl(A[(size_t)x], B[(size_t)y]))) {
+                ++x;++y;
+            }
+            
+            path[(size_t)k+offset] = static_cast<long long>(pathCordinates.size());
+            if (!editDistanceOnly) {
+                P p;
+                p.x = x;p.y = y;p.k = r;
+                pathCordinates.push_back(p);      
+            }
+            return y;
+        }
+        
+        /**
+         * record SES and LCS
+         */
+        bool recordSequence (const editPathCordinates& v) {
+            sequence_const_iter x(A.begin());
+            sequence_const_iter y(B.begin());
+            long long           x_idx,  y_idx;  // line number for Unified Format
+            long long           px_idx, py_idx; // cordinates
+            bool                complete = false;
+            x_idx  = y_idx  = 1;
+            px_idx = py_idx = 0;
+            for (size_t i=v.size()-1;!complete;--i) {
+                while(px_idx < v[i].x || py_idx < v[i].y) {
+                    if (v[i].y - v[i].x > py_idx - px_idx) {
+                        if (!wasSwapped()) {
+                            ses.addSequence(*y, 0, y_idx + oy, SES_ADD);
+                        } else {
+                            ses.addSequence(*y, y_idx + oy, 0, SES_DELETE);
+                        }
+                        ++y;
+                        ++y_idx;
+                        ++py_idx;
+                    } else if (v[i].y - v[i].x < py_idx - px_idx) {
+                        if (!wasSwapped()) {
+                            ses.addSequence(*x, x_idx + ox, 0, SES_DELETE);
+                        } else {
+                            ses.addSequence(*x, 0, x_idx + ox, SES_ADD);
+                        }
+                        ++x;
+                        ++x_idx;
+                        ++px_idx;
+                    } else {
+                        if (!wasSwapped()) {
+                            lcs.addSequence(*x);
+                            ses.addSequence(*x, x_idx + ox, y_idx + oy, SES_COMMON);
+                        } else {
+                            lcs.addSequence(*y);
+                            ses.addSequence(*y, y_idx + oy, x_idx + ox, SES_COMMON);
+                        }
+                        ++x;
+                        ++y;
+                        ++x_idx;
+                        ++y_idx;
+                        ++px_idx;
+                        ++py_idx;
+                    }
+                }
+                if (i == 0) complete = true;
+            }
+            
+            if (x_idx > static_cast<long long>(M) && y_idx > static_cast<long long>(N)) {
+                // all recording succeeded
+            } else {
+                // trivial difference
+                if (trivialEnabled()) {
+                    if (!wasSwapped()) {
+                        recordOddSequence(x_idx, M, x, SES_DELETE);
+                        recordOddSequence(y_idx, N, y, SES_ADD);
+                    } else {
+                        recordOddSequence(x_idx, M, x, SES_ADD);
+                        recordOddSequence(y_idx, N, y, SES_DELETE);
+                    }
+                    return true;
+                }
+                
+                // nontrivial difference
+                sequence A_(A.begin() + (size_t)x_idx - 1, A.end());
+                sequence B_(B.begin() + (size_t)y_idx - 1, B.end());
+                A        = A_;
+                B        = B_;
+                M        = distance(A.begin(), A.end());
+                N        = distance(B.begin(), B.end());
+                delta    = N - M;
+                offset   = M + 1;
+                delete[] fp;
+                fp = new long long[M + N + 3];
+                fill(&fp[0], &fp[M + N + 3], -1);
+                fill(path.begin(), path.end(), -1);
+                ox = x_idx - 1;
+                oy = y_idx - 1;
+                return false;
+            }
+            return true;
+        }
+        
+        /**
+         * record odd sequence in SES
+         */
+        void inline recordOddSequence (long long idx, long long length, sequence_const_iter it, const edit_t et) {
+            while(idx < length){
+                ses.addSequence(*it, idx, 0, et);
+                ++it;
+                ++idx;
+                ++editDistance;
+            }
+            ses.addSequence(*it, idx, 0, et);
+            ++editDistance;
+        }
+        
+        /**
+         * join SES vectors
+         */
+        void inline joinSesVec (sesElemVec& s1, sesElemVec& s2) const {
+            if (!s2.empty()) {
+                for (sesElemVec_iter vit=s2.begin();vit!=s2.end();++vit) {
+                    s1.push_back(*vit);
+                }
+            }      
+        }
+        
+        /**
+         * check if the sequences have been swapped
+         */
+        bool inline wasSwapped () const {
+            return swapped;
+        }
+
+    };
+}
+
+#endif // DTL_DIFF_H

dtl/Diff3.hpp

@@ -0,0 +1,245 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_DIFF3_H
+#define DTL_DIFF3_H
+
+namespace dtl {
+    
+    /**
+     * diff3 class template
+     * sequence must support random_access_iterator.
+     */
+    template <typename elem, typename sequence = vector< elem >, typename comparator = Compare< elem > >
+    class Diff3
+    {
+    private:
+        dtl_typedefs(elem, sequence)
+        sequence                           A;
+        sequence                           B;
+        sequence                           C;
+        sequence                           S;
+        Diff< elem, sequence, comparator > diff_ba;
+        Diff< elem, sequence, comparator > diff_bc;
+        bool                               conflict;
+        elem                               csepabegin;
+        elem                               csepa;
+        elem                               csepaend;
+    public :
+        Diff3 () {}
+        Diff3 (const sequence& a, 
+               const sequence& b, 
+               const sequence& c) : A(a), B(b), C(c), 
+                                    diff_ba(b, a), diff_bc(b, c), 
+                                    conflict(false) {} 
+        
+        ~Diff3 () {}
+        
+        bool isConflict () const {
+            return conflict;
+        }
+        
+        sequence getMergedSequence () const {
+            return S;
+        }
+        
+        /**
+         * merge changes B and C into A
+         */
+        bool merge () {
+            if (diff_ba.getEditDistance() == 0) {     // A == B
+                if (diff_bc.getEditDistance() == 0) { // A == B == C
+                    S = B;
+                    return true;
+                }
+                S = C;
+                return true;
+            } else {                                  // A != B
+                if (diff_bc.getEditDistance() == 0) { // A != B == C
+                    S = A;                              
+                    return true;
+                } else {                              // A != B != C
+                    S = merge_();
+                    if (isConflict()) {               // conflict occured
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        
+        /**
+         * compose differences
+         */
+        void compose () {
+            diff_ba.compose();
+            diff_bc.compose();
+        }
+        
+    private :
+        /**
+         * merge implementation
+         */
+        sequence merge_ () {
+            elemVec         seq;
+            Ses< elem >     ses_ba   = diff_ba.getSes();
+            Ses< elem >     ses_bc   = diff_bc.getSes();
+            sesElemVec      ses_ba_v = ses_ba.getSequence();
+            sesElemVec      ses_bc_v = ses_bc.getSequence();
+            sesElemVec_iter ba_it    = ses_ba_v.begin();
+            sesElemVec_iter bc_it    = ses_bc_v.begin();
+            sesElemVec_iter ba_end   = ses_ba_v.end();
+            sesElemVec_iter bc_end   = ses_bc_v.end();
+            
+            while (!isEnd(ba_end, ba_it) || !isEnd(bc_end, bc_it)) {
+                while (true) {
+                    if (!isEnd(ba_end, ba_it)            && 
+                        !isEnd(bc_end, bc_it)            &&
+                        ba_it->first == bc_it->first     && 
+                        ba_it->second.type == SES_COMMON && 
+                        bc_it->second.type == SES_COMMON) {
+                        // do nothing
+                    } else {
+                        break;
+                    }
+                    if      (!isEnd(ba_end, ba_it)) seq.push_back(ba_it->first);
+                    else if (!isEnd(bc_end, bc_it)) seq.push_back(bc_it->first);
+                    forwardUntilEnd(ba_end, ba_it);
+                    forwardUntilEnd(bc_end, bc_it);
+                }
+                if (isEnd(ba_end, ba_it) || isEnd(bc_end, bc_it)) break;
+                if (   ba_it->second.type == SES_COMMON 
+                       && bc_it->second.type == SES_DELETE) {
+                    forwardUntilEnd(ba_end, ba_it);
+                    forwardUntilEnd(bc_end, bc_it);
+                } else if (ba_it->second.type == SES_COMMON && 
+                           bc_it->second.type == SES_ADD) {
+                    seq.push_back(bc_it->first);
+                    forwardUntilEnd(bc_end, bc_it);
+                } else if (ba_it->second.type == SES_DELETE && 
+                           bc_it->second.type == SES_COMMON) {
+                    forwardUntilEnd(ba_end, ba_it);
+                    forwardUntilEnd(bc_end, bc_it);
+                } else if (ba_it->second.type == SES_DELETE && 
+                           bc_it->second.type == SES_DELETE) {
+                    if (ba_it->first == bc_it->first) {
+                        forwardUntilEnd(ba_end, ba_it);
+                        forwardUntilEnd(bc_end, bc_it);
+                    } else {
+                        // conflict
+                        conflict = true;
+                        return B;
+                    }
+                } else if (ba_it->second.type == SES_DELETE && 
+                           bc_it->second.type == SES_ADD) {
+                    // conflict
+                    conflict = true;
+                    return B;
+                } else if (ba_it->second.type == SES_ADD && 
+                           bc_it->second.type == SES_COMMON) {
+                    seq.push_back(ba_it->first);
+                    forwardUntilEnd(ba_end, ba_it);
+                } else if (ba_it->second.type == SES_ADD && 
+                           bc_it->second.type == SES_DELETE) {
+                    // conflict
+                    conflict = true;
+                    return B;
+                } else if (ba_it->second.type == SES_ADD && 
+                           bc_it->second.type == SES_ADD) {
+                    if (ba_it->first == bc_it->first) {
+                        seq.push_back(ba_it->first);
+                        forwardUntilEnd(ba_end, ba_it);
+                        forwardUntilEnd(bc_end, bc_it);
+                    } else {
+                        // conflict
+                        conflict = true;
+                        return B;
+                    }
+                }
+            }
+            
+            if (isEnd(ba_end, ba_it)) {
+                addDecentSequence(bc_end, bc_it, seq);
+            } else if (isEnd(bc_end, bc_it)) {
+                addDecentSequence(ba_end, ba_it, seq);
+            }
+            
+            sequence mergedSeq(seq.begin(), seq.end());
+            return mergedSeq;
+        }
+        
+        /**
+         * join elem vectors
+         */
+        void inline joinElemVec (elemVec& s1, elemVec& s2) const {
+            if (!s2.empty()) {
+                for (elemVec_iter vit=s2.begin();vit!=s2.end();++vit) {
+                    s1.push_back(*vit);
+                }
+            }
+        }
+        
+        /**
+         * check if sequence is at end
+         */
+        template <typename T_iter>
+        bool inline isEnd (const T_iter& end, const T_iter& it) const {
+            return it == end ? true : false;
+        }
+        
+        /**
+         * increment iterator until iterator is at end
+         */
+        template <typename T_iter>
+        void inline forwardUntilEnd (const T_iter& end, T_iter& it) const {
+            if (!isEnd(end, it)) ++it;
+        }
+        
+        /**
+         * add elements whose SES's type is ADD
+         */
+        void inline addDecentSequence (const sesElemVec_iter& end, sesElemVec_iter& it, elemVec& seq) const {
+            while (!isEnd(end, it)) {
+                if (it->second.type == SES_ADD) seq.push_back(it->first);
+                ++it;
+            }      
+        }
+        
+    };
+}
+
+#endif // DTL_DIFF3_H

dtl/Lcs.hpp

@@ -0,0 +1,55 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_LCS_H
+#define DTL_LCS_H
+
+namespace dtl {
+    
+    /**
+     * Longest Common Subsequence template class
+     */
+    template <typename elem>
+    class Lcs : public Sequence< elem >
+    {
+    public :
+        Lcs ()  {}
+        ~Lcs () {}
+    };
+}
+
+#endif // DTL_LCS_H

dtl/Sequence.hpp

@@ -0,0 +1,65 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_SEQUENCE_H
+#define DTL_SEQUENCE_H
+
+namespace dtl {
+    
+    /**  
+     * sequence class template
+     */
+    template <typename elem>
+    class Sequence
+    {
+    public :
+        typedef vector< elem > elemVec;
+        Sequence () {}
+        virtual ~Sequence () {}
+        
+        elemVec getSequence () const {
+            return sequence;
+        }
+        void addSequence (elem e) {
+            sequence.push_back(e);
+        }
+    protected :
+        elemVec sequence;
+    };
+}
+
+#endif // DTL_SEQUENCE_H

dtl/Ses.hpp

@@ -0,0 +1,132 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_SES_H
+#define DTL_SES_H
+
+namespace dtl {
+    
+    /**
+     * Shortest Edit Script template class
+     */
+    template <typename elem>
+    class Ses : public Sequence< elem >
+    {
+    private :
+        typedef pair< elem, elemInfo > sesElem;
+        typedef vector< sesElem >      sesElemVec;
+    public :
+        
+        Ses () : onlyAdd(true), onlyDelete(true), onlyCopy(true), deletesFirst(false) {
+            nextDeleteIdx = 0;
+        }
+        Ses (bool moveDel) : onlyAdd(true), onlyDelete(true), onlyCopy(true), deletesFirst(moveDel) {
+            nextDeleteIdx = 0;
+        }
+        ~Ses () {}
+        
+        bool isOnlyAdd () const {
+            return onlyAdd;
+        }
+        
+        bool isOnlyDelete () const {
+            return onlyDelete;
+        }
+        
+        bool isOnlyCopy () const {
+            return onlyCopy;
+        }
+        
+        bool isOnlyOneOperation () const {
+            return isOnlyAdd() || isOnlyDelete() || isOnlyCopy();
+        }
+        
+        bool isChange () const {
+            return !onlyCopy;
+        }
+        
+        using Sequence< elem >::addSequence;
+        void addSequence (elem e, long long beforeIdx, long long afterIdx, const edit_t type) {
+            elemInfo info;
+            info.beforeIdx = beforeIdx;
+            info.afterIdx  = afterIdx;
+            info.type      = type;
+            sesElem pe(e, info);
+            if (!deletesFirst) {
+                sequence.push_back(pe);
+            }
+            switch (type) {
+            case SES_DELETE:
+                onlyCopy   = false;
+                onlyAdd    = false;
+                if (deletesFirst) {
+                    sequence.insert(sequence.begin() + nextDeleteIdx, pe);
+                    nextDeleteIdx++;
+                }
+                break;
+            case SES_COMMON:
+                onlyAdd    = false;
+                onlyDelete = false;
+                if (deletesFirst) {
+                    sequence.push_back(pe);
+                    nextDeleteIdx = sequence.size();
+                }
+                break;
+            case SES_ADD:
+                onlyDelete = false;
+                onlyCopy   = false;
+                if (deletesFirst) {
+                    sequence.push_back(pe);
+                }
+                break;
+            }
+        }
+        
+        sesElemVec getSequence () const {
+            return sequence;
+        }
+    private :
+        sesElemVec sequence;
+        bool       onlyAdd;
+        bool       onlyDelete;
+        bool       onlyCopy;
+        bool       deletesFirst;
+        size_t     nextDeleteIdx;
+    };
+}
+
+#endif // DTL_SES_H

dtl/dtl.hpp

@@ -0,0 +1,47 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+#ifndef DTL_H
+#define DTL_H
+
+#include "variables.hpp"
+#include "functors.hpp"
+#include "Sequence.hpp"
+#include "Lcs.hpp"
+#include "Ses.hpp"
+#include "Diff.hpp"
+#include "Diff3.hpp"
+
+#endif // DTL_H

dtl/functors.hpp

@@ -0,0 +1,151 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_FUNCTORS_H
+#define DTL_FUNCTORS_H
+
+namespace dtl {
+    
+    /**
+     * printer class template
+     */
+    template <typename sesElem, typename stream = ostream >
+    class Printer
+    {
+    public :
+        Printer ()            : out_(cout) {}
+        Printer (stream& out) : out_(out)  {}
+        virtual ~Printer () {}
+        virtual void operator() (const sesElem& se) const = 0;
+    protected :
+        stream& out_;
+    };
+    
+    /**
+     * common element printer class template
+     */
+    template <typename sesElem, typename stream = ostream >
+    class CommonPrinter : public Printer < sesElem, stream >
+    {
+    public :
+        CommonPrinter  ()            : Printer < sesElem, stream > ()    {}
+        CommonPrinter  (stream& out) : Printer < sesElem, stream > (out) {}
+        ~CommonPrinter () {}
+        void operator() (const sesElem& se) const {
+            this->out_ << SES_MARK_COMMON << se.first << endl;    
+        }
+    };
+    
+    /**
+     * ses element printer class template
+     */
+    template <typename sesElem, typename stream = ostream >
+    class ChangePrinter : public Printer < sesElem, stream >
+    {
+    public :
+        ChangePrinter  ()            : Printer < sesElem, stream > ()    {}
+        ChangePrinter  (stream& out) : Printer < sesElem, stream > (out) {}
+        ~ChangePrinter () {}
+        void operator() (const sesElem& se) const {
+            switch (se.second.type) {
+            case SES_ADD:
+                this->out_ << SES_MARK_ADD    << se.first << endl;
+                break;
+            case SES_DELETE:
+                this->out_ << SES_MARK_DELETE << se.first << endl;
+                break;
+            case SES_COMMON:
+                this->out_ << SES_MARK_COMMON << se.first << endl;
+                break;
+            }
+        }
+    };
+    
+    /**
+     * unified format element printer class template
+     */
+    template <typename sesElem, typename stream = ostream >
+    class UniHunkPrinter
+    {
+    public :
+        UniHunkPrinter  ()            : out_(cout) {}
+        UniHunkPrinter  (stream& out) : out_(out)  {}
+        ~UniHunkPrinter () {}
+        void operator() (const uniHunk< sesElem >& hunk) const {
+            out_ << "@@"
+                 << " -"  << hunk.a << "," << hunk.b
+                 << " +"  << hunk.c << "," << hunk.d
+                 << " @@" << endl;
+            
+            for_each(hunk.common[0].begin(), hunk.common[0].end(), CommonPrinter< sesElem, stream >(out_));
+            for_each(hunk.change.begin(),    hunk.change.end(),    ChangePrinter< sesElem, stream >(out_));
+            for_each(hunk.common[1].begin(), hunk.common[1].end(), CommonPrinter< sesElem, stream >(out_));
+        }
+    private :
+        stream& out_;
+    };
+
+    /**
+     * storage class template
+     */
+    template <typename sesElem, typename storedData >
+    class Storage
+    {
+    public:
+        Storage(storedData& sd) : storedData_(sd) {}
+        virtual ~Storage() {}
+        virtual void operator() (const sesElem& se) const = 0;
+    protected:
+        storedData& storedData_;
+    };
+    
+    /**
+     * compare class template
+     */
+    template <typename elem>
+    class Compare
+    {
+    public :
+        Compare () {}
+        virtual ~Compare () {}
+        virtual inline bool impl (const elem& e1, const elem& e2) const {
+            return e1 == e2;
+        }
+    };
+}
+
+#endif // DTL_FUNCTORS_H

dtl/variables.hpp

@@ -0,0 +1,142 @@
+/**
+   dtl -- Diff Template Library
+   
+   In short, Diff Template Library is distributed under so called "BSD license",
+   
+   Copyright (c) 2015 Tatsuhiko Kubo <cubicdaiya@gmail.com>
+   All rights reserved.
+   
+   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.
+   
+   * Neither the name of the authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+   
+   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.
+*/
+
+/* If you use this library, you must include dtl.hpp only. */
+
+#ifndef DTL_VARIABLES_H
+#define DTL_VARIABLES_H
+
+#include <vector>
+#include <list>
+#include <string>
+#include <algorithm>
+#include <iostream>
+
+namespace dtl {
+    
+    using std::vector;
+    using std::string;
+    using std::pair;
+    using std::ostream;
+    using std::list;
+    using std::for_each;
+    using std::distance;
+    using std::fill;
+    using std::cout;
+    using std::endl;
+    using std::rotate;
+    using std::swap;
+    using std::max;
+
+    /**
+     * version string
+     */
+    const string version = "1.20";
+
+    /**
+     * type of edit for SES
+     */
+    typedef int edit_t;
+    const   edit_t SES_DELETE = -1;
+    const   edit_t SES_COMMON = 0;
+    const   edit_t SES_ADD    = 1;
+    
+    /**
+     * mark of SES
+     */
+#define SES_MARK_DELETE "-"
+#define SES_MARK_COMMON " "
+#define SES_MARK_ADD    "+"
+
+    /**
+     * info for Unified Format
+     */
+    typedef struct eleminfo {
+        long long beforeIdx;           // index of prev sequence
+        long long afterIdx;            // index of after sequence
+        edit_t    type;                // type of edit(Add, Delete, Common)
+        bool operator==(const eleminfo& other) const{
+            return (this->beforeIdx == other.beforeIdx && this->afterIdx == other.afterIdx && this->type == other.type);
+        }
+    } elemInfo;
+    
+    const long long DTL_SEPARATE_SIZE = 3;
+    const long long DTL_CONTEXT_SIZE  = 3;
+    
+    /**
+     * cordinate for registering route
+     */
+    typedef struct Point {
+        long long x;                         // x cordinate
+        long long y;                         // y cordinate
+        long long k;                         // vertex
+    } P;
+    
+    /**
+     * limit of cordinate size
+     */
+    const unsigned long long MAX_CORDINATES_SIZE = 2000000;
+    
+    typedef vector< long long > editPath;
+    typedef vector< P >         editPathCordinates;
+    
+    /**
+     * Structure of Unified Format Hunk
+     */
+    template <typename sesElem>
+    struct uniHunk {
+        long long a, b, c, d;        // @@ -a,b +c,d @@
+        vector< sesElem > common[2]; // anteroposterior commons on changes
+        vector< sesElem > change;    // changes
+        long long inc_dec_count;     // count of increace and decrease
+    };
+
+#define dtl_typedefs(elem, sequence)                                    \
+    typedef pair< elem, elemInfo >            sesElem;                  \
+    typedef vector< sesElem >                 sesElemVec;               \
+    typedef vector< uniHunk< sesElem > >      uniHunkVec;               \
+    typedef list< elem >                      elemList;                 \
+    typedef vector< elem >                    elemVec;                  \
+    typedef typename uniHunkVec::iterator     uniHunkVec_iter;          \
+    typedef typename sesElemVec::iterator     sesElemVec_iter;          \
+    typedef typename elemList::iterator       elemList_iter;            \
+    typedef typename sequence::iterator       sequence_iter;            \
+    typedef typename sequence::const_iterator sequence_const_iter;      \
+    typedef typename elemVec::iterator        elemVec_iter;
+
+
+} 
+
+#endif // DTL_VARIABLES_H

examples/OpenCLVectorAdd/CMakeLists.txt

@@ -9,9 +9,9 @@ find_package(OpenCL REQUIRED)
 
 add_executable(OpenCLVectorAdd OpenCLVectorAdd.cpp)
 
-add_library(TracyClient STATIC ../../TracyClient.cpp
-                               ../../TracyOpenCL.hpp)
-target_include_directories(TracyClient PUBLIC ../../)
+add_library(TracyClient STATIC ../../public/TracyClient.cpp
+                               ../../public/tracy/TracyOpenCL.hpp)
+target_include_directories(TracyClient PUBLIC ../../public/tracy)
 target_compile_definitions(TracyClient PUBLIC TRACY_ENABLE=1)
 
 target_link_libraries(OpenCLVectorAdd PUBLIC OpenCL::OpenCL TracyClient ${CMAKE_DL_LIBS} Threads::Threads)

examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp

@@ -1,9 +1,9 @@
-#include <algorithm>
 #include <iostream>
 #include <cassert>
 #include <string>
 #include <vector>
 #include <numeric>
+#include <math.h>
 
 #include <CL/cl.h>
 

examples/ToyPathTracer/Source/Test.cpp

@@ -8,7 +8,7 @@
 #endif
 #include <atomic>
 
-#include "../../../Tracy.hpp"
+#include "../../../public/tracy/Tracy.hpp"
 
 // 46 spheres (2 emissive) when enabled; 9 spheres (1 emissive) when disabled
 #define DO_BIG_SCENE 1

examples/ToyPathTracer/Windows/TestCpu.vcxproj

@@ -161,7 +161,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\TracyClient.cpp" />
+    <ClCompile Include="..\..\..\public\TracyClient.cpp" />
     <ClCompile Include="..\Source\enkiTS\TaskScheduler.cpp" />
     <ClCompile Include="..\Source\enkiTS\TaskScheduler_c.cpp" />
     <ClCompile Include="..\Source\Maths.cpp" />

examples/ToyPathTracer/Windows/TestCpu.vcxproj.filters

@@ -14,7 +14,7 @@
     <ClCompile Include="..\Source\Maths.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\TracyClient.cpp" />
+    <ClCompile Include="..\..\..\public\TracyClient.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source">

examples/ToyPathTracer/Windows/TestWin.cpp

@@ -15,8 +15,8 @@
 #include "CompiledVertexShader.h"
 #include "CompiledPixelShader.h"
 
-#include "../../../Tracy.hpp"
-#include "../../../TracyD3D11.hpp"
+#include "../../../public/tracy/Tracy.hpp"
+#include "../../../public/tracy/TracyD3D11.hpp"
 
 static HINSTANCE g_HInstance;
 static HWND g_Wnd;

examples/fibers.cpp

@@ -1,10 +1,10 @@
-// g++ fibers.cpp ../TracyClient.cpp -DTRACY_ENABLE -DTRACY_FIBERS -lpthread -ldl
+// g++ fibers.cpp ../public/TracyClient.cpp -I../public/tracy -DTRACY_ENABLE -DTRACY_FIBERS -lpthread -ldl
 
 #include <thread>
 #include <unistd.h>
 
-#include "../Tracy.hpp"
-#include "../TracyC.h"
+#include "Tracy.hpp"
+#include "TracyC.h"
 
 const char* fiber = "job1";
 TracyCZoneCtx zone;

extra/desktop/application-tracy.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/tracy">
+        <comment>Tracy Profiler trace file</comment>
+        <comment xml:lang="pl">Zrzut sesji profilera Tracy</comment>
+        <icon name="application-tracy"/>
+        <magic>
+            <match type="string" value="tlZ\x04" offset="0"/>
+            <match type="string" value="tZst" offset="0"/>
+            <match type="string" value="tr\xFDP" offset="0"/>
+        </magic>
+        <glob pattern="*.tracy"/>
+    </mime-type>
+</mime-info>

extra/desktop/tracy.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Tracy Profiler
+GenericName=Code profiler
+GenericName[pl]=Profiler kodu
+Comment=Examine code to see where it is slow
+Comment[pl]=Znajdowanie wolno wykonującego się kodu
+Exec=/usr/bin/tracy %f
+Icon=tracy
+Terminal=false
+Categories=Development;Profiling;
+MimeType=application/tracy;

extra/git-ref.py

@@ -0,0 +1,30 @@
+#!/bin/env python3
+
+import filecmp
+import subprocess
+import sys
+import os
+
+out = "GitRef.hpp"
+tmp = f"{out}.tmp"
+
+if len(sys.argv) > 1:
+    rev = sys.argv[1]
+else:
+    rev = "HEAD"
+
+try:
+    ref = subprocess.run(["git", "rev-parse", "--short", rev], check=True, capture_output=True).stdout.decode().strip()
+except subprocess.CalledProcessError:
+    ref = "unknown"
+
+if not os.path.exists(out):
+    with open(out, "w") as f:
+        print(f"#pragma once\n\nnamespace tracy {{ static inline const char* GitRef = \"{ref}\"; }}", file=f)
+else:
+    with open(tmp, "w") as f:
+        print(f"#pragma once\n\nnamespace tracy {{ static inline const char* GitRef = \"{ref}\"; }}", file=f)
+    if not filecmp.cmp(out, tmp, shallow=False):
+        os.replace(tmp, out)
+    else:
+        os.unlink(tmp)

extra/identify.cpp

@@ -1,11 +1,11 @@
-// g++ identify.cpp -lpthread ../common/tracy_lz4.cpp ../zstd/common/*.c ../zstd/decompress/*.c
+// g++ identify.cpp -lpthread ../public/common/tracy_lz4.cpp ../zstd/common/*.c ../zstd/decompress/*.c ../zstd/decompress/huf_decompress_amd64.S
 
 #include <memory>
 #include <stdint.h>
 #include <stdio.h>
 
 #include "../server/TracyFileRead.hpp"
-#include "../server/TracyVersion.hpp"
+#include "../public/common/TracyVersion.hpp"
 
 static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch };
 enum { FileHeaderMagic = 5 };

extra/make-build.sh

@@ -3,6 +3,8 @@
 rm -rf tracy-build
 mkdir tracy-build
 
+./update-meson-version.sh
+
 if [ ! -f vswhere.exe ]; then
     wget https://github.com/microsoft/vswhere/releases/download/2.8.4/vswhere.exe
 fi

extra/natvis.py

@@ -0,0 +1,154 @@
+import lldb
+
+def VectorSummary(value, dict):
+    v = value.GetNonSyntheticValue()
+    size = v.GetChildMemberWithName('m_size').GetValueAsUnsigned()
+    capacityVal = v.GetChildMemberWithName('m_capacity').GetValueAsUnsigned()
+    capacity = 1 << capacityVal if capacityVal < 63 else 'read-only'
+    magic = bool(v.GetChildMemberWithName('m_magic').GetValueAsUnsigned())
+    return f'{{size={size}, capacity={capacity}, magic={magic}}}'
+
+def ShortPtrSummary(value, dict):
+    val = value.GetNonSyntheticValue()
+    ptr = val.GetChildMemberWithName('m_ptr')
+    type = val.GetType().GetTemplateArgumentType(0)
+    p0 = ptr.GetChildAtIndex(0).GetValueAsUnsigned()
+    p1 = ptr.GetChildAtIndex(1).GetValueAsUnsigned()
+    p2 = ptr.GetChildAtIndex(2).GetValueAsUnsigned()
+    p3 = ptr.GetChildAtIndex(3).GetValueAsUnsigned()
+    p4 = ptr.GetChildAtIndex(4).GetValueAsUnsigned()
+    p5 = ptr.GetChildAtIndex(5).GetValueAsUnsigned()
+    #return '0x{0:02x}{1:02x}{2:02x}{3:02x}{4:02x}{5:02x}'.format(p5, p4, p3, p2, p1, p0)
+    return value.CreateValueFromAddress('m_ptr', p0 | (p1 << 8) | (p2 << 16) | (p3 << 24) | (p4 << 32) | (p5 << 40), type)
+
+class ShortPtrPrinter:
+    def __init__(self, val, dict):
+        self.val = val
+        self.type = self.val.GetType().GetTemplateArgumentType(0)
+
+    def update(self):
+        ptr = self.val.GetChildMemberWithName('m_ptr')
+        p0 = ptr.GetChildAtIndex(0).GetValueAsUnsigned()
+        p1 = ptr.GetChildAtIndex(1).GetValueAsUnsigned()
+        p2 = ptr.GetChildAtIndex(2).GetValueAsUnsigned()
+        p3 = ptr.GetChildAtIndex(3).GetValueAsUnsigned()
+        p4 = ptr.GetChildAtIndex(4).GetValueAsUnsigned()
+        p5 = ptr.GetChildAtIndex(5).GetValueAsUnsigned()
+        self.ptr = p0 | (p1 << 8) | (p2 << 16) | (p3 << 24) | (p4 << 32) | (p5 << 40)
+
+    def num_children(self):
+        return 1
+
+    def get_child_index(self, name):
+        return int(name.lstrip('[').rstrip(']'))
+
+    def get_child_at_index(self, index):
+        return self.val.CreateValueFromAddress('m_ptr', self.ptr, self.type)
+
+class VectorPrinter:
+    def __init__(self, val, dict):
+        self.val = val
+        self.magic = bool(val.GetChildMemberWithName('m_magic').GetValueAsUnsigned())
+        if self.magic:
+            self.type = val.GetType().GetTemplateArgumentType(0).GetTemplateArgumentType(0)
+        else:
+            self.type = val.GetType().GetTemplateArgumentType(0)
+        self.stride = self.type.GetByteSize()
+
+    def update(self):
+        ptr = self.val.GetChildMemberWithName('m_ptr').GetChildMemberWithName('m_ptr')
+        p0 = ptr.GetChildAtIndex(0).GetValueAsUnsigned()
+        p1 = ptr.GetChildAtIndex(1).GetValueAsUnsigned()
+        p2 = ptr.GetChildAtIndex(2).GetValueAsUnsigned()
+        p3 = ptr.GetChildAtIndex(3).GetValueAsUnsigned()
+        p4 = ptr.GetChildAtIndex(4).GetValueAsUnsigned()
+        p5 = ptr.GetChildAtIndex(5).GetValueAsUnsigned()
+        self.ptr = p0 | (p1 << 8) | (p2 << 16) | (p3 << 24) | (p4 << 32) | (p5 << 40)
+        self.size = self.val.GetChildMemberWithName('m_size').GetValueAsUnsigned()
+
+    def num_children(self):
+        return self.size
+
+    def get_child_index(self, name):
+        return int(name.lstrip('[').rstrip(']'))
+
+    def get_child_at_index(self, index):
+        return self.val.CreateValueFromAddress('[%d]' % index, self.ptr + index * self.stride, self.type)
+
+def Int24Summary(value, dict):
+    val = value.GetNonSyntheticValue().GetChildMemberWithName('m_val')
+    p0 = val.GetChildAtIndex(0).GetValueAsUnsigned()
+    p1 = val.GetChildAtIndex(1).GetValueAsUnsigned()
+    p2 = val.GetChildAtIndex(2).GetValueAsUnsigned()
+    return p0 | (p1 << 8) | (p2 << 16)
+
+def Int48Summary(value, dict):
+    val = value.GetNonSyntheticValue().GetChildMemberWithName('m_val')
+    p0 = val.GetChildAtIndex(0).GetValueAsUnsigned()
+    p1 = val.GetChildAtIndex(1).GetValueAsUnsigned()
+    p2 = val.GetChildAtIndex(2).GetValueAsUnsigned()
+    p3 = val.GetChildAtIndex(3).GetValueAsUnsigned()
+    p4 = val.GetChildAtIndex(4).GetValueAsUnsigned()
+    p5 = val.GetChildAtIndex(5).GetValueAsUnsigned()
+    return p0 | (p1 << 8) | (p2 << 16) | (p3 << 24) | (p4 << 32) | (p5 << 40)
+
+class ZoneEventPrinter:
+    def __init__(self, val, dict):
+        self.val = val
+
+    def update(self):
+        _start_srcloc = self.val.GetChildMemberWithName('_start_srcloc').GetValueAsUnsigned()
+        _child2 = self.val.GetChildMemberWithName('_child2').GetValueAsUnsigned()
+        _end_child1 = self.val.GetChildMemberWithName('_end_child1').GetValueAsUnsigned()
+        self.extra = self.val.GetChildMemberWithName('extra').GetValueAsUnsigned()
+        self.start = _start_srcloc >> 16
+        self.end = _end_child1 >> 16
+        self.srcloc = _start_srcloc & 0xffff
+        self.child = ((_end_child1 & 0xffff) << 16) | _child2
+
+    def num_children(self):
+        return 5
+
+    def get_child_index(self, name):
+        if name == 'start':
+            return 0
+        if name == 'end':
+            return 1
+        if name == 'srcloc':
+            return 2
+        if name == 'child':
+            return 3
+        if name == 'extra':
+            return 4
+        return -1
+
+    def get_child_at_index(self, index):
+        if index == 0:
+            return self.val.CreateValueFromExpression('start', f'int64_t x = {self.start}; x')
+        if index == 1:
+            return self.val.CreateValueFromExpression('end', f'int64_t x = {self.end}; x')
+        if index == 2:
+            return self.val.CreateValueFromExpression('srcloc', f'int16_t x = {self.srcloc}; x')
+        if index == 3:
+            return self.val.CreateValueFromExpression('child', f'int32_t x = {self.child}; x')
+        if index == 4:
+            return self.val.CreateValueFromExpression('extra', f'uint32_t x = {self.extra}; x')
+
+def RobinHoodSummary(value, dict):
+    val = value.GetNonSyntheticValue()
+    size = val.GetChildMemberWithName('mNumElements').GetValueAsUnsigned()
+    mask = val.GetChildMemberWithName('mMask').GetValueAsUnsigned()
+    return f'{{size={size}, load={float(size) / (mask+1)}}}'
+
+def __lldb_init_module(debugger, dict):
+    lldb.formatters.Logger._lldb_formatters_debug_level = 2
+    debugger.HandleCommand('type summary add -w tracy -F natvis.VectorSummary -x ^tracy::Vector<.+>')
+    debugger.HandleCommand('type summary add -w tracy -F natvis.ShortPtrSummary -x ^tracy::short_ptr<.+>')
+    debugger.HandleCommand('type summary add -w tracy -F natvis.Int24Summary -x ^tracy::Int24')
+    debugger.HandleCommand('type summary add -w tracy -F natvis.Int48Summary -x ^tracy::Int48')
+    debugger.HandleCommand('type summary add -w tracy -F natvis.RobinHoodSummary -x ^tracy::detail::Table<.*>')
+    debugger.HandleCommand('type synthetic add -w tracy -l natvis.VectorPrinter -x ^tracy::Vector<.+>')
+    debugger.HandleCommand('type synthetic add -w tracy -l natvis.ShortPtrPrinter -x ^tracy::short_ptr<.+>')
+    debugger.HandleCommand('type synthetic add -w tracy -l natvis.ZoneEventPrinter -x ^tracy::ZoneEvent')
+    debugger.HandleCommand('type summary add -w tracy -x ^tracy::ZoneEvent --summary-string "start = ${var.start}, end = ${var.end}, srcloc = ${var.srcloc}, child = ${var.child}, extra = ${var.extra}"')
+    debugger.HandleCommand('type category enable tracy')

extra/systrace/build.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# These may be passed as environment variables, or will use the following defaults.
-: ${CC:=clang}
-: ${STRIP:=strip}
-: ${SSTRIP:=sstrip}
-
-if [ ! -x "$(command -v "${CC}")" ]
-then
-  echo "Set the CC environment variable to a C compiler."
-  exit 1
-fi
-
-if [ ! -x "$(command -v "${STRIP}")" ]
-then
-  echo "Set the STRIP environment variable to the strip utility."
-  exit 1
-fi
-
-if [ ! -x "$(command -v "${SSTRIP}")" ]
-then
-  echo "Set the SSTRIP environment variable to the sstrip utility, which can be obtained from https://github.com/BR903/ELFkickers ."
-  exit 1
-fi
-
-$CC tracy_systrace.c -s -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -fno-stack-protector -Wl,-z,norelro -Wl,--build-id=none -nostdlib -ldl -o tracy_systrace
-
-$STRIP --strip-all -R .note.gnu.gold-version -R .comment -R .note -R .note.gnu.build-id -R .note.ABI-tag -R .eh_frame -R .eh_frame_hdr -R .gnu.version -R .got tracy_systrace
-
-$SSTRIP -z tracy_systrace
-

extra/systrace/tracy_systrace.c

@@ -1,65 +0,0 @@
-#include <fcntl.h>
-#include <poll.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <dlfcn.h>
-
-enum { BufSize = 64*1024 };
-
-typedef int (*open_t)( const char*, int, ... );
-typedef void (*exit_t)( int );
-typedef int (*poll_t)( struct pollfd*, nfds_t, int timeout );
-typedef int (*nanosleep_t)( const struct timespec*, struct timespec* );
-typedef ssize_t (*read_t)( int, void*, size_t );
-typedef ssize_t (*write_t)( int, const void*, size_t );
-
-void _start()
-{
-    void* libc = dlopen( "libc.so", RTLD_LAZY );
-
-    open_t sym_open = dlsym( libc, "open" );
-    exit_t sym_exit = dlsym( libc, "exit" );
-    poll_t sym_poll = dlsym( libc, "poll" );
-    nanosleep_t sym_nanosleep = dlsym( libc, "nanosleep" );
-    read_t sym_read = dlsym( libc, "read" );
-    write_t sym_write = dlsym( libc, "write" );
-
-    char buf[BufSize];
-
-    int kernelFd = sym_open( "/sys/kernel/debug/tracing/trace_pipe", O_RDONLY );
-    if( kernelFd < 0 ) sym_exit( 0 );
-
-    struct pollfd pfd_in;
-    pfd_in.fd = kernelFd;
-    pfd_in.events = POLLIN | POLLERR;
-
-    struct pollfd pfd_out;
-    pfd_out.fd = STDOUT_FILENO;
-    pfd_out.events = POLLERR;
-
-    struct timespec sleepTime;
-    sleepTime.tv_sec = 0;
-    sleepTime.tv_nsec = 1000 * 1000 * 10;
-
-    // While the pipe is open (no POLLERR on the output fd)
-    while( sym_poll( &pfd_out, 1, 0) <= 0 )
-    {
-        // If there is neither data (POLLIN) nor an error (POLLERR) on
-        // the read fd, sleep. This implements a blocking read without relying
-        // on the Linux kernel's implementation of blocking reads which causes
-        // a large number of context switches.
-        if( sym_poll( &pfd_in, 1, 0 ) <= 0 ) {
-            sym_nanosleep( &sleepTime, NULL );
-            continue;  // go back to the while condition polling the output fd
-        }
-        const ssize_t rd = sym_read( kernelFd, buf, BufSize );
-        if( rd <= 0 ) break;
-        sym_write( STDOUT_FILENO, buf, rd );
-    }
-
-    sym_exit( 0 );
-}

extra/update-meson-version.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+version_header="../public/common/TracyVersion.hpp"
+
+major=$(grep -o -E 'Major = [0-9]+' "$version_header" | awk -F '= ' '{print $2}')
+minor=$(grep -o -E 'Minor = [0-9]+' "$version_header" | awk -F '= ' '{print $2}')
+patch=$(grep -o -E 'Patch = [0-9]+' "$version_header" | awk -F '= ' '{print $2}')
+
+version="${major}.${minor}.${patch}"
+
+# the extension is required for macOS's outdated sed
+sed -i.bak "s/version: '[0-9]*\.[0-9]*\.[0-9]*'/version: '$version'/g" ../meson.build
+rm ../meson.build.bak

extra/version.cpp

@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #include "../server/TracyFileHeader.hpp"
-#include "../server/TracyVersion.hpp"
+#include "../public/common/TracyVersion.hpp"
 
 int main()
 {

extra/zigzag.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666665 8.4666666"
+   version="1.1"
+   id="svg5"
+   inkscape:export-filename="zigzag.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:docname="zigzag.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="px"
+     showgrid="true"
+     showguides="true"
+     inkscape:zoom="26.808186"
+     inkscape:cx="14.603748"
+     inkscape:cy="18.893483"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid132"
+       originx="0"
+       originy="0" />
+    <sodipodi:guide
+       position="3.7041666,4.2333333"
+       orientation="0,-1"
+       id="guide742"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="4.2333333,4.2333333"
+       orientation="1,0"
+       id="guide744"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Warstwa 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none;paint-order:normal;stroke-dashoffset:0"
+       d="M -0.79374999,5.0270833 2.1166666,2.1166666 6.3499999,6.3499999 9.2604166,3.4395833"
+       id="path800" />
+  </g>
+</svg>

getopt/getopt.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012-2017, Kim Grasman <kim.grasman@gmail.com>
+ * Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -159,6 +159,7 @@ 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;
 
@@ -175,6 +176,16 @@ 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;

getopt/getopt.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012-2017, Kim Grasman <kim.grasman@gmail.com>
+ * Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without