diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-10 10:20:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-10 10:20:16 -0500 |
| commit | 5890f423b4ae0f372d72af413b2296e5291bfa67 (patch) | |
| tree | fe8c300d2f28b52182830492be1db47ffa50fdd9 /indra/llcommon | |
| parent | 0fed3884c21453eac23a4de714bc87cac9e5377e (diff) | |
| parent | 5c65f58cb8c6a0065c2aaa7c4e7286124203f241 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llprofiler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index c0f5868db3..ac20209062 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -153,12 +153,16 @@ extern thread_local bool gProfilerEnabled; // disable memory tracking (incompatible with GPU tracing #define LL_PROFILE_ALLOC(ptr, size) (void)(ptr); (void)(size); #define LL_PROFILE_FREE(ptr) (void)(ptr); + +#define LL_LABEL_OBJECT_GL(type, name, length, label) glObjectLabel(type, name, length, label) #else #define LL_PROFILE_GPU_ZONE(name) (void)name; #define LL_PROFILE_GPU_ZONEC(name,color) (void)name;(void)color; #define LL_PROFILER_GPU_COLLECT #define LL_PROFILER_GPU_CONTEXT +#define LL_LABEL_OBJECT_GL(type, name, length, label) + #if LL_PROFILER_CONFIG > 1 #define LL_PROFILE_ALLOC(ptr, size) TracyAlloc(ptr, size) #define LL_PROFILE_FREE(ptr) TracyFree(ptr) |