diff options
| author | Rye <rye@lindenlab.com> | 2024-11-06 04:06:29 -0500 |
|---|---|---|
| committer | Rye <rye@lindenlab.com> | 2024-11-06 04:49:14 -0500 |
| commit | d9ee26fcbabbb5fe94006b8d31d4bfb988f7b53e (patch) | |
| tree | 6aafff88b75e478ca62e5ad3705377be11c8a797 /indra/llcommon | |
| parent | c092782cf76f90d42aa21fed318126f3f094d793 (diff) | |
Improve Tracy OpenGL integration
Fix memory profiling when gpu profiling enabled
Fix disabling renderdoc support
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llcommon.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llprofiler.h | 26 |
2 files changed, 10 insertions, 18 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index 832a7a2b0a..110a1c32a1 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -33,7 +33,7 @@ #include "lltracethreadrecorder.h" #include "llcleanup.h" -#if LL_PROFILER_CONFIGURATION > 1 && TRACY_ENABLE && !LL_PROFILER_ENABLE_TRACY_OPENGL +#if LL_PROFILER_CONFIGURATION > 1 && TRACY_ENABLE // Override new/delete for tracy memory profiling void* ll_tracy_new(size_t size) diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index e5cde192d9..6ff4341b69 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -78,11 +78,8 @@ #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER #include "tracy/Tracy.hpp" - // Enable OpenGL profiling - #define LL_PROFILER_ENABLE_TRACY_OPENGL 0 - // Enable RenderDoc labeling - #define LL_PROFILER_ENABLE_RENDER_DOC 0 + //#define LL_PROFILER_ENABLE_RENDER_DOC 0 #endif @@ -156,21 +153,18 @@ #endif // LL_PROFILER #if LL_PROFILER_ENABLE_TRACY_OPENGL -#define LL_PROFILE_GPU_ZONE(name) TracyGpuZone(name) -#define LL_PROFILE_GPU_ZONEC(name,color) TracyGpuZoneC(name,color) +#define LL_PROFILE_GPU_ZONE(name) TracyGpuZone(name) +#define LL_PROFILE_GPU_ZONEC(name,color) TracyGpuZoneC(name,color) #define LL_PROFILER_GPU_COLLECT TracyGpuCollect #define LL_PROFILER_GPU_CONTEXT TracyGpuContext - -// 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_PROFILER_GPU_CONTEXT_NAMED TracyGpuContextName #else -#define LL_PROFILE_GPU_ZONE(name) (void)name; -#define LL_PROFILE_GPU_ZONEC(name,color) (void)name;(void)color; +#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) +#define LL_PROFILER_GPU_CONTEXT_NAMED(name) (void)name; +#endif // LL_PROFILER_ENABLE_TRACY_OPENGL #if LL_PROFILER_CONFIGURATION > 1 #define LL_PROFILE_ALLOC(ptr, size) TracyAlloc(ptr, size) @@ -180,9 +174,7 @@ #define LL_PROFILE_FREE(ptr) (void)(ptr); #endif -#endif // LL_PROFILER_ENABLE_TRACY_OPENGL - -#if LL_PROFILER_ENABLE_RENDER_DOC +#ifdef LL_PROFILER_ENABLE_RENDER_DOC #define LL_LABEL_OBJECT_GL(type, name, length, label) glObjectLabel(type, name, length, label) #else #define LL_LABEL_OBJECT_GL(type, name, length, label) |