From 776b08f2e0b2dc611660c1ea847d717a2f618884 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 17 Mar 2024 13:15:54 +0100 Subject: [PATCH] Split core server files from the UI. --- profiler/CMakeLists.txt | 104 +++++++++--------- profiler/src/BackendGlfw.cpp | 2 +- profiler/src/BackendWayland.cpp | 2 +- profiler/src/ConnectionHistory.cpp | 2 +- profiler/src/Filters.cpp | 2 +- profiler/src/Fonts.cpp | 2 +- profiler/src/ImGuiContext.cpp | 2 +- profiler/src/WindowPosition.cpp | 2 +- profiler/src/main.cpp | 22 ++-- .../src/profiler}/IconsFontAwesome6.h | 0 .../src/profiler}/TracyBadVersion.cpp | 0 .../src/profiler}/TracyBadVersion.hpp | 0 .../src/profiler}/TracyBuzzAnim.hpp | 0 .../src/profiler}/TracyColor.cpp | 0 .../src/profiler}/TracyColor.hpp | 0 .../src/profiler}/TracyConfig.hpp | 0 .../src/profiler}/TracyDecayValue.hpp | 0 .../src/profiler}/TracyEventDebug.cpp | 0 .../src/profiler}/TracyEventDebug.hpp | 0 .../src/profiler}/TracyFileselector.cpp | 0 .../src/profiler}/TracyFileselector.hpp | 0 .../src/profiler}/TracyFilesystem.cpp | 0 .../src/profiler}/TracyFilesystem.hpp | 0 .../src/profiler}/TracyImGui.cpp | 0 .../src/profiler}/TracyImGui.hpp | 0 .../src/profiler}/TracyLockHelpers.hpp | 0 .../src/profiler}/TracyMicroArchitecture.cpp | 0 .../src/profiler}/TracyMicroArchitecture.hpp | 0 .../src/profiler}/TracyMouse.cpp | 0 .../src/profiler}/TracyMouse.hpp | 0 .../src/profiler}/TracyProtoHistory.cpp | 0 .../src/profiler}/TracyProtoHistory.hpp | 0 .../src/profiler}/TracySourceContents.cpp | 0 .../src/profiler}/TracySourceContents.hpp | 0 .../src/profiler}/TracySourceTokenizer.cpp | 0 .../src/profiler}/TracySourceTokenizer.hpp | 0 .../src/profiler}/TracySourceView.cpp | 0 .../src/profiler}/TracySourceView.hpp | 0 .../src/profiler}/TracyStorage.cpp | 0 .../src/profiler}/TracyStorage.hpp | 0 .../src/profiler}/TracyTexture.cpp | 0 .../src/profiler}/TracyTexture.hpp | 0 .../src/profiler}/TracyTimelineContext.hpp | 0 .../src/profiler}/TracyTimelineController.cpp | 0 .../src/profiler}/TracyTimelineController.hpp | 4 +- .../src/profiler}/TracyTimelineDraw.hpp | 0 .../src/profiler}/TracyTimelineItem.cpp | 0 .../src/profiler}/TracyTimelineItem.hpp | 0 .../profiler}/TracyTimelineItemCpuData.cpp | 0 .../profiler}/TracyTimelineItemCpuData.hpp | 0 .../src/profiler}/TracyTimelineItemGpu.cpp | 0 .../src/profiler}/TracyTimelineItemGpu.hpp | 0 .../src/profiler}/TracyTimelineItemPlot.cpp | 0 .../src/profiler}/TracyTimelineItemPlot.hpp | 0 .../src/profiler}/TracyTimelineItemThread.cpp | 0 .../src/profiler}/TracyTimelineItemThread.hpp | 0 .../src/profiler}/TracyUserData.cpp | 0 .../src/profiler}/TracyUserData.hpp | 0 .../src/profiler}/TracyUtility.cpp | 0 .../src/profiler}/TracyUtility.hpp | 2 +- .../src/profiler}/TracyView.cpp | 0 .../src/profiler}/TracyView.hpp | 10 +- .../src/profiler}/TracyViewData.hpp | 0 .../src/profiler}/TracyView_Annotations.cpp | 0 .../src/profiler}/TracyView_Callstack.cpp | 0 .../src/profiler}/TracyView_Compare.cpp | 0 .../profiler}/TracyView_ConnectionState.cpp | 0 .../src/profiler}/TracyView_ContextSwitch.cpp | 0 .../src/profiler}/TracyView_CpuData.cpp | 0 .../src/profiler}/TracyView_FindZone.cpp | 0 .../src/profiler}/TracyView_FrameOverview.cpp | 0 .../src/profiler}/TracyView_FrameTimeline.cpp | 0 .../src/profiler}/TracyView_FrameTree.cpp | 0 .../src/profiler}/TracyView_GpuTimeline.cpp | 0 .../src/profiler}/TracyView_Locks.cpp | 0 .../src/profiler}/TracyView_Memory.cpp | 0 .../src/profiler}/TracyView_Messages.cpp | 0 .../src/profiler}/TracyView_Navigation.cpp | 0 .../profiler}/TracyView_NotificationArea.cpp | 0 .../src/profiler}/TracyView_Options.cpp | 0 .../src/profiler}/TracyView_Playback.cpp | 0 .../src/profiler}/TracyView_Plots.cpp | 0 .../src/profiler}/TracyView_Ranges.cpp | 0 .../src/profiler}/TracyView_Samples.cpp | 0 .../src/profiler}/TracyView_Statistics.cpp | 0 .../src/profiler}/TracyView_Timeline.cpp | 0 .../src/profiler}/TracyView_TraceInfo.cpp | 0 .../src/profiler}/TracyView_Utility.cpp | 0 .../src/profiler}/TracyView_ZoneInfo.cpp | 0 .../src/profiler}/TracyView_ZoneTimeline.cpp | 0 .../src/profiler}/TracyWeb.cpp | 0 .../src/profiler}/TracyWeb.hpp | 0 92 files changed, 79 insertions(+), 77 deletions(-) rename {server => profiler/src/profiler}/IconsFontAwesome6.h (100%) rename {server => profiler/src/profiler}/TracyBadVersion.cpp (100%) rename {server => profiler/src/profiler}/TracyBadVersion.hpp (100%) rename {server => profiler/src/profiler}/TracyBuzzAnim.hpp (100%) rename {server => profiler/src/profiler}/TracyColor.cpp (100%) rename {server => profiler/src/profiler}/TracyColor.hpp (100%) rename {server => profiler/src/profiler}/TracyConfig.hpp (100%) rename {server => profiler/src/profiler}/TracyDecayValue.hpp (100%) rename {server => profiler/src/profiler}/TracyEventDebug.cpp (100%) rename {server => profiler/src/profiler}/TracyEventDebug.hpp (100%) rename {server => profiler/src/profiler}/TracyFileselector.cpp (100%) rename {server => profiler/src/profiler}/TracyFileselector.hpp (100%) rename {server => profiler/src/profiler}/TracyFilesystem.cpp (100%) rename {server => profiler/src/profiler}/TracyFilesystem.hpp (100%) rename {server => profiler/src/profiler}/TracyImGui.cpp (100%) rename {server => profiler/src/profiler}/TracyImGui.hpp (100%) rename {server => profiler/src/profiler}/TracyLockHelpers.hpp (100%) rename {server => profiler/src/profiler}/TracyMicroArchitecture.cpp (100%) rename {server => profiler/src/profiler}/TracyMicroArchitecture.hpp (100%) rename {server => profiler/src/profiler}/TracyMouse.cpp (100%) rename {server => profiler/src/profiler}/TracyMouse.hpp (100%) rename {server => profiler/src/profiler}/TracyProtoHistory.cpp (100%) rename {server => profiler/src/profiler}/TracyProtoHistory.hpp (100%) rename {server => profiler/src/profiler}/TracySourceContents.cpp (100%) rename {server => profiler/src/profiler}/TracySourceContents.hpp (100%) rename {server => profiler/src/profiler}/TracySourceTokenizer.cpp (100%) rename {server => profiler/src/profiler}/TracySourceTokenizer.hpp (100%) rename {server => profiler/src/profiler}/TracySourceView.cpp (100%) rename {server => profiler/src/profiler}/TracySourceView.hpp (100%) rename {server => profiler/src/profiler}/TracyStorage.cpp (100%) rename {server => profiler/src/profiler}/TracyStorage.hpp (100%) rename {server => profiler/src/profiler}/TracyTexture.cpp (100%) rename {server => profiler/src/profiler}/TracyTexture.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineContext.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineController.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineController.hpp (95%) rename {server => profiler/src/profiler}/TracyTimelineDraw.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItem.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItem.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemCpuData.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemCpuData.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemGpu.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemGpu.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemPlot.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemPlot.hpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemThread.cpp (100%) rename {server => profiler/src/profiler}/TracyTimelineItemThread.hpp (100%) rename {server => profiler/src/profiler}/TracyUserData.cpp (100%) rename {server => profiler/src/profiler}/TracyUserData.hpp (100%) rename {server => profiler/src/profiler}/TracyUtility.cpp (100%) rename {server => profiler/src/profiler}/TracyUtility.hpp (95%) rename {server => profiler/src/profiler}/TracyView.cpp (100%) rename {server => profiler/src/profiler}/TracyView.hpp (99%) rename {server => profiler/src/profiler}/TracyViewData.hpp (100%) rename {server => profiler/src/profiler}/TracyView_Annotations.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Callstack.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Compare.cpp (100%) rename {server => profiler/src/profiler}/TracyView_ConnectionState.cpp (100%) rename {server => profiler/src/profiler}/TracyView_ContextSwitch.cpp (100%) rename {server => profiler/src/profiler}/TracyView_CpuData.cpp (100%) rename {server => profiler/src/profiler}/TracyView_FindZone.cpp (100%) rename {server => profiler/src/profiler}/TracyView_FrameOverview.cpp (100%) rename {server => profiler/src/profiler}/TracyView_FrameTimeline.cpp (100%) rename {server => profiler/src/profiler}/TracyView_FrameTree.cpp (100%) rename {server => profiler/src/profiler}/TracyView_GpuTimeline.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Locks.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Memory.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Messages.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Navigation.cpp (100%) rename {server => profiler/src/profiler}/TracyView_NotificationArea.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Options.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Playback.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Plots.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Ranges.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Samples.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Statistics.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Timeline.cpp (100%) rename {server => profiler/src/profiler}/TracyView_TraceInfo.cpp (100%) rename {server => profiler/src/profiler}/TracyView_Utility.cpp (100%) rename {server => profiler/src/profiler}/TracyView_ZoneInfo.cpp (100%) rename {server => profiler/src/profiler}/TracyView_ZoneTimeline.cpp (100%) rename {server => profiler/src/profiler}/TracyWeb.cpp (100%) rename {server => profiler/src/profiler}/TracyWeb.hpp (100%) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 7dcac591..58a99ab0 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -48,59 +48,61 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake) set(SERVER_FILES - ../server/TracyBadVersion.cpp - ../server/TracyColor.cpp - ../server/TracyEventDebug.cpp - ../server/TracyFileselector.cpp - ../server/TracyFilesystem.cpp - ../server/TracyImGui.cpp - ../server/TracyMicroArchitecture.cpp - ../server/TracyMouse.cpp - ../server/TracyProtoHistory.cpp - ../server/TracySourceContents.cpp - ../server/TracySourceTokenizer.cpp - ../server/TracySourceView.cpp - ../server/TracyStorage.cpp - ../server/TracyTexture.cpp - ../server/TracyTimelineController.cpp - ../server/TracyTimelineItem.cpp - ../server/TracyTimelineItemCpuData.cpp - ../server/TracyTimelineItemGpu.cpp - ../server/TracyTimelineItemPlot.cpp - ../server/TracyTimelineItemThread.cpp - ../server/TracyUserData.cpp - ../server/TracyUtility.cpp - ../server/TracyView.cpp - ../server/TracyView_Annotations.cpp - ../server/TracyView_Callstack.cpp - ../server/TracyView_Compare.cpp - ../server/TracyView_ConnectionState.cpp - ../server/TracyView_ContextSwitch.cpp - ../server/TracyView_CpuData.cpp - ../server/TracyView_FindZone.cpp - ../server/TracyView_FrameOverview.cpp - ../server/TracyView_FrameTimeline.cpp - ../server/TracyView_FrameTree.cpp - ../server/TracyView_GpuTimeline.cpp - ../server/TracyView_Locks.cpp - ../server/TracyView_Memory.cpp - ../server/TracyView_Messages.cpp - ../server/TracyView_Navigation.cpp - ../server/TracyView_NotificationArea.cpp - ../server/TracyView_Options.cpp - ../server/TracyView_Playback.cpp - ../server/TracyView_Plots.cpp - ../server/TracyView_Ranges.cpp - ../server/TracyView_Samples.cpp - ../server/TracyView_Statistics.cpp - ../server/TracyView_Timeline.cpp - ../server/TracyView_TraceInfo.cpp - ../server/TracyView_Utility.cpp - ../server/TracyView_ZoneInfo.cpp - ../server/TracyView_ZoneTimeline.cpp - ../server/TracyWeb.cpp + TracyBadVersion.cpp + TracyColor.cpp + TracyEventDebug.cpp + TracyFileselector.cpp + TracyFilesystem.cpp + TracyImGui.cpp + TracyMicroArchitecture.cpp + TracyMouse.cpp + TracyProtoHistory.cpp + TracySourceContents.cpp + TracySourceTokenizer.cpp + TracySourceView.cpp + TracyStorage.cpp + TracyTexture.cpp + TracyTimelineController.cpp + TracyTimelineItem.cpp + TracyTimelineItemCpuData.cpp + TracyTimelineItemGpu.cpp + TracyTimelineItemPlot.cpp + TracyTimelineItemThread.cpp + TracyUserData.cpp + TracyUtility.cpp + TracyView.cpp + TracyView_Annotations.cpp + TracyView_Callstack.cpp + TracyView_Compare.cpp + TracyView_ConnectionState.cpp + TracyView_ContextSwitch.cpp + TracyView_CpuData.cpp + TracyView_FindZone.cpp + TracyView_FrameOverview.cpp + TracyView_FrameTimeline.cpp + TracyView_FrameTree.cpp + TracyView_GpuTimeline.cpp + TracyView_Locks.cpp + TracyView_Memory.cpp + TracyView_Messages.cpp + TracyView_Navigation.cpp + TracyView_NotificationArea.cpp + TracyView_Options.cpp + TracyView_Playback.cpp + TracyView_Plots.cpp + TracyView_Ranges.cpp + TracyView_Samples.cpp + TracyView_Statistics.cpp + TracyView_Timeline.cpp + TracyView_TraceInfo.cpp + TracyView_Utility.cpp + TracyView_ZoneInfo.cpp + TracyView_ZoneTimeline.cpp + TracyWeb.cpp ) +list(TRANSFORM SERVER_FILES PREPEND "src/profiler/") + set(PROFILER_FILES src/imgui/imgui_impl_opengl3.cpp src/ConnectionHistory.cpp diff --git a/profiler/src/BackendGlfw.cpp b/profiler/src/BackendGlfw.cpp index 51897111..bfe12e1d 100644 --- a/profiler/src/BackendGlfw.cpp +++ b/profiler/src/BackendGlfw.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../server/TracyImGui.hpp" +#include "profiler/TracyImGui.hpp" #include "Backend.hpp" #include "RunQueue.hpp" diff --git a/profiler/src/BackendWayland.cpp b/profiler/src/BackendWayland.cpp index a2a7eb1a..942045e9 100644 --- a/profiler/src/BackendWayland.cpp +++ b/profiler/src/BackendWayland.cpp @@ -23,7 +23,7 @@ #include "wayland/xdg-decoration.h" #include "wayland/xdg-shell.h" -#include "../../server/TracyImGui.hpp" +#include "profiler/TracyImGui.hpp" #include "Backend.hpp" #include "RunQueue.hpp" diff --git a/profiler/src/ConnectionHistory.cpp b/profiler/src/ConnectionHistory.cpp index 19007bd1..b4bb378d 100644 --- a/profiler/src/ConnectionHistory.cpp +++ b/profiler/src/ConnectionHistory.cpp @@ -5,7 +5,7 @@ #include "ConnectionHistory.hpp" #include "../../server/tracy_pdqsort.h" -#include "../../server/TracyStorage.hpp" +#include "profiler/TracyStorage.hpp" ConnectionHistory::ConnectionHistory() diff --git a/profiler/src/Filters.cpp b/profiler/src/Filters.cpp index de358924..43dda8c5 100644 --- a/profiler/src/Filters.cpp +++ b/profiler/src/Filters.cpp @@ -4,7 +4,7 @@ #include "Filters.hpp" -#include "../../server/TracyStorage.hpp" +#include "profiler/TracyStorage.hpp" Filters::Filters() diff --git a/profiler/src/Fonts.cpp b/profiler/src/Fonts.cpp index 1d175b2b..77971e9a 100644 --- a/profiler/src/Fonts.cpp +++ b/profiler/src/Fonts.cpp @@ -4,7 +4,7 @@ #include "Fonts.hpp" #include "misc/freetype/imgui_freetype.h" #include "imgui/imgui_impl_opengl3.h" -#include "../../server/IconsFontAwesome6.h" +#include "profiler/IconsFontAwesome6.h" #include "font/DroidSans.hpp" #include "font/FiraCodeRetina.hpp" diff --git a/profiler/src/ImGuiContext.cpp b/profiler/src/ImGuiContext.cpp index b7d88ff2..f4e0f6de 100644 --- a/profiler/src/ImGuiContext.cpp +++ b/profiler/src/ImGuiContext.cpp @@ -1,5 +1,5 @@ #include -#include "../../server/TracyStorage.hpp" +#include "profiler/TracyStorage.hpp" #include "ImGuiContext.hpp" ImGuiTracyContext::ImGuiTracyContext() diff --git a/profiler/src/WindowPosition.cpp b/profiler/src/WindowPosition.cpp index f39b6c02..03c7a01f 100644 --- a/profiler/src/WindowPosition.cpp +++ b/profiler/src/WindowPosition.cpp @@ -3,7 +3,7 @@ #include "WindowPosition.hpp" -#include "../../server/TracyStorage.hpp" +#include "profiler/TracyStorage.hpp" WindowPosition::WindowPosition() diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp index 69118284..e46e526a 100644 --- a/profiler/src/main.cpp +++ b/profiler/src/main.cpp @@ -30,23 +30,23 @@ #include "../../public/common/TracyProtocol.hpp" #include "../../public/common/TracyVersion.hpp" +#include "profiler/TracyBadVersion.hpp" +#include "profiler/TracyConfig.hpp" +#include "profiler/TracyFileselector.hpp" +#include "profiler/TracyImGui.hpp" +#include "profiler/TracyMouse.hpp" +#include "profiler/TracyProtoHistory.hpp" +#include "profiler/TracyStorage.hpp" +#include "profiler/TracyTexture.hpp" +#include "profiler/TracyView.hpp" +#include "profiler/TracyWeb.hpp" +#include "profiler/IconsFontAwesome6.h" #include "../../server/tracy_pdqsort.h" #include "../../server/tracy_robin_hood.h" -#include "../../server/TracyBadVersion.hpp" -#include "../../server/TracyConfig.hpp" #include "../../server/TracyFileHeader.hpp" #include "../../server/TracyFileRead.hpp" -#include "../../server/TracyFileselector.hpp" -#include "../../server/TracyImGui.hpp" -#include "../../server/TracyMouse.hpp" #include "../../server/TracyPrint.hpp" -#include "../../server/TracyProtoHistory.hpp" -#include "../../server/TracyStorage.hpp" -#include "../../server/TracyTexture.hpp" -#include "../../server/TracyView.hpp" -#include "../../server/TracyWeb.hpp" #include "../../server/TracyWorker.hpp" -#include "../../server/IconsFontAwesome6.h" #include "icon.hpp" #include "zigzag01.hpp" diff --git a/server/IconsFontAwesome6.h b/profiler/src/profiler/IconsFontAwesome6.h similarity index 100% rename from server/IconsFontAwesome6.h rename to profiler/src/profiler/IconsFontAwesome6.h diff --git a/server/TracyBadVersion.cpp b/profiler/src/profiler/TracyBadVersion.cpp similarity index 100% rename from server/TracyBadVersion.cpp rename to profiler/src/profiler/TracyBadVersion.cpp diff --git a/server/TracyBadVersion.hpp b/profiler/src/profiler/TracyBadVersion.hpp similarity index 100% rename from server/TracyBadVersion.hpp rename to profiler/src/profiler/TracyBadVersion.hpp diff --git a/server/TracyBuzzAnim.hpp b/profiler/src/profiler/TracyBuzzAnim.hpp similarity index 100% rename from server/TracyBuzzAnim.hpp rename to profiler/src/profiler/TracyBuzzAnim.hpp diff --git a/server/TracyColor.cpp b/profiler/src/profiler/TracyColor.cpp similarity index 100% rename from server/TracyColor.cpp rename to profiler/src/profiler/TracyColor.cpp diff --git a/server/TracyColor.hpp b/profiler/src/profiler/TracyColor.hpp similarity index 100% rename from server/TracyColor.hpp rename to profiler/src/profiler/TracyColor.hpp diff --git a/server/TracyConfig.hpp b/profiler/src/profiler/TracyConfig.hpp similarity index 100% rename from server/TracyConfig.hpp rename to profiler/src/profiler/TracyConfig.hpp diff --git a/server/TracyDecayValue.hpp b/profiler/src/profiler/TracyDecayValue.hpp similarity index 100% rename from server/TracyDecayValue.hpp rename to profiler/src/profiler/TracyDecayValue.hpp diff --git a/server/TracyEventDebug.cpp b/profiler/src/profiler/TracyEventDebug.cpp similarity index 100% rename from server/TracyEventDebug.cpp rename to profiler/src/profiler/TracyEventDebug.cpp diff --git a/server/TracyEventDebug.hpp b/profiler/src/profiler/TracyEventDebug.hpp similarity index 100% rename from server/TracyEventDebug.hpp rename to profiler/src/profiler/TracyEventDebug.hpp diff --git a/server/TracyFileselector.cpp b/profiler/src/profiler/TracyFileselector.cpp similarity index 100% rename from server/TracyFileselector.cpp rename to profiler/src/profiler/TracyFileselector.cpp diff --git a/server/TracyFileselector.hpp b/profiler/src/profiler/TracyFileselector.hpp similarity index 100% rename from server/TracyFileselector.hpp rename to profiler/src/profiler/TracyFileselector.hpp diff --git a/server/TracyFilesystem.cpp b/profiler/src/profiler/TracyFilesystem.cpp similarity index 100% rename from server/TracyFilesystem.cpp rename to profiler/src/profiler/TracyFilesystem.cpp diff --git a/server/TracyFilesystem.hpp b/profiler/src/profiler/TracyFilesystem.hpp similarity index 100% rename from server/TracyFilesystem.hpp rename to profiler/src/profiler/TracyFilesystem.hpp diff --git a/server/TracyImGui.cpp b/profiler/src/profiler/TracyImGui.cpp similarity index 100% rename from server/TracyImGui.cpp rename to profiler/src/profiler/TracyImGui.cpp diff --git a/server/TracyImGui.hpp b/profiler/src/profiler/TracyImGui.hpp similarity index 100% rename from server/TracyImGui.hpp rename to profiler/src/profiler/TracyImGui.hpp diff --git a/server/TracyLockHelpers.hpp b/profiler/src/profiler/TracyLockHelpers.hpp similarity index 100% rename from server/TracyLockHelpers.hpp rename to profiler/src/profiler/TracyLockHelpers.hpp diff --git a/server/TracyMicroArchitecture.cpp b/profiler/src/profiler/TracyMicroArchitecture.cpp similarity index 100% rename from server/TracyMicroArchitecture.cpp rename to profiler/src/profiler/TracyMicroArchitecture.cpp diff --git a/server/TracyMicroArchitecture.hpp b/profiler/src/profiler/TracyMicroArchitecture.hpp similarity index 100% rename from server/TracyMicroArchitecture.hpp rename to profiler/src/profiler/TracyMicroArchitecture.hpp diff --git a/server/TracyMouse.cpp b/profiler/src/profiler/TracyMouse.cpp similarity index 100% rename from server/TracyMouse.cpp rename to profiler/src/profiler/TracyMouse.cpp diff --git a/server/TracyMouse.hpp b/profiler/src/profiler/TracyMouse.hpp similarity index 100% rename from server/TracyMouse.hpp rename to profiler/src/profiler/TracyMouse.hpp diff --git a/server/TracyProtoHistory.cpp b/profiler/src/profiler/TracyProtoHistory.cpp similarity index 100% rename from server/TracyProtoHistory.cpp rename to profiler/src/profiler/TracyProtoHistory.cpp diff --git a/server/TracyProtoHistory.hpp b/profiler/src/profiler/TracyProtoHistory.hpp similarity index 100% rename from server/TracyProtoHistory.hpp rename to profiler/src/profiler/TracyProtoHistory.hpp diff --git a/server/TracySourceContents.cpp b/profiler/src/profiler/TracySourceContents.cpp similarity index 100% rename from server/TracySourceContents.cpp rename to profiler/src/profiler/TracySourceContents.cpp diff --git a/server/TracySourceContents.hpp b/profiler/src/profiler/TracySourceContents.hpp similarity index 100% rename from server/TracySourceContents.hpp rename to profiler/src/profiler/TracySourceContents.hpp diff --git a/server/TracySourceTokenizer.cpp b/profiler/src/profiler/TracySourceTokenizer.cpp similarity index 100% rename from server/TracySourceTokenizer.cpp rename to profiler/src/profiler/TracySourceTokenizer.cpp diff --git a/server/TracySourceTokenizer.hpp b/profiler/src/profiler/TracySourceTokenizer.hpp similarity index 100% rename from server/TracySourceTokenizer.hpp rename to profiler/src/profiler/TracySourceTokenizer.hpp diff --git a/server/TracySourceView.cpp b/profiler/src/profiler/TracySourceView.cpp similarity index 100% rename from server/TracySourceView.cpp rename to profiler/src/profiler/TracySourceView.cpp diff --git a/server/TracySourceView.hpp b/profiler/src/profiler/TracySourceView.hpp similarity index 100% rename from server/TracySourceView.hpp rename to profiler/src/profiler/TracySourceView.hpp diff --git a/server/TracyStorage.cpp b/profiler/src/profiler/TracyStorage.cpp similarity index 100% rename from server/TracyStorage.cpp rename to profiler/src/profiler/TracyStorage.cpp diff --git a/server/TracyStorage.hpp b/profiler/src/profiler/TracyStorage.hpp similarity index 100% rename from server/TracyStorage.hpp rename to profiler/src/profiler/TracyStorage.hpp diff --git a/server/TracyTexture.cpp b/profiler/src/profiler/TracyTexture.cpp similarity index 100% rename from server/TracyTexture.cpp rename to profiler/src/profiler/TracyTexture.cpp diff --git a/server/TracyTexture.hpp b/profiler/src/profiler/TracyTexture.hpp similarity index 100% rename from server/TracyTexture.hpp rename to profiler/src/profiler/TracyTexture.hpp diff --git a/server/TracyTimelineContext.hpp b/profiler/src/profiler/TracyTimelineContext.hpp similarity index 100% rename from server/TracyTimelineContext.hpp rename to profiler/src/profiler/TracyTimelineContext.hpp diff --git a/server/TracyTimelineController.cpp b/profiler/src/profiler/TracyTimelineController.cpp similarity index 100% rename from server/TracyTimelineController.cpp rename to profiler/src/profiler/TracyTimelineController.cpp diff --git a/server/TracyTimelineController.hpp b/profiler/src/profiler/TracyTimelineController.hpp similarity index 95% rename from server/TracyTimelineController.hpp rename to profiler/src/profiler/TracyTimelineController.hpp index a2880572..9bf06433 100644 --- a/server/TracyTimelineController.hpp +++ b/profiler/src/profiler/TracyTimelineController.hpp @@ -6,9 +6,9 @@ #include #include "TracyImGui.hpp" -#include "TracyTaskDispatch.hpp" +#include "../server/TracyTaskDispatch.hpp" +#include "../server/tracy_robin_hood.h" #include "../public/common/TracyForceInline.hpp" -#include "tracy_robin_hood.h" namespace tracy { diff --git a/server/TracyTimelineDraw.hpp b/profiler/src/profiler/TracyTimelineDraw.hpp similarity index 100% rename from server/TracyTimelineDraw.hpp rename to profiler/src/profiler/TracyTimelineDraw.hpp diff --git a/server/TracyTimelineItem.cpp b/profiler/src/profiler/TracyTimelineItem.cpp similarity index 100% rename from server/TracyTimelineItem.cpp rename to profiler/src/profiler/TracyTimelineItem.cpp diff --git a/server/TracyTimelineItem.hpp b/profiler/src/profiler/TracyTimelineItem.hpp similarity index 100% rename from server/TracyTimelineItem.hpp rename to profiler/src/profiler/TracyTimelineItem.hpp diff --git a/server/TracyTimelineItemCpuData.cpp b/profiler/src/profiler/TracyTimelineItemCpuData.cpp similarity index 100% rename from server/TracyTimelineItemCpuData.cpp rename to profiler/src/profiler/TracyTimelineItemCpuData.cpp diff --git a/server/TracyTimelineItemCpuData.hpp b/profiler/src/profiler/TracyTimelineItemCpuData.hpp similarity index 100% rename from server/TracyTimelineItemCpuData.hpp rename to profiler/src/profiler/TracyTimelineItemCpuData.hpp diff --git a/server/TracyTimelineItemGpu.cpp b/profiler/src/profiler/TracyTimelineItemGpu.cpp similarity index 100% rename from server/TracyTimelineItemGpu.cpp rename to profiler/src/profiler/TracyTimelineItemGpu.cpp diff --git a/server/TracyTimelineItemGpu.hpp b/profiler/src/profiler/TracyTimelineItemGpu.hpp similarity index 100% rename from server/TracyTimelineItemGpu.hpp rename to profiler/src/profiler/TracyTimelineItemGpu.hpp diff --git a/server/TracyTimelineItemPlot.cpp b/profiler/src/profiler/TracyTimelineItemPlot.cpp similarity index 100% rename from server/TracyTimelineItemPlot.cpp rename to profiler/src/profiler/TracyTimelineItemPlot.cpp diff --git a/server/TracyTimelineItemPlot.hpp b/profiler/src/profiler/TracyTimelineItemPlot.hpp similarity index 100% rename from server/TracyTimelineItemPlot.hpp rename to profiler/src/profiler/TracyTimelineItemPlot.hpp diff --git a/server/TracyTimelineItemThread.cpp b/profiler/src/profiler/TracyTimelineItemThread.cpp similarity index 100% rename from server/TracyTimelineItemThread.cpp rename to profiler/src/profiler/TracyTimelineItemThread.cpp diff --git a/server/TracyTimelineItemThread.hpp b/profiler/src/profiler/TracyTimelineItemThread.hpp similarity index 100% rename from server/TracyTimelineItemThread.hpp rename to profiler/src/profiler/TracyTimelineItemThread.hpp diff --git a/server/TracyUserData.cpp b/profiler/src/profiler/TracyUserData.cpp similarity index 100% rename from server/TracyUserData.cpp rename to profiler/src/profiler/TracyUserData.cpp diff --git a/server/TracyUserData.hpp b/profiler/src/profiler/TracyUserData.hpp similarity index 100% rename from server/TracyUserData.hpp rename to profiler/src/profiler/TracyUserData.hpp diff --git a/server/TracyUtility.cpp b/profiler/src/profiler/TracyUtility.cpp similarity index 100% rename from server/TracyUtility.cpp rename to profiler/src/profiler/TracyUtility.cpp diff --git a/server/TracyUtility.hpp b/profiler/src/profiler/TracyUtility.hpp similarity index 95% rename from server/TracyUtility.hpp rename to profiler/src/profiler/TracyUtility.hpp index 7540a81b..f6b17bf0 100644 --- a/server/TracyUtility.hpp +++ b/profiler/src/profiler/TracyUtility.hpp @@ -4,7 +4,7 @@ #include #include "imgui.h" -#include "TracyEvent.hpp" +#include "../server/TracyEvent.hpp" namespace tracy { diff --git a/server/TracyView.cpp b/profiler/src/profiler/TracyView.cpp similarity index 100% rename from server/TracyView.cpp rename to profiler/src/profiler/TracyView.cpp diff --git a/server/TracyView.hpp b/profiler/src/profiler/TracyView.hpp similarity index 99% rename from server/TracyView.hpp rename to profiler/src/profiler/TracyView.hpp index 666deddb..ac099ff4 100644 --- a/server/TracyView.hpp +++ b/profiler/src/profiler/TracyView.hpp @@ -15,16 +15,16 @@ #include "TracyBuzzAnim.hpp" #include "TracyConfig.hpp" #include "TracyDecayValue.hpp" -#include "TracyFileWrite.hpp" -#include "TracyShortPtr.hpp" #include "TracySourceContents.hpp" #include "TracyTimelineController.hpp" #include "TracyUserData.hpp" #include "TracyUtility.hpp" -#include "TracyVector.hpp" #include "TracyViewData.hpp" -#include "TracyWorker.hpp" -#include "tracy_robin_hood.h" +#include "../server/TracyFileWrite.hpp" +#include "../server/TracyShortPtr.hpp" +#include "../server/TracyWorker.hpp" +#include "../server/tracy_robin_hood.h" +#include "../server/TracyVector.hpp" namespace tracy { diff --git a/server/TracyViewData.hpp b/profiler/src/profiler/TracyViewData.hpp similarity index 100% rename from server/TracyViewData.hpp rename to profiler/src/profiler/TracyViewData.hpp diff --git a/server/TracyView_Annotations.cpp b/profiler/src/profiler/TracyView_Annotations.cpp similarity index 100% rename from server/TracyView_Annotations.cpp rename to profiler/src/profiler/TracyView_Annotations.cpp diff --git a/server/TracyView_Callstack.cpp b/profiler/src/profiler/TracyView_Callstack.cpp similarity index 100% rename from server/TracyView_Callstack.cpp rename to profiler/src/profiler/TracyView_Callstack.cpp diff --git a/server/TracyView_Compare.cpp b/profiler/src/profiler/TracyView_Compare.cpp similarity index 100% rename from server/TracyView_Compare.cpp rename to profiler/src/profiler/TracyView_Compare.cpp diff --git a/server/TracyView_ConnectionState.cpp b/profiler/src/profiler/TracyView_ConnectionState.cpp similarity index 100% rename from server/TracyView_ConnectionState.cpp rename to profiler/src/profiler/TracyView_ConnectionState.cpp diff --git a/server/TracyView_ContextSwitch.cpp b/profiler/src/profiler/TracyView_ContextSwitch.cpp similarity index 100% rename from server/TracyView_ContextSwitch.cpp rename to profiler/src/profiler/TracyView_ContextSwitch.cpp diff --git a/server/TracyView_CpuData.cpp b/profiler/src/profiler/TracyView_CpuData.cpp similarity index 100% rename from server/TracyView_CpuData.cpp rename to profiler/src/profiler/TracyView_CpuData.cpp diff --git a/server/TracyView_FindZone.cpp b/profiler/src/profiler/TracyView_FindZone.cpp similarity index 100% rename from server/TracyView_FindZone.cpp rename to profiler/src/profiler/TracyView_FindZone.cpp diff --git a/server/TracyView_FrameOverview.cpp b/profiler/src/profiler/TracyView_FrameOverview.cpp similarity index 100% rename from server/TracyView_FrameOverview.cpp rename to profiler/src/profiler/TracyView_FrameOverview.cpp diff --git a/server/TracyView_FrameTimeline.cpp b/profiler/src/profiler/TracyView_FrameTimeline.cpp similarity index 100% rename from server/TracyView_FrameTimeline.cpp rename to profiler/src/profiler/TracyView_FrameTimeline.cpp diff --git a/server/TracyView_FrameTree.cpp b/profiler/src/profiler/TracyView_FrameTree.cpp similarity index 100% rename from server/TracyView_FrameTree.cpp rename to profiler/src/profiler/TracyView_FrameTree.cpp diff --git a/server/TracyView_GpuTimeline.cpp b/profiler/src/profiler/TracyView_GpuTimeline.cpp similarity index 100% rename from server/TracyView_GpuTimeline.cpp rename to profiler/src/profiler/TracyView_GpuTimeline.cpp diff --git a/server/TracyView_Locks.cpp b/profiler/src/profiler/TracyView_Locks.cpp similarity index 100% rename from server/TracyView_Locks.cpp rename to profiler/src/profiler/TracyView_Locks.cpp diff --git a/server/TracyView_Memory.cpp b/profiler/src/profiler/TracyView_Memory.cpp similarity index 100% rename from server/TracyView_Memory.cpp rename to profiler/src/profiler/TracyView_Memory.cpp diff --git a/server/TracyView_Messages.cpp b/profiler/src/profiler/TracyView_Messages.cpp similarity index 100% rename from server/TracyView_Messages.cpp rename to profiler/src/profiler/TracyView_Messages.cpp diff --git a/server/TracyView_Navigation.cpp b/profiler/src/profiler/TracyView_Navigation.cpp similarity index 100% rename from server/TracyView_Navigation.cpp rename to profiler/src/profiler/TracyView_Navigation.cpp diff --git a/server/TracyView_NotificationArea.cpp b/profiler/src/profiler/TracyView_NotificationArea.cpp similarity index 100% rename from server/TracyView_NotificationArea.cpp rename to profiler/src/profiler/TracyView_NotificationArea.cpp diff --git a/server/TracyView_Options.cpp b/profiler/src/profiler/TracyView_Options.cpp similarity index 100% rename from server/TracyView_Options.cpp rename to profiler/src/profiler/TracyView_Options.cpp diff --git a/server/TracyView_Playback.cpp b/profiler/src/profiler/TracyView_Playback.cpp similarity index 100% rename from server/TracyView_Playback.cpp rename to profiler/src/profiler/TracyView_Playback.cpp diff --git a/server/TracyView_Plots.cpp b/profiler/src/profiler/TracyView_Plots.cpp similarity index 100% rename from server/TracyView_Plots.cpp rename to profiler/src/profiler/TracyView_Plots.cpp diff --git a/server/TracyView_Ranges.cpp b/profiler/src/profiler/TracyView_Ranges.cpp similarity index 100% rename from server/TracyView_Ranges.cpp rename to profiler/src/profiler/TracyView_Ranges.cpp diff --git a/server/TracyView_Samples.cpp b/profiler/src/profiler/TracyView_Samples.cpp similarity index 100% rename from server/TracyView_Samples.cpp rename to profiler/src/profiler/TracyView_Samples.cpp diff --git a/server/TracyView_Statistics.cpp b/profiler/src/profiler/TracyView_Statistics.cpp similarity index 100% rename from server/TracyView_Statistics.cpp rename to profiler/src/profiler/TracyView_Statistics.cpp diff --git a/server/TracyView_Timeline.cpp b/profiler/src/profiler/TracyView_Timeline.cpp similarity index 100% rename from server/TracyView_Timeline.cpp rename to profiler/src/profiler/TracyView_Timeline.cpp diff --git a/server/TracyView_TraceInfo.cpp b/profiler/src/profiler/TracyView_TraceInfo.cpp similarity index 100% rename from server/TracyView_TraceInfo.cpp rename to profiler/src/profiler/TracyView_TraceInfo.cpp diff --git a/server/TracyView_Utility.cpp b/profiler/src/profiler/TracyView_Utility.cpp similarity index 100% rename from server/TracyView_Utility.cpp rename to profiler/src/profiler/TracyView_Utility.cpp diff --git a/server/TracyView_ZoneInfo.cpp b/profiler/src/profiler/TracyView_ZoneInfo.cpp similarity index 100% rename from server/TracyView_ZoneInfo.cpp rename to profiler/src/profiler/TracyView_ZoneInfo.cpp diff --git a/server/TracyView_ZoneTimeline.cpp b/profiler/src/profiler/TracyView_ZoneTimeline.cpp similarity index 100% rename from server/TracyView_ZoneTimeline.cpp rename to profiler/src/profiler/TracyView_ZoneTimeline.cpp diff --git a/server/TracyWeb.cpp b/profiler/src/profiler/TracyWeb.cpp similarity index 100% rename from server/TracyWeb.cpp rename to profiler/src/profiler/TracyWeb.cpp diff --git a/server/TracyWeb.hpp b/profiler/src/profiler/TracyWeb.hpp similarity index 100% rename from server/TracyWeb.hpp rename to profiler/src/profiler/TracyWeb.hpp