Commit Graph

43967 Commits (db86ec9176dcbfabe5fddb3603da4132443f8b7f)

Author SHA1 Message Date
Nat Goodspeed db86ec9176 SL-16040: _aligned_malloc() and _aligned_free() are Microsoft only.
Fortunately we already have platform-independent wrappers in llmemory.h.
2021-09-28 22:09:02 -04:00
Nat Goodspeed 548bfda290 SL-16040: operator new() must never return nullptr. 2021-09-28 16:53:04 -04:00
Nat Goodspeed 3e12a97a7f SL-16040: Honor autobuild_{configure,build}_parameters variables.
The generic build.sh script honors these environment variables to specify
parameters to the autobuild configure and autobuild build steps, respectively.
Support them in the viewer-specific build.sh too.

In the generic build.sh, autobuild_configure_parameters allows specifying
command-line switches either for autobuild or, following --, for the
underlying tool (in our case, CMake). In order to support that variable the
same way here, we insert -- (as before) when autobuild_configure_parameters is
unset or empty, since the rest of the switches *we* specify are for CMake.

That means that, as with the generic build.sh, a non-empty
autobuild_configure_parameters override must precede any switches intended for
CMake with the -- separator.
2021-09-28 16:40:33 -04:00
Michael Pohoreski 68be3018ab Merged in SL-16014 (pull request #692)
SL-16014

Approved-by: Euclid Linden
Approved-by: Dave Parks
2021-09-22 22:26:15 +00:00
Ptolemy aa1d3ff8fd Fix merge conflict 2021-09-22 15:14:04 -07:00
Ptolemy 43bca9e85d SL-16014: Fix typo 2021-09-22 14:58:36 -07:00
Ptolemy 5fa9b51029 SL-16014: Add Tracy markup to doFrame() 2021-09-22 14:38:44 -07:00
Ptolemy 2b19015f43 SL-16014: Add Tracy markup for LLEventFilter 2021-09-22 14:38:44 -07:00
Ptolemy 8e4907beee SL-16014: Add Tracy markup for LLVolumeFace 2021-09-22 14:38:43 -07:00
Ptolemy 51a887a51c SL-16014: Add Tracy markup for LLSD 2021-09-22 14:38:43 -07:00
Ptolemy b78db5ae5c SL-16014: Add Tracy markup to LLViewerObjectList 2021-09-22 14:38:43 -07:00
Ptolemy 584a7f05df SL-16014: Add Tracy markup to LLSpatialGroup 2021-09-22 14:38:43 -07:00
Ptolemy dd3fc66b51 SL-16014: Add Tracy markup to LLFace 2021-09-22 14:38:43 -07:00
Ptolemy 6c53fbfb47 SL-16014: Add Tracy markup for lldrawable 2021-09-22 14:38:43 -07:00
Ptolemy b9ad51981e SL-16014: Add macros for better markup in Tracy 2021-09-22 14:38:43 -07:00
Ptolemy c0eadc87e8 SL-16014: Add Tracy logging to doFrame() 2021-09-22 14:38:42 -07:00
Ptolemy 2508926569 SL-16014 Add Tracy logging to lldrawpoolavatar.cpp 2021-09-22 14:38:42 -07:00
Michael Pohoreski b1c32db37f Merged in SL-16027_Tracy_OpenGL (pull request #697)
SL-16027: Add Tracy OpenGL support

Approved-by: Euclid Linden
Approved-by: Dave Parks
2021-09-22 00:47:17 +00:00
Ptolemy d03ade68d3 SL-16027: Only enable Tracy OpengL macros if Tracy is enabled 2021-09-21 17:46:11 -07:00
Ptolemy a35544c701 SL-16027: Add Tracy OpenGL support 2021-09-21 16:10:52 -07:00
Ptolemy fff9b8dff2 SL-16014: Add Tracy markup to doFrame() 2021-09-20 09:54:32 -07:00
Ptolemy 53853cf964 SL-16014: Add Tracy markup for LLEventFilter 2021-09-20 09:48:16 -07:00
Ptolemy ed456eca5f SL-16014: Add Tracy markup for LLVolumeFace 2021-09-20 09:47:26 -07:00
Ptolemy 51062b6038 SL-16014: Add Tracy markup for LLSD 2021-09-20 09:46:43 -07:00
Ptolemy a1b9a59861 SL-16014: Add Tracy markup to LLViewerObjectList 2021-09-20 09:45:52 -07:00
Ptolemy 710cf22148 SL-16014: Add Tracy markup to LLSpatialGroup 2021-09-20 09:45:17 -07:00
Ptolemy d324873f92 SL-16014: Add Tracy markup to LLFace 2021-09-20 09:44:34 -07:00
Ptolemy b680bfcbe4 SL-16014: Add Tracy markup for lldrawable 2021-09-20 09:43:38 -07:00
Ptolemy 6b7643c4f7 SL-16014: Add macros for better markup in Tracy 2021-09-20 08:33:41 -07:00
Ptolemy b63cb4b0ae SL-16014: Add Tracy logging to doFrame() 2021-09-15 17:44:09 -07:00
Ptolemy 76b31684de SL-16014 Add Tracy logging to lldrawpoolavatar.cpp 2021-09-15 15:39:48 -07:00
Runitai Linden 7fe2856516 SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled. 2021-09-15 12:41:38 -06:00
Dave Houlton f2d4f83931 SL-15962 Add hooks for tracy memory profiling 2021-09-15 10:11:25 -06:00
Michael Pohoreski 0f60db6220 Merged in SL-15709-Tracy (pull request #677)
SL-15709: Windows: Include Tracy source directly; don't use a library
2021-09-04 00:57:46 +00:00
Ptolemy 0528890ab1 Merge branch 'DRTVWR-541' of bitbucket.org:lindenlab/viewer into DRTVWR-541 2021-09-03 17:54:26 -07:00
Ptolemy 6d2cad965c SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib 2021-09-03 17:53:44 -07:00
Ptolemy 91f4d7f7a0 SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled 2021-09-03 17:53:44 -07:00
Ptolemy 13ff2cba53 SL-15709: Add Darwin support 2021-09-03 17:53:44 -07:00
Ptolemy 92e53622ea SL-15709: Cleanup 2021-09-03 17:53:44 -07:00
Ptolemy a783f7c74a SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast Timers; also print Tracy include directory 2021-09-03 17:53:44 -07:00
Ptolemy 61175cfa01 SL-15709: Default Tracy to off 2021-09-03 17:53:44 -07:00
Ptolemy 6d74ae649c SL-15709: Default to old fast timers 2021-09-03 17:53:44 -07:00
Ptolemy df5127136f SL-15709: Add Tracy support to viewer 2021-09-03 17:53:43 -07:00
Dave Houlton 2e88a32665 SL-15595 update viewer autobuild to import tracy lib 2021-09-03 17:53:43 -07:00
Dave Houlton aa358035a3 DRTVWR-528 remove wrapper code for RAD telemetry library 2021-09-03 17:53:43 -07:00
Ptolemy c37cc7c3a4 SL-15709: Windows: Include Tracy source directly; don't use a library 2021-09-03 17:20:22 -07:00
Michael Pohoreski c49b31a459 Merged in SL-15709-Tracy (pull request #672)
SL-15709 Tracy
2021-09-01 05:40:04 +00:00
Ptolemy 3176136686 SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib 2021-08-31 21:41:03 -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 88f335ac40 Merge branch 'master' into DRTVWR-541 2021-08-27 09:36:46 -07:00