diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 95c38eaf..702ea290 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -122,6 +122,7 @@ + @@ -210,6 +211,7 @@ + diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index a891d9ed..21b660dc 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -210,6 +210,9 @@ src + + server + @@ -509,6 +512,9 @@ src + + server + diff --git a/server/TracyStackFrames.cpp b/server/TracyStackFrames.cpp new file mode 100644 index 00000000..bc11d4f7 --- /dev/null +++ b/server/TracyStackFrames.cpp @@ -0,0 +1,24 @@ +#include "TracyStackFrames.hpp" + +namespace tracy +{ + +const char* s_tracyStackFrames[] = { + "tracy::Callstack", + "tracy::Callstack(int)", + "tracy::GpuCtxScope::{ctor}", + "tracy::Profiler::SendCallstack", + "tracy::Profiler::SendCallstack(int)", + "tracy::Profiler::SendCallstack(int, unsigned long)", + "tracy::Profiler::MemAllocCallstack", + "tracy::Profiler::MemAllocCallstack(void const*, unsigned long, int)", + "tracy::Profiler::MemFreeCallstack", + "tracy::Profiler::MemFreeCallstack(void const*, int)", + "tracy::ScopedZone::{ctor}", + "tracy::ScopedZone::ScopedZone(tracy::SourceLocationData const*, int, bool)", + "tracy::CallTrace", + "tracy::Profiler::Message", + nullptr +}; + +} diff --git a/server/TracyStackFrames.hpp b/server/TracyStackFrames.hpp new file mode 100644 index 00000000..49643b34 --- /dev/null +++ b/server/TracyStackFrames.hpp @@ -0,0 +1,11 @@ +#ifndef __TRACYSTACKFRAMES_HPP__ +#define __TRACYSTACKFRAMES_HPP__ + +namespace tracy +{ + +const char* s_tracyStackFrames[]; + +} + +#endif diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 65e96556..6685871b 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -36,6 +36,7 @@ #include "TracyPrint.hpp" #include "TracySort.hpp" #include "TracySourceView.hpp" +#include "TracyStackFrames.hpp" #include "TracyView.hpp" #include "../imgui/imgui_internal.h" @@ -55,24 +56,6 @@ namespace tracy static double s_time = 0; -constexpr const char* s_tracyStackFrames[] = { - "tracy::Callstack", - "tracy::Callstack(int)", - "tracy::GpuCtxScope::{ctor}", - "tracy::Profiler::SendCallstack", - "tracy::Profiler::SendCallstack(int)", - "tracy::Profiler::SendCallstack(int, unsigned long)", - "tracy::Profiler::MemAllocCallstack", - "tracy::Profiler::MemAllocCallstack(void const*, unsigned long, int)", - "tracy::Profiler::MemFreeCallstack", - "tracy::Profiler::MemFreeCallstack(void const*, int)", - "tracy::ScopedZone::{ctor}", - "tracy::ScopedZone::ScopedZone(tracy::SourceLocationData const*, int, bool)", - "tracy::CallTrace", - "tracy::Profiler::Message", - nullptr -}; - constexpr const char* GpuContextNames[] = { "Invalid", "OpenGL",