diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-22 00:47:17 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-22 00:47:17 +0000 |
| commit | b1c32db37f74de715b4d6f9e98653f482e05df51 (patch) | |
| tree | a058633fae18cfff9bb3e0688ccbdea8fb558a1d /indra/llrender/llglheaders.h | |
| parent | 7fe2856516d9e0de0fda6ff389ad3cc977b2d309 (diff) | |
| parent | d03ade68d36525a8b7abc0a783636cebda006ef4 (diff) | |
Merged in SL-16027_Tracy_OpenGL (pull request #697)
SL-16027: Add Tracy OpenGL support
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'indra/llrender/llglheaders.h')
| -rw-r--r-- | indra/llrender/llglheaders.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 6bca3623e0..3d93cc0762 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -812,4 +812,23 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); #define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD #endif +#if defined(TRACY_ENABLE) && LL_PROFILER_ENABLE_TRACY_OPENGL + // Tracy uses the following: + // glGenQueries + // glGetQueryiv + // glGetQueryObjectiv + #define glGenQueries glGenQueriesARB + #define glGetQueryiv glGetQueryivARB + #define glGetQueryObjectiv glGetQueryObjectivARB + #include <tracy/TracyOpenGL.hpp> + + #define LL_PROFILER_GPU_ZONEC(name,color) TracyGpuZoneC(name,color); + #define LL_PROFILER_GPU_COLLECT TracyGpuCollect + #define LL_PROFILER_GPU_CONTEXT TracyGpuContext +#else + #define LL_PROFILER_GPU_ZONEC(name,color) (void)name;(void)color; + #define LL_PROFILER_GPU_COLLECT + #define LL_PROFILER_GPU_CONTEXT +#endif + #endif // LL_LLGLHEADERS_H |