diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 509c37b2..be512f84 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -88,12 +88,12 @@ - - - - - + + + + + @@ -133,18 +133,22 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/capture/build/win32/capture.vcxproj.filters b/capture/build/win32/capture.vcxproj.filters index 1c8f4ef0..52cd9f73 100644 --- a/capture/build/win32/capture.vcxproj.filters +++ b/capture/build/win32/capture.vcxproj.filters @@ -30,15 +30,6 @@ - - common - - - common - - - common - server @@ -48,9 +39,6 @@ src - - common - server @@ -156,35 +144,23 @@ zstd\dictBuilder - + + common + + + common + + + common + + + common + + common - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - server @@ -209,12 +185,6 @@ server - - common - - - common - server @@ -341,15 +311,57 @@ zstd - - common - zstd\common zstd\compress + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + diff --git a/capture/src/capture.cpp b/capture/src/capture.cpp index 528d3fc6..c74e0d24 100644 --- a/capture/src/capture.cpp +++ b/capture/src/capture.cpp @@ -16,8 +16,8 @@ #include #include -#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" diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 0a187883..b4adbf68 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -88,12 +88,12 @@ - - - - - + + + + + @@ -133,18 +133,22 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/csvexport/build/win32/csvexport.vcxproj.filters b/csvexport/build/win32/csvexport.vcxproj.filters index e4ec3fb8..7112601f 100644 --- a/csvexport/build/win32/csvexport.vcxproj.filters +++ b/csvexport/build/win32/csvexport.vcxproj.filters @@ -30,24 +30,12 @@ - - common - - - common - - - common - server server - - common - server @@ -156,35 +144,23 @@ zstd\dictBuilder - + + common + + + common + + + common + + + common + + common - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - server @@ -209,12 +185,6 @@ server - - common - - - common - server @@ -341,15 +311,57 @@ zstd\dictBuilder - - common - zstd\common zstd\compress + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + diff --git a/examples/OpenCLVectorAdd/CMakeLists.txt b/examples/OpenCLVectorAdd/CMakeLists.txt index 71d0d595..e9820133 100644 --- a/examples/OpenCLVectorAdd/CMakeLists.txt +++ b/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) diff --git a/examples/ToyPathTracer/Source/Test.cpp b/examples/ToyPathTracer/Source/Test.cpp index 910e009c..bf4a02f9 100644 --- a/examples/ToyPathTracer/Source/Test.cpp +++ b/examples/ToyPathTracer/Source/Test.cpp @@ -8,7 +8,7 @@ #endif #include -#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 diff --git a/examples/ToyPathTracer/Windows/TestCpu.vcxproj b/examples/ToyPathTracer/Windows/TestCpu.vcxproj index 7b15efc5..c71cccf9 100644 --- a/examples/ToyPathTracer/Windows/TestCpu.vcxproj +++ b/examples/ToyPathTracer/Windows/TestCpu.vcxproj @@ -161,7 +161,7 @@ - + diff --git a/examples/ToyPathTracer/Windows/TestCpu.vcxproj.filters b/examples/ToyPathTracer/Windows/TestCpu.vcxproj.filters index a0806d4a..f447ce77 100644 --- a/examples/ToyPathTracer/Windows/TestCpu.vcxproj.filters +++ b/examples/ToyPathTracer/Windows/TestCpu.vcxproj.filters @@ -14,7 +14,7 @@ Source - + diff --git a/examples/ToyPathTracer/Windows/TestWin.cpp b/examples/ToyPathTracer/Windows/TestWin.cpp index c6796b90..bfb4ad42 100644 --- a/examples/ToyPathTracer/Windows/TestWin.cpp +++ b/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; diff --git a/examples/fibers.cpp b/examples/fibers.cpp index 6e3dbb5f..f416c14c 100644 --- a/examples/fibers.cpp +++ b/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 #include -#include "../Tracy.hpp" -#include "../TracyC.h" +#include "Tracy.hpp" +#include "TracyC.h" const char* fiber = "job1"; TracyCZoneCtx zone; diff --git a/extra/identify.cpp b/extra/identify.cpp index 6b14463f..6d29f348 100644 --- a/extra/identify.cpp +++ b/extra/identify.cpp @@ -1,4 +1,4 @@ -// g++ identify.cpp -lpthread ../common/tracy_lz4.cpp ../zstd/common/*.c ../zstd/decompress/*.c ../zstd/decompress/huf_decompress_amd64.S +// g++ identify.cpp -lpthread ../public/common/tracy_lz4.cpp ../zstd/common/*.c ../zstd/decompress/*.c ../zstd/decompress/huf_decompress_amd64.S #include #include diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index ec6e5bdd..058a2aa3 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -88,11 +88,11 @@ - - - - - + + + + + @@ -131,17 +131,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/import-chrome/build/win32/import-chrome.vcxproj.filters b/import-chrome/build/win32/import-chrome.vcxproj.filters index 29b8c632..23301549 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj.filters +++ b/import-chrome/build/win32/import-chrome.vcxproj.filters @@ -27,15 +27,6 @@ - - common - - - common - - - common - server @@ -45,9 +36,6 @@ src - - common - server @@ -147,35 +135,23 @@ zstd\dictBuilder - + + common + + + common + + + common + + + common + + common - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - server @@ -200,12 +176,6 @@ server - - common - - - common - server @@ -326,15 +296,57 @@ zstd\dictBuilder - - common - zstd\common zstd\compress + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + diff --git a/library/unix/build.mk b/library/unix/build.mk index 77345971..9fa7c538 100644 --- a/library/unix/build.mk +++ b/library/unix/build.mk @@ -7,6 +7,6 @@ PROJECT := libtracy IMAGE := $(PROJECT)-$(BUILD).so SHARED_LIBRARY := yes -SRC := ../../TracyClient.cpp +SRC := ../../public/TracyClient.cpp include ../../common/unix.mk diff --git a/library/win32/TracyProfiler.vcxproj b/library/win32/TracyProfiler.vcxproj index 38747d10..aee58cb1 100644 --- a/library/win32/TracyProfiler.vcxproj +++ b/library/win32/TracyProfiler.vcxproj @@ -27,7 +27,7 @@ - + 16.0 diff --git a/library/win32/TracyProfiler.vcxproj.filters b/library/win32/TracyProfiler.vcxproj.filters index 124f58f2..12862807 100644 --- a/library/win32/TracyProfiler.vcxproj.filters +++ b/library/win32/TracyProfiler.vcxproj.filters @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 038814b7..15a2a3ec 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -106,11 +106,6 @@ - - - - - @@ -118,6 +113,11 @@ + + + + + @@ -208,17 +208,6 @@ - - - - - - - - - - - @@ -227,6 +216,21 @@ + + + + + + + + + + + + + + + diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index 25d76d91..b121b8bf 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -36,15 +36,6 @@ - - common - - - common - - - common - server @@ -69,9 +60,6 @@ src - - common - server @@ -234,9 +222,6 @@ zstd\dictBuilder - - common - server @@ -327,23 +312,23 @@ server + + common + + + common + + + common + + + common + + + common + - - common - - - common - - - common - - - common - - - common - server @@ -374,18 +359,12 @@ server - - common - server server - - common - server @@ -395,9 +374,6 @@ server - - common - src @@ -425,9 +401,6 @@ server - - common - server @@ -632,12 +605,6 @@ zstd\dictBuilder - - common - - - common - server @@ -662,6 +629,51 @@ server + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + diff --git a/profiler/src/HttpRequest.cpp b/profiler/src/HttpRequest.cpp index 30f21615..245bb586 100644 --- a/profiler/src/HttpRequest.cpp +++ b/profiler/src/HttpRequest.cpp @@ -3,7 +3,7 @@ #include #include -#include "../common/TracySocket.hpp" +#include "../public/common/TracySocket.hpp" #include "../server/TracyVersion.hpp" #include "HttpRequest.hpp" diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp index 332bfa27..59d88834 100644 --- a/profiler/src/main.cpp +++ b/profiler/src/main.cpp @@ -30,7 +30,7 @@ #define STBI_ONLY_PNG #include "stb_image.h" -#include "../../common/TracyProtocol.hpp" +#include "../../public/common/TracyProtocol.hpp" #include "../../server/tracy_pdqsort.h" #include "../../server/tracy_robin_hood.h" #include "../../server/TracyBadVersion.hpp" diff --git a/TracyClient.cpp b/public/TracyClient.cpp similarity index 100% rename from TracyClient.cpp rename to public/TracyClient.cpp diff --git a/client/TracyAlloc.cpp b/public/client/TracyAlloc.cpp similarity index 100% rename from client/TracyAlloc.cpp rename to public/client/TracyAlloc.cpp diff --git a/client/TracyArmCpuTable.hpp b/public/client/TracyArmCpuTable.hpp similarity index 100% rename from client/TracyArmCpuTable.hpp rename to public/client/TracyArmCpuTable.hpp diff --git a/client/TracyCallstack.cpp b/public/client/TracyCallstack.cpp similarity index 100% rename from client/TracyCallstack.cpp rename to public/client/TracyCallstack.cpp diff --git a/client/TracyCallstack.h b/public/client/TracyCallstack.h similarity index 100% rename from client/TracyCallstack.h rename to public/client/TracyCallstack.h diff --git a/client/TracyCallstack.hpp b/public/client/TracyCallstack.hpp similarity index 100% rename from client/TracyCallstack.hpp rename to public/client/TracyCallstack.hpp diff --git a/client/TracyDebug.hpp b/public/client/TracyDebug.hpp similarity index 100% rename from client/TracyDebug.hpp rename to public/client/TracyDebug.hpp diff --git a/client/TracyDxt1.cpp b/public/client/TracyDxt1.cpp similarity index 100% rename from client/TracyDxt1.cpp rename to public/client/TracyDxt1.cpp diff --git a/client/TracyDxt1.hpp b/public/client/TracyDxt1.hpp similarity index 100% rename from client/TracyDxt1.hpp rename to public/client/TracyDxt1.hpp diff --git a/client/TracyFastVector.hpp b/public/client/TracyFastVector.hpp similarity index 100% rename from client/TracyFastVector.hpp rename to public/client/TracyFastVector.hpp diff --git a/client/TracyLock.hpp b/public/client/TracyLock.hpp similarity index 100% rename from client/TracyLock.hpp rename to public/client/TracyLock.hpp diff --git a/client/TracyProfiler.cpp b/public/client/TracyProfiler.cpp similarity index 99% rename from client/TracyProfiler.cpp rename to public/client/TracyProfiler.cpp index 2f898aba..e3a8fb34 100644 --- a/client/TracyProfiler.cpp +++ b/public/client/TracyProfiler.cpp @@ -69,7 +69,7 @@ #include "TracyThread.hpp" #include "TracyArmCpuTable.hpp" #include "TracySysTrace.hpp" -#include "../TracyC.h" +#include "../tracy/TracyC.h" #ifdef TRACY_PORT # ifndef TRACY_DATA_PORT diff --git a/client/TracyProfiler.hpp b/public/client/TracyProfiler.hpp similarity index 100% rename from client/TracyProfiler.hpp rename to public/client/TracyProfiler.hpp diff --git a/client/TracyRingBuffer.hpp b/public/client/TracyRingBuffer.hpp similarity index 100% rename from client/TracyRingBuffer.hpp rename to public/client/TracyRingBuffer.hpp diff --git a/client/TracyScoped.hpp b/public/client/TracyScoped.hpp similarity index 100% rename from client/TracyScoped.hpp rename to public/client/TracyScoped.hpp diff --git a/client/TracyStringHelpers.hpp b/public/client/TracyStringHelpers.hpp similarity index 100% rename from client/TracyStringHelpers.hpp rename to public/client/TracyStringHelpers.hpp diff --git a/client/TracySysTime.cpp b/public/client/TracySysTime.cpp similarity index 100% rename from client/TracySysTime.cpp rename to public/client/TracySysTime.cpp diff --git a/client/TracySysTime.hpp b/public/client/TracySysTime.hpp similarity index 100% rename from client/TracySysTime.hpp rename to public/client/TracySysTime.hpp diff --git a/client/TracySysTrace.cpp b/public/client/TracySysTrace.cpp similarity index 100% rename from client/TracySysTrace.cpp rename to public/client/TracySysTrace.cpp diff --git a/client/TracySysTrace.hpp b/public/client/TracySysTrace.hpp similarity index 100% rename from client/TracySysTrace.hpp rename to public/client/TracySysTrace.hpp diff --git a/client/TracyThread.hpp b/public/client/TracyThread.hpp similarity index 100% rename from client/TracyThread.hpp rename to public/client/TracyThread.hpp diff --git a/client/tracy_SPSCQueue.h b/public/client/tracy_SPSCQueue.h similarity index 100% rename from client/tracy_SPSCQueue.h rename to public/client/tracy_SPSCQueue.h diff --git a/client/tracy_concurrentqueue.h b/public/client/tracy_concurrentqueue.h similarity index 100% rename from client/tracy_concurrentqueue.h rename to public/client/tracy_concurrentqueue.h diff --git a/client/tracy_rpmalloc.cpp b/public/client/tracy_rpmalloc.cpp similarity index 100% rename from client/tracy_rpmalloc.cpp rename to public/client/tracy_rpmalloc.cpp diff --git a/client/tracy_rpmalloc.hpp b/public/client/tracy_rpmalloc.hpp similarity index 100% rename from client/tracy_rpmalloc.hpp rename to public/client/tracy_rpmalloc.hpp diff --git a/common/TracyAlign.hpp b/public/common/TracyAlign.hpp similarity index 100% rename from common/TracyAlign.hpp rename to public/common/TracyAlign.hpp diff --git a/common/TracyAlloc.hpp b/public/common/TracyAlloc.hpp similarity index 100% rename from common/TracyAlloc.hpp rename to public/common/TracyAlloc.hpp diff --git a/common/TracyApi.h b/public/common/TracyApi.h similarity index 100% rename from common/TracyApi.h rename to public/common/TracyApi.h diff --git a/common/TracyColor.hpp b/public/common/TracyColor.hpp similarity index 100% rename from common/TracyColor.hpp rename to public/common/TracyColor.hpp diff --git a/common/TracyForceInline.hpp b/public/common/TracyForceInline.hpp similarity index 100% rename from common/TracyForceInline.hpp rename to public/common/TracyForceInline.hpp diff --git a/common/TracyMutex.hpp b/public/common/TracyMutex.hpp similarity index 100% rename from common/TracyMutex.hpp rename to public/common/TracyMutex.hpp diff --git a/common/TracyProtocol.hpp b/public/common/TracyProtocol.hpp similarity index 100% rename from common/TracyProtocol.hpp rename to public/common/TracyProtocol.hpp diff --git a/common/TracyQueue.hpp b/public/common/TracyQueue.hpp similarity index 100% rename from common/TracyQueue.hpp rename to public/common/TracyQueue.hpp diff --git a/common/TracySocket.cpp b/public/common/TracySocket.cpp similarity index 100% rename from common/TracySocket.cpp rename to public/common/TracySocket.cpp diff --git a/common/TracySocket.hpp b/public/common/TracySocket.hpp similarity index 100% rename from common/TracySocket.hpp rename to public/common/TracySocket.hpp diff --git a/common/TracyStackFrames.cpp b/public/common/TracyStackFrames.cpp similarity index 100% rename from common/TracyStackFrames.cpp rename to public/common/TracyStackFrames.cpp diff --git a/common/TracyStackFrames.hpp b/public/common/TracyStackFrames.hpp similarity index 100% rename from common/TracyStackFrames.hpp rename to public/common/TracyStackFrames.hpp diff --git a/common/TracySystem.cpp b/public/common/TracySystem.cpp similarity index 100% rename from common/TracySystem.cpp rename to public/common/TracySystem.cpp diff --git a/common/TracySystem.hpp b/public/common/TracySystem.hpp similarity index 100% rename from common/TracySystem.hpp rename to public/common/TracySystem.hpp diff --git a/common/TracyUwp.hpp b/public/common/TracyUwp.hpp similarity index 100% rename from common/TracyUwp.hpp rename to public/common/TracyUwp.hpp diff --git a/common/TracyYield.hpp b/public/common/TracyYield.hpp similarity index 100% rename from common/TracyYield.hpp rename to public/common/TracyYield.hpp diff --git a/common/tracy_lz4.cpp b/public/common/tracy_lz4.cpp similarity index 100% rename from common/tracy_lz4.cpp rename to public/common/tracy_lz4.cpp diff --git a/common/tracy_lz4.hpp b/public/common/tracy_lz4.hpp similarity index 100% rename from common/tracy_lz4.hpp rename to public/common/tracy_lz4.hpp diff --git a/common/tracy_lz4hc.cpp b/public/common/tracy_lz4hc.cpp similarity index 100% rename from common/tracy_lz4hc.cpp rename to public/common/tracy_lz4hc.cpp diff --git a/common/tracy_lz4hc.hpp b/public/common/tracy_lz4hc.hpp similarity index 100% rename from common/tracy_lz4hc.hpp rename to public/common/tracy_lz4hc.hpp diff --git a/libbacktrace/LICENSE b/public/libbacktrace/LICENSE similarity index 100% rename from libbacktrace/LICENSE rename to public/libbacktrace/LICENSE diff --git a/libbacktrace/alloc.cpp b/public/libbacktrace/alloc.cpp similarity index 100% rename from libbacktrace/alloc.cpp rename to public/libbacktrace/alloc.cpp diff --git a/libbacktrace/backtrace.hpp b/public/libbacktrace/backtrace.hpp similarity index 100% rename from libbacktrace/backtrace.hpp rename to public/libbacktrace/backtrace.hpp diff --git a/libbacktrace/config.h b/public/libbacktrace/config.h similarity index 100% rename from libbacktrace/config.h rename to public/libbacktrace/config.h diff --git a/libbacktrace/dwarf.cpp b/public/libbacktrace/dwarf.cpp similarity index 100% rename from libbacktrace/dwarf.cpp rename to public/libbacktrace/dwarf.cpp diff --git a/libbacktrace/elf.cpp b/public/libbacktrace/elf.cpp similarity index 100% rename from libbacktrace/elf.cpp rename to public/libbacktrace/elf.cpp diff --git a/libbacktrace/fileline.cpp b/public/libbacktrace/fileline.cpp similarity index 100% rename from libbacktrace/fileline.cpp rename to public/libbacktrace/fileline.cpp diff --git a/libbacktrace/filenames.hpp b/public/libbacktrace/filenames.hpp similarity index 100% rename from libbacktrace/filenames.hpp rename to public/libbacktrace/filenames.hpp diff --git a/libbacktrace/internal.hpp b/public/libbacktrace/internal.hpp similarity index 100% rename from libbacktrace/internal.hpp rename to public/libbacktrace/internal.hpp diff --git a/libbacktrace/macho.cpp b/public/libbacktrace/macho.cpp similarity index 100% rename from libbacktrace/macho.cpp rename to public/libbacktrace/macho.cpp diff --git a/libbacktrace/mmapio.cpp b/public/libbacktrace/mmapio.cpp similarity index 100% rename from libbacktrace/mmapio.cpp rename to public/libbacktrace/mmapio.cpp diff --git a/libbacktrace/posix.cpp b/public/libbacktrace/posix.cpp similarity index 100% rename from libbacktrace/posix.cpp rename to public/libbacktrace/posix.cpp diff --git a/libbacktrace/sort.cpp b/public/libbacktrace/sort.cpp similarity index 100% rename from libbacktrace/sort.cpp rename to public/libbacktrace/sort.cpp diff --git a/libbacktrace/state.cpp b/public/libbacktrace/state.cpp similarity index 100% rename from libbacktrace/state.cpp rename to public/libbacktrace/state.cpp diff --git a/Tracy.hpp b/public/tracy/Tracy.hpp similarity index 98% rename from Tracy.hpp rename to public/tracy/Tracy.hpp index 86c62cc8..3f838c78 100644 --- a/Tracy.hpp +++ b/public/tracy/Tracy.hpp @@ -1,8 +1,8 @@ #ifndef __TRACY_HPP__ #define __TRACY_HPP__ -#include "common/TracyColor.hpp" -#include "common/TracySystem.hpp" +#include "../common/TracyColor.hpp" +#include "../common/TracySystem.hpp" #ifndef TRACY_ENABLE @@ -104,9 +104,9 @@ #include -#include "client/TracyLock.hpp" -#include "client/TracyProfiler.hpp" -#include "client/TracyScoped.hpp" +#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 ) diff --git a/TracyC.h b/public/tracy/TracyC.h similarity index 99% rename from TracyC.h rename to public/tracy/TracyC.h index 24616068..ffcca5a1 100644 --- a/TracyC.h +++ b/public/tracy/TracyC.h @@ -4,8 +4,8 @@ #include #include -#include "client/TracyCallstack.h" -#include "common/TracyApi.h" +#include "../client/TracyCallstack.h" +#include "../common/TracyApi.h" #ifdef __cplusplus extern "C" { diff --git a/TracyD3D11.hpp b/public/tracy/TracyD3D11.hpp similarity index 99% rename from TracyD3D11.hpp rename to public/tracy/TracyD3D11.hpp index 8552f36f..75d93bf2 100644 --- a/TracyD3D11.hpp +++ b/public/tracy/TracyD3D11.hpp @@ -37,10 +37,10 @@ using TracyD3D11Ctx = void*; #include #include "Tracy.hpp" -#include "client/TracyProfiler.hpp" -#include "client/TracyCallstack.hpp" -#include "common/TracyAlign.hpp" -#include "common/TracyAlloc.hpp" +#include "../client/TracyProfiler.hpp" +#include "../client/TracyCallstack.hpp" +#include "../common/TracyAlign.hpp" +#include "../common/TracyAlloc.hpp" namespace tracy { diff --git a/TracyD3D12.hpp b/public/tracy/TracyD3D12.hpp similarity index 99% rename from TracyD3D12.hpp rename to public/tracy/TracyD3D12.hpp index 1276b9e6..47d8074f 100644 --- a/TracyD3D12.hpp +++ b/public/tracy/TracyD3D12.hpp @@ -33,8 +33,8 @@ using TracyD3D12Ctx = void*; #else #include "Tracy.hpp" -#include "client/TracyProfiler.hpp" -#include "client/TracyCallstack.hpp" +#include "../client/TracyProfiler.hpp" +#include "../client/TracyCallstack.hpp" #include #include diff --git a/TracyLua.hpp b/public/tracy/TracyLua.hpp similarity index 98% rename from TracyLua.hpp rename to public/tracy/TracyLua.hpp index c9a64313..6ee2e308 100644 --- a/TracyLua.hpp +++ b/public/tracy/TracyLua.hpp @@ -127,11 +127,11 @@ static inline void LuaRemove( char* script ) #include #include -#include "common/TracyColor.hpp" -#include "common/TracyAlign.hpp" -#include "common/TracyForceInline.hpp" -#include "common/TracySystem.hpp" -#include "client/TracyProfiler.hpp" +#include "../common/TracyColor.hpp" +#include "../common/TracyAlign.hpp" +#include "../common/TracyForceInline.hpp" +#include "../common/TracySystem.hpp" +#include "../client/TracyProfiler.hpp" namespace tracy { diff --git a/TracyOpenCL.hpp b/public/tracy/TracyOpenCL.hpp similarity index 99% rename from TracyOpenCL.hpp rename to public/tracy/TracyOpenCL.hpp index 3891e8ae..c13471a8 100644 --- a/TracyOpenCL.hpp +++ b/public/tracy/TracyOpenCL.hpp @@ -40,9 +40,9 @@ using TracyCLCtx = void*; #include #include "Tracy.hpp" -#include "client/TracyCallstack.hpp" -#include "client/TracyProfiler.hpp" -#include "common/TracyAlloc.hpp" +#include "../client/TracyCallstack.hpp" +#include "../client/TracyProfiler.hpp" +#include "../common/TracyAlloc.hpp" #define TRACY_CL_TO_STRING_INDIRECT(T) #T #define TRACY_CL_TO_STRING(T) TRACY_CL_TO_STRING_INDIRECT(T) diff --git a/TracyOpenGL.hpp b/public/tracy/TracyOpenGL.hpp similarity index 98% rename from TracyOpenGL.hpp rename to public/tracy/TracyOpenGL.hpp index d540422b..68b4cf44 100644 --- a/TracyOpenGL.hpp +++ b/public/tracy/TracyOpenGL.hpp @@ -36,10 +36,10 @@ public: #include #include "Tracy.hpp" -#include "client/TracyProfiler.hpp" -#include "client/TracyCallstack.hpp" -#include "common/TracyAlign.hpp" -#include "common/TracyAlloc.hpp" +#include "../client/TracyProfiler.hpp" +#include "../client/TracyCallstack.hpp" +#include "../common/TracyAlign.hpp" +#include "../common/TracyAlloc.hpp" #if !defined GL_TIMESTAMP && defined GL_TIMESTAMP_EXT # define GL_TIMESTAMP GL_TIMESTAMP_EXT diff --git a/TracyVulkan.hpp b/public/tracy/TracyVulkan.hpp similarity index 99% rename from TracyVulkan.hpp rename to public/tracy/TracyVulkan.hpp index 447f9736..351d4f19 100644 --- a/TracyVulkan.hpp +++ b/public/tracy/TracyVulkan.hpp @@ -36,8 +36,8 @@ using TracyVkCtx = void*; #include #include #include "Tracy.hpp" -#include "client/TracyProfiler.hpp" -#include "client/TracyCallstack.hpp" +#include "../client/TracyProfiler.hpp" +#include "../client/TracyCallstack.hpp" namespace tracy { diff --git a/server/TracyBadVersion.hpp b/server/TracyBadVersion.hpp index c0454282..1d89d6a7 100644 --- a/server/TracyBadVersion.hpp +++ b/server/TracyBadVersion.hpp @@ -1,7 +1,7 @@ #ifndef __TRACYBADVERSION_HPP__ #define __TRACYBADVERSION_HPP__ -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" struct ImFont; diff --git a/server/TracyColor.hpp b/server/TracyColor.hpp index 6dfad6dd..3fcc7468 100644 --- a/server/TracyColor.hpp +++ b/server/TracyColor.hpp @@ -4,7 +4,7 @@ #include #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracyDecayValue.hpp b/server/TracyDecayValue.hpp index 479cbfd1..15df5d4e 100644 --- a/server/TracyDecayValue.hpp +++ b/server/TracyDecayValue.hpp @@ -1,7 +1,7 @@ #ifndef __TRACYDECAYVALUE_HPP__ #define __TRACYDECAYVALUE_HPP__ -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp index 56c7df07..3c83bf30 100644 --- a/server/TracyEvent.hpp +++ b/server/TracyEvent.hpp @@ -12,8 +12,8 @@ #include "TracySortedVector.hpp" #include "TracyVector.hpp" #include "tracy_robin_hood.h" -#include "../common/TracyForceInline.hpp" -#include "../common/TracyQueue.hpp" +#include "../public/common/TracyForceInline.hpp" +#include "../public/common/TracyQueue.hpp" namespace tracy { diff --git a/server/TracyFileHeader.hpp b/server/TracyFileHeader.hpp index a9f3d27f..efb2bb20 100644 --- a/server/TracyFileHeader.hpp +++ b/server/TracyFileHeader.hpp @@ -3,7 +3,7 @@ #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracyFileRead.hpp b/server/TracyFileRead.hpp index 382553c2..d43c167c 100644 --- a/server/TracyFileRead.hpp +++ b/server/TracyFileRead.hpp @@ -22,9 +22,9 @@ #include "TracyFileHeader.hpp" #include "TracyMmap.hpp" -#include "../common/TracyYield.hpp" -#include "../common/tracy_lz4.hpp" -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyYield.hpp" +#include "../public/common/tracy_lz4.hpp" +#include "../public/common/TracyForceInline.hpp" #include "../zstd/zstd.h" namespace tracy diff --git a/server/TracyFileWrite.hpp b/server/TracyFileWrite.hpp index 099ab88a..bf247185 100644 --- a/server/TracyFileWrite.hpp +++ b/server/TracyFileWrite.hpp @@ -12,9 +12,9 @@ #include #include "TracyFileHeader.hpp" -#include "../common/tracy_lz4.hpp" -#include "../common/tracy_lz4hc.hpp" -#include "../common/TracyForceInline.hpp" +#include "../public/common/tracy_lz4.hpp" +#include "../public/common/tracy_lz4hc.hpp" +#include "../public/common/TracyForceInline.hpp" #include "../zstd/zstd.h" namespace tracy diff --git a/server/TracyImGui.hpp b/server/TracyImGui.hpp index 3808e143..1fd49544 100644 --- a/server/TracyImGui.hpp +++ b/server/TracyImGui.hpp @@ -11,7 +11,7 @@ #include "imgui.h" #include "imgui_internal.h" -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include "IconsFontAwesome5.h" #if !IMGUI_DEFINE_MATH_OPERATORS diff --git a/server/TracyPrint.hpp b/server/TracyPrint.hpp index 5f785a2f..d38245e3 100644 --- a/server/TracyPrint.hpp +++ b/server/TracyPrint.hpp @@ -27,7 +27,7 @@ #include #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracyShortPtr.hpp b/server/TracyShortPtr.hpp index 30f78516..a1c542c8 100644 --- a/server/TracyShortPtr.hpp +++ b/server/TracyShortPtr.hpp @@ -5,7 +5,7 @@ #include #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracySlab.hpp b/server/TracySlab.hpp index 58277fb0..26274c8c 100644 --- a/server/TracySlab.hpp +++ b/server/TracySlab.hpp @@ -6,7 +6,7 @@ #include #include "TracyMemory.hpp" -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" namespace tracy { diff --git a/server/TracySourceView.hpp b/server/TracySourceView.hpp index 4f20d550..26f80f5d 100644 --- a/server/TracySourceView.hpp +++ b/server/TracySourceView.hpp @@ -10,8 +10,8 @@ #include "TracyDecayValue.hpp" #include "TracySourceContents.hpp" #include "TracySourceTokenizer.hpp" -#include "../common/TracyForceInline.hpp" -#include "../common/TracyProtocol.hpp" +#include "../public/common/TracyForceInline.hpp" +#include "../public/common/TracyProtocol.hpp" struct ImFont; struct ImVec2; diff --git a/server/TracyStringDiscovery.hpp b/server/TracyStringDiscovery.hpp index 6b280c01..f2e281ea 100644 --- a/server/TracyStringDiscovery.hpp +++ b/server/TracyStringDiscovery.hpp @@ -1,7 +1,7 @@ #ifndef __TRACYSTRINGDISCOVERY_HPP__ #define __TRACYSTRINGDISCOVERY_HPP__ -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include "tracy_robin_hood.h" #include "TracyCharUtil.hpp" #include "TracyEvent.hpp" diff --git a/server/TracyThreadCompress.hpp b/server/TracyThreadCompress.hpp index 69886738..b3600316 100644 --- a/server/TracyThreadCompress.hpp +++ b/server/TracyThreadCompress.hpp @@ -4,7 +4,7 @@ #include #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include "tracy_robin_hood.h" #include "TracyVector.hpp" diff --git a/server/TracyVarArray.hpp b/server/TracyVarArray.hpp index 2302a8cd..c2b5704b 100644 --- a/server/TracyVarArray.hpp +++ b/server/TracyVarArray.hpp @@ -7,7 +7,7 @@ #define XXH_INLINE_ALL #include "tracy_xxhash.h" -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include "TracyCharUtil.hpp" #include "TracyEvent.hpp" #include "TracyMemory.hpp" diff --git a/server/TracyVector.hpp b/server/TracyVector.hpp index 5eaa54f9..4d71e5f0 100644 --- a/server/TracyVector.hpp +++ b/server/TracyVector.hpp @@ -8,7 +8,7 @@ #include #include -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include "TracyMemory.hpp" #include "TracyPopcnt.hpp" #include "TracyShortPtr.hpp" diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 87516de6..10b1a3e9 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -20,7 +20,7 @@ #include "TracySourceView.hpp" #include "TracyTexture.hpp" #include "TracyView.hpp" -#include "../common/TracyStackFrames.hpp" +#include "../public/common/TracyStackFrames.hpp" #include "imgui_internal.h" diff --git a/server/TracyView_Callstack.cpp b/server/TracyView_Callstack.cpp index de085dad..2dd259b4 100644 --- a/server/TracyView_Callstack.cpp +++ b/server/TracyView_Callstack.cpp @@ -1,7 +1,7 @@ #include #include -#include "../common/TracyStackFrames.hpp" +#include "../public/common/TracyStackFrames.hpp" #include "TracyImGui.hpp" #include "TracyPrint.hpp" #include "TracyView.hpp" diff --git a/server/TracyView_FindZone.cpp b/server/TracyView_FindZone.cpp index 66f1bbfb..8394cb90 100644 --- a/server/TracyView_FindZone.cpp +++ b/server/TracyView_FindZone.cpp @@ -2,7 +2,7 @@ #include "imgui.h" -#include "../common/TracyStackFrames.hpp" +#include "../public/common/TracyStackFrames.hpp" #include "TracyFilesystem.hpp" #include "TracyImGui.hpp" #include "TracyMouse.hpp" diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 8810f0fe..c1c45144 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -24,10 +24,10 @@ #define ZDICT_STATIC_LINKING_ONLY #include "../zstd/zdict.h" -#include "../common/TracyProtocol.hpp" -#include "../common/TracySystem.hpp" -#include "../common/TracyYield.hpp" -#include "../common/TracyStackFrames.hpp" +#include "../public/common/TracyProtocol.hpp" +#include "../public/common/TracySystem.hpp" +#include "../public/common/TracyYield.hpp" +#include "../public/common/TracyStackFrames.hpp" #include "TracyFileRead.hpp" #include "TracyFileWrite.hpp" #include "TracySort.hpp" diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index 10710191..fed53db7 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -13,10 +13,10 @@ #include #include -#include "../common/TracyForceInline.hpp" -#include "../common/TracyQueue.hpp" -#include "../common/TracyProtocol.hpp" -#include "../common/TracySocket.hpp" +#include "../public/common/TracyForceInline.hpp" +#include "../public/common/TracyQueue.hpp" +#include "../public/common/TracyProtocol.hpp" +#include "../public/common/TracySocket.hpp" #include "tracy_robin_hood.h" #include "TracyEvent.hpp" #include "TracyShortPtr.hpp" diff --git a/server/tracy_pdqsort.h b/server/tracy_pdqsort.h index 105a32f9..b00ff5cc 100644 --- a/server/tracy_pdqsort.h +++ b/server/tracy_pdqsort.h @@ -23,7 +23,7 @@ #ifndef TRACY_PDQSORT_H #define TRACY_PDQSORT_H -#include "../common/TracyForceInline.hpp" +#include "../public/common/TracyForceInline.hpp" #include #include diff --git a/test/Makefile b/test/Makefile index 500514d5..9ad48e66 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,14 +3,14 @@ TRACYFLAGS := CFLAGS := $(OPTFLAGS) -Wall -DTRACY_ENABLE $(TRACYFLAGS) CXXFLAGS := $(CFLAGS) -std=gnu++11 DEFINES += -INCLUDES := +INCLUDES := -I../public/tracy LIBS := -lpthread -ldl LDFLAGS := -rdynamic IMAGE := tracy_test SRC := \ test.cpp \ - ../TracyClient.cpp + ../public/TracyClient.cpp OBJ := $(SRC:%.cpp=%.o) diff --git a/test/test.cpp b/test/test.cpp index 51cad692..3e7dcc04 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "../Tracy.hpp" +#include "Tracy.hpp" #include "../common/TracySystem.hpp" #define STB_IMAGE_IMPLEMENTATION diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 6ccb5cbc..55f0e55e 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -88,12 +88,12 @@ - - - - - + + + + + @@ -133,18 +133,22 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/update/build/win32/update.vcxproj.filters b/update/build/win32/update.vcxproj.filters index a5da3f46..c987fbf6 100644 --- a/update/build/win32/update.vcxproj.filters +++ b/update/build/win32/update.vcxproj.filters @@ -30,15 +30,6 @@ - - common - - - common - - - common - server @@ -48,9 +39,6 @@ src - - common - server @@ -156,35 +144,23 @@ zstd\dictBuilder - + + common + + + common + + + common + + + common + + common - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - server @@ -209,12 +185,6 @@ server - - common - - - common - server @@ -341,15 +311,57 @@ zstd\dictBuilder - - common - zstd\common zstd\compress + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common +