From a950e444b55f4ce931e52c86e07a70197a8e8510 Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Tue, 23 Feb 2021 09:01:06 -0600 Subject: [PATCH] Updated as suggested by wolf in the PR --- CMakeLists.txt | 4 ---- Tracy.hpp | 4 ---- server/TracyView.cpp | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fde4ed4e..d50c70aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,3 @@ message(STATUS "TRACY_PORT: ${TRACY_PORT}") target_compile_definitions(tracy_client PUBLIC TRACY_PORT=${TRACY_PORT}) target_include_directories(tracy_client PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") - -if (UNIX) - target_link_libraries(tracy_client PRIVATE ${CMAKE_DL_LIBS}) -endif() diff --git a/Tracy.hpp b/Tracy.hpp index a70497f1..8d9ada59 100644 --- a/Tracy.hpp +++ b/Tracy.hpp @@ -105,10 +105,6 @@ #include "client/TracyProfiler.hpp" #include "client/TracyScoped.hpp" -#define TracySourceLocation( varname ) static const tracy::SourceLocationData varname { nullptr, __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; -#define TracySourceLocationN( varname, name ) static const tracy::SourceLocationData varname { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; -#define TracySourceLocationNC( varname, name, color ) static const tracy::SourceLocationData varname { name, __FUNCTION__, __FILE__, (uint32_t)__LINE__, color }; - #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 ); diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 4d5ba128..945c1041 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -72,6 +72,7 @@ constexpr const char* GpuContextNames[] = { "Vulkan", "OpenCL", "Direct3D 12" + "Direct3D 11" };