livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,389 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

25 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Ansariel 830eeaa6ff Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llface.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llviewertexturelist.cpp
 2024-08-21 00:46:46 +02:00
Dave Parks 16c9c47f14
#2354 Enable Tracy on test builds (#2357) 
* #2354 Enable Tracy on test builds

* Only enable Tracy by default on windows
 2024-08-20 06:50:33 -05:00
Ansariel 07228d3a9e Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/Tracy.cmake
#	indra/llappearance/llavatarappearancedefines.cpp
#	indra/llcommon/llprofiler.cpp
#	indra/llcommon/llprofiler.h
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llfilesystem/lldiskcache.h
#	indra/llinventory/llinventorytype.cpp
#	indra/media_plugins/example/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llgroupmgr.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatarself.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/viewer_manifest.py
 2024-08-15 00:12:13 +02:00
Andrey Lihatskiy 6f0e676521
Update indra/cmake/Tracy.cmake 
to stop pre-commit from complaining
 2024-08-14 06:03:39 +03:00
Rye Mutt 183b097072 Update tracy integration to 0.11 and rework client library to be configurable at build time 
Also copy tracy profiler client next to windows binary when enabled
 2024-08-13 17:27:30 -04:00
Beq b254e49ddc Minimalist changes for Tracy010 2024-05-28 18:16:00 +01:00
Ansariel 9ffb2514db Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llviewermenu.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-04-17 10:01:32 +02:00
Ansariel a6693e9c9e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.gitignore
 2023-04-16 18:59:53 +02:00
Ansariel 766acfa818 More CMake cleanup 2023-04-06 11:43:15 +02:00
Ansariel 82802e59f6 Wrong! 2023-04-03 14:34:42 +02:00
Beq fc4181b478 Odd merge issue and ignore more crap. 2023-04-03 12:39:43 +01:00
Brad Linden 982281b6cb Fix Tracy linking after recent DRTVWR-559/main merge 2023-03-31 13:51:21 -07:00
Brad Linden 1b6cd23abd CMake and tests fixups after merge with main for DRTVWR-559 2023-03-30 13:46:00 -07:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Brad Kittenbrink (Brad Linden) 7d4b0cd657 Updated tracy packages and config for tracy-v0.8.1 for SL-18563 2023-02-10 16:02:24 -08:00
Brad Linden 3fd8bc04c2 Upgraded tracy package and enabled for mac with USE_TRACY for work on mac perfomance SL-18563 
```
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2" hash="70f31fa71ecb52bd092da52e27c3ff8c"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2" hash="1dc33422939adf015db85e96c5a8276e"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2" hash="fcc6ecece2ecb65aa36500dfa9461fb3"
```
 2023-02-10 11:26:14 -08:00
Nicky 3f31d0b5a7 Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan. 2022-07-17 17:51:25 +02:00
Nicky c08a61453b Port new cmake files (Trace/Meshoptimizer) to modern cmake 2022-06-05 16:15:55 +02:00
Dave Parks 6c6d9a10f8 SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation. 2022-05-20 13:31:18 -05:00
Dave Parks d2dce17803 SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead. 2021-10-19 02:26:41 +00:00
Ptolemy c37cc7c3a4 SL-15709: Windows: Include Tracy source directly; don't use a library 2021-09-03 17:20:22 -07:00
Ptolemy 240000c01c SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled 2021-08-31 21:23:10 -07:00
Ptolemy bb601196dd SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast Timers; also print Tracy include directory 2021-08-26 22:52:07 -07:00
Ptolemy 574b05531c SL-15709: Default Tracy to off 2021-08-26 22:50:08 -07:00
Dave Houlton 1a782ed690 SL-15595 update viewer autobuild to import tracy lib 2021-07-27 17:46:29 -06:00