mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 10:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop constant merging check.

Browse Source 
While without constant merging the profiler operates sub-optimally, it's
not that essential to be enabled. And there are problems with it on some
platforms, for example cygwin.
This commit is contained in:
Bartosz Taudul 2017-09-23 20:16:42 +02:00
parent c1cab84329
commit e1a63dbb53
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/TracyProfiler.cpp
View File

@ -31,8 +31,6 @@ static moodycamel::ProducerToken& GetToken()
return token; return token;
} }
extern const char* PointerCheckA;
const char* PointerCheckB = "tracy";
#ifndef TRACY_DISABLE #ifndef TRACY_DISABLE
Profiler s_profiler; Profiler s_profiler;
@ -49,13 +47,6 @@ Profiler::Profiler()
, m_buffer( new char[TargetFrameSize*3] ) , m_buffer( new char[TargetFrameSize*3] )
, m_bufferOffset( 0 ) , m_bufferOffset( 0 )
{ {
// This check verifies that the string literals from different compilation units are placed at the
// same address by the linker.
// MSVC: make sure "Enable String Pooling" is active (/GF).
// gcc: make sure -fmerge-constants is enabled (it is automatically enabled only in optimized builds).
// clang: seems to be enabled by default.
assert( PointerCheckA == PointerCheckB );
assert( !s_instance ); assert( !s_instance );
s_instance = this; s_instance = this;

2
common/TracySystem.cpp
View File

@ -12,8 +12,6 @@
namespace tracy namespace tracy
{ {
const char* PointerCheckA = "tracy";
void SetThreadName( std::thread& thread, const char* name ) void SetThreadName( std::thread& thread, const char* name )
{ {
#ifdef _WIN32 #ifdef _WIN32