1
0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00

Merge remote-tracking branch 'tracy/master' into manual-lifetime

# Conflicts:
#	AUTHORS
This commit is contained in:
Andrey Voroshilov
2020-07-13 01:49:11 -07:00
33 changed files with 1551 additions and 200 deletions
+11
View File
@@ -873,6 +873,17 @@ static Thread* s_sysTraceThread = nullptr;
TRACY_API bool ProfilerAvailable() { return s_instance != nullptr; }
TRACY_API int64_t GetFrequencyQpc()
{
#if defined _WIN32 || defined __CYGWIN__
LARGE_INTEGER t;
QueryPerformanceFrequency( &t );
return t.QuadPart;
#else
return 0;
#endif
}
#ifdef TRACY_DELAYED_INIT
struct ThreadNameData;
TRACY_API moodycamel::ConcurrentQueue<QueueItem>& GetQueue();
+1
View File
@@ -64,6 +64,7 @@ TRACY_API GpuCtxWrapper& GetGpuCtx();
TRACY_API uint64_t GetThreadHandle();
TRACY_API void InitRPMallocThread();
TRACY_API bool ProfilerAvailable();
TRACY_API int64_t GetFrequencyQpc();
struct SourceLocationData
{