Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Fix DLL code.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-19 18:45:41 +01:00
parent 2421e05c27
commit 9fabafbeca
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TracyClientDLL.cpp
View File

@ -30,6 +30,8 @@ namespace tracy
DLL_IMPORT void*(*get_rpmalloc())(size_t size); DLL_IMPORT void*(*get_rpmalloc())(size_t size);
DLL_IMPORT void(*get_rpfree())(void* ptr); DLL_IMPORT void(*get_rpfree())(void* ptr);
DLL_IMPORT moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer*(*get_token())();
DLL_IMPORT Profiler&(*get_profiler())();
#if defined TRACY_HW_TIMER && __ARM_ARCH >= 6 #if defined TRACY_HW_TIMER && __ARM_ARCH >= 6
DLL_IMPORT int64_t(*get_GetTimeImpl())(); DLL_IMPORT int64_t(*get_GetTimeImpl())();
@ -52,6 +54,8 @@ namespace tracy
static void*(*rpmalloc_fpt)(size_t size) = get_rpmalloc(); static void*(*rpmalloc_fpt)(size_t size) = get_rpmalloc();
static void(*rpfree_fpt)(void* ptr) = get_rpfree(); static void(*rpfree_fpt)(void* ptr) = get_rpfree();
static moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer*(*GetToken_fpt)() = get_token;
static Profiler&(*GetProfiler_fpt)() = get_profiler();
RPMALLOC_RESTRICT void* rpmalloc(size_t size) RPMALLOC_RESTRICT void* rpmalloc(size_t size)
{ {
@ -62,6 +66,17 @@ namespace tracy
{ {
rpfree_fpt(ptr); rpfree_fpt(ptr);
} }
moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken()
{
return GetToken_fpt();
}
Profiler& GetProfiler()
{
return GetProfiler_fpt();
}
} }
#endif #endif

11
client/TracyProfiler.cpp
View File

@ -768,7 +768,7 @@ static Profiler init_order(105) s_profiler;
#endif #endif
tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken() moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken()
{ {
return s_token.ptr; return s_token.ptr;
} }
@ -790,6 +790,15 @@ DLL_EXPORT void(*get_rpfree())(void* ptr)
return rpfree; return rpfree;
} }
DLL_EXPORT moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer*(*get_token())()
{
return GetToken;
}
DLL_EXPORT Profiler&(*get_profiler())()
{
return GetProfiler;
}
#if defined TRACY_HW_TIMER && __ARM_ARCH >= 6 #if defined TRACY_HW_TIMER && __ARM_ARCH >= 6
DLL_EXPORT int64_t(*get_GetTimeImpl())() DLL_EXPORT int64_t(*get_GetTimeImpl())()

4
client/TracyProfiler.hpp
View File

@ -52,7 +52,7 @@ struct SourceLocationData
uint32_t color; uint32_t color;
}; };
tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken(); moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken();
Profiler& GetProfiler(); Profiler& GetProfiler();
class GpuCtx; class GpuCtx;
@ -69,7 +69,7 @@ struct LuaZoneState
}; };
#endif #endif
using Magic = tracy::moodycamel::ConcurrentQueueDefaultTraits::index_t; using Magic = moodycamel::ConcurrentQueueDefaultTraits::index_t;
#if __ARM_ARCH >= 6 #if __ARM_ARCH >= 6
extern int64_t (*GetTimeImpl)(); extern int64_t (*GetTimeImpl)();