summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2021-09-22 00:47:17 +0000
committerMichael Pohoreski <ptolemy@lindenlab.com>2021-09-22 00:47:17 +0000
commitb1c32db37f74de715b4d6f9e98653f482e05df51 (patch)
treea058633fae18cfff9bb3e0688ccbdea8fb558a1d /indra/llwindow
parent7fe2856516d9e0de0fda6ff389ad3cc977b2d309 (diff)
parentd03ade68d36525a8b7abc0a783636cebda006ef4 (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/llwindow')
-rw-r--r--indra/llwindow/llwindowwin32.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index b2b123f0da..1b8881cc86 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1748,6 +1748,8 @@ const S32 max_format = (S32)num_formats - 1;
return FALSE;
}
+ LL_PROFILER_GPU_CONTEXT
+
if (!gGLManager.initGL())
{
close();
@@ -3474,6 +3476,8 @@ BOOL LLWindowWin32::resetDisplayResolution()
void LLWindowWin32::swapBuffers()
{
SwapBuffers(mhDC);
+
+ LL_PROFILER_GPU_COLLECT
}