diff options
| author | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:58 +0000 |
|---|---|---|
| committer | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:58 +0000 |
| commit | 5c65f58cb8c6a0065c2aaa7c4e7286124203f241 (patch) | |
| tree | ed8934f91cbbcd1591bf79bd46eef9b0b847500b /indra/llcommon | |
| parent | ace892b8f5b12f4c85aec70caa032a13f8d0fd2c (diff) | |
| parent | 7ff19ec98c25c6ad17b979078e77ec2cab9f7ebd (diff) | |
Merged in SL-18290 (pull request #1151)
SL-18290
Approved-by: Dave Parks
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) |