remove implementation when VKB_PROFILING is off

KhronosGroup · Jun 24, 2024 · 7afbca4 · 7afbca4
1 parent 10123f2
commit 7afbca4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt
@@ -31,9 +31,14 @@ vkb__register_component(
         src/profiling.cpp
     LINK_LIBS
         spdlog::spdlog
-        TracyClient
 )
 
+if (VKB_PROFILING)
+    target_link_libraries(vkb__core PUBLIC TracyClient)
+    target_compile_definitions(vkb__core PUBLIC TRACY_ENABLE)
+endif()
+
+
 vkb__register_tests(
     COMPONENT core
     NAME utils

diff --git a/components/core/include/core/util/profiling.hpp b/components/core/include/core/util/profiling.hpp
@@ -24,10 +24,14 @@
 
 #include "core/util/error.hpp"
 
-VKBP_DISABLE_WARNINGS()
+#ifdef TRACY_ENABLE
 #include <tracy/Tracy.hpp>
-VKBP_ENABLE_WARNINGS()
+#endif
+
+
 
+
+#ifdef TRACY_ENABLE
 // malloc and free are used by Tracy to provide memory profiling
 void *operator new(size_t count);
 void  operator delete(void *ptr) noexcept;
@@ -37,6 +41,10 @@ void  operator delete(void *ptr) noexcept;
 
 // Trace a function
 #define PROFILE_FUNCTION() ZoneScoped
+#else
+#define PROFILE_SCOPE(name)
+#define PROFILE_FUNCTION()
+#endif
 
 // The type of plot to use
 enum class PlotType
@@ -108,8 +116,10 @@ class Plot
   private:
 	static void update_tracy_plot(const char *name, T value)
 	{
-		TracyPlot(name, value);
-		TracyPlotConfig(name, TO_TRACY_PLOT_FORMAT(PT), true, true, 0);
+		#ifdef TRACY_ENABLE
+			TracyPlot(name, value);
+			TracyPlotConfig(name, TO_TRACY_PLOT_FORMAT(PT), true, true, 0);
+		#endif
 	}
 
 	static Plot *get_instance()

diff --git a/components/core/src/profiling.cpp b/components/core/src/profiling.cpp
@@ -19,6 +19,7 @@
 
 #include <cstdlib>
 
+#ifdef TRACY_ENABLE
 void *operator new(size_t count)
 {
 	auto ptr = malloc(count);
@@ -31,3 +32,4 @@ void operator delete(void *ptr) noexcept
 	TracyFree(ptr);
 	free(ptr);
 }
+#endif
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -442,8 +442,10 @@ set_property(TARGET Catch2 PROPERTY FOLDER "ThirdParty")
 set_property(TARGET Catch2WithMain PROPERTY FOLDER "ThirdParty")
 
 # Tracy
-set(TRACY_ENABLE ${VKB_ENABLE_TRACY})
-set(TRACY_TIMER_FALLBACK ON)
-add_subdirectory(tracy)
-add_compile_definitions(TRACY_NO_INVARIANT_CHECK=1)
-set_property(TARGET TracyClient PROPERTY FOLDER "ThirdParty")
+if (VKB_PROFILING)
+    set(TRACY_ENABLE ${VKB_PROFILING})
+    set(TRACY_TIMER_FALLBACK ON)
+    add_subdirectory(tracy)
+    add_compile_definitions(TRACY_NO_INVARIANT_CHECK=1)
+    set_property(TARGET TracyClient PROPERTY FOLDER "ThirdParty")
+endif()