summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
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/newview/llappviewerwin32.cpp
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/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 9daea515e5..fb53a7648d 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -323,6 +323,10 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
PWSTR pCmdLine,
int nCmdShow)
{
+ // Call Tracy first thing to have it allocate memory
+ // https://github.com/wolfpld/tracy/issues/196
+ LL_PROFILER_FRAME_END
+
const S32 MAX_HEAPS = 255;
DWORD heap_enable_lfh_error[MAX_HEAPS];
S32 num_heaps = 0;