diff options
| author | Rye <rye@lindenlab.com> | 2024-11-06 10:41:41 -0500 |
|---|---|---|
| committer | Rye <rye@lindenlab.com> | 2024-11-06 23:57:15 -0800 |
| commit | 03231789c016245cdc93d154502c879386030de1 (patch) | |
| tree | 271d92fe20edeede34e4d0424d65ffd640f23bc0 | |
| parent | d9ee26fcbabbb5fe94006b8d31d4bfb988f7b53e (diff) | |
Update Tracy to 0.11.1
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index 42d3465346..60a2453520 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2568,11 +2568,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>226225ec049826c35adc5e897e0398ed64d4bedb</string> + <string>0c3d01b7e9e39c23f0f40c56a1a04d1fba08ead0</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.0%2Br1/tracy-v0.11.0.10376230034-darwin64-10376230034.tar.zst</string> + <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.1-r1/tracy-v0.11.1.11706699176-darwin64-11706699176.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -2582,11 +2582,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>8c5429d1a1486f40cf7e5e88a232222d1fa4f78e</string> + <string>b46cef5646a8d0471ab6256fe5119220fa238772</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.0%2Br1/tracy-v0.11.0.10376230034-windows64-10376230034.tar.zst</string> + <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.1-r1/tracy-v0.11.1.11706699176-windows64-11706699176.tar.zst</string> </map> <key>name</key> <string>windows64</string> @@ -2596,11 +2596,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>ed0664a009aba1dcf1246d845839f524e857162e</string> + <string>beab04c9ea6036b1851a485b65c66cf6a38f0be4</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.0%2Br1/tracy-v0.11.0.10376230034-linux64-10376230034.tar.zst</string> + <string>https://github.com/secondlife/3p-tracy/releases/download/v0.11.1-r1/tracy-v0.11.1.11706699176-linux64-11706699176.tar.zst</string> </map> <key>name</key> <string>linux64</string> @@ -2613,7 +2613,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>copyright</key> <string>Copyright (c) 2017-2024, Bartosz Taudul (wolf@nereid.pl)</string> <key>version</key> - <string>v0.11.0.10376230034</string> + <string>v0.11.1.11706699176</string> <key>name</key> <string>tracy</string> <key>canonical_repo</key> diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 3dbbda11f9..febe2d1e41 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -113,6 +113,11 @@ static void exceptionTerminateHandler() int main( int argc, char **argv ) { + // Call Tracy first thing to have it allocate memory + // https://github.com/wolfpld/tracy/issues/196 + LL_PROFILER_FRAME_END; + LL_PROFILER_SET_THREAD_NAME("App"); + gArgC = argc; gArgV = argv; |