Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
cdf2bdaf
Commit
cdf2bdaf
authored
3 years ago
by
Ptolemy
Browse files
Options
Downloads
Patches
Plain Diff
SL-15709: Add Darwin support
parent
c443dc51
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
autobuild.xml
+7
-7
7 additions, 7 deletions
autobuild.xml
indra/llcommon/llframetimer.cpp
+8
-0
8 additions, 0 deletions
indra/llcommon/llframetimer.cpp
indra/llcommon/llprofiler.h
+2
-0
2 additions, 0 deletions
indra/llcommon/llprofiler.h
with
17 additions
and
7 deletions
autobuild.xml
+
7
−
7
View file @
cdf2bdaf
...
@@ -3088,9 +3088,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
...
@@ -3088,9 +3088,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
c7820c2c3df46ffef6b09de4a8772f86
</string>
<string>
da7317e4a81609f624f84780f28b07de
</string>
<key>
url
</key>
<key>
url
</key>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
4525/786813
/tracy-v0.7.8.56
160
1-darwin64-56
160
1.tar.bz2
</string>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
6972/801630
/tracy-v0.7.8.56
335
1-darwin64-56
335
1.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
darwin64
</string>
<string>
darwin64
</string>
...
@@ -3100,11 +3100,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
...
@@ -3100,11 +3100,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
503a6ea5c08e17a6709f11cb55b4204a
</string>
<string>
47c696cd2966c5cc3c8ba6115dd1f886
</string>
<key>
hash_algorithm
</key>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<string>
md5
</string>
<key>
url
</key>
<key>
url
</key>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
5310/791192
/tracy-v0.7.8.56
2170
-windows-56
2170
.tar.bz2
</string>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
6973/801641
/tracy-v0.7.8.56
3351
-windows-56
3351
.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
windows
</string>
<string>
windows
</string>
...
@@ -3114,11 +3114,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
...
@@ -3114,11 +3114,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
3f61d596
ee
e
65
0763e3cb1d9f6869ed2
</string>
<string>
b649
ee65
91e67d2341e886b3fc3484a7
</string>
<key>
hash_algorithm
</key>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<string>
md5
</string>
<key>
url
</key>
<key>
url
</key>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
5309/791191
/tracy-v0.7.8.56
2170
-windows64-56
2170
.tar.bz2
</string>
<string>
https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8
6974/801642
/tracy-v0.7.8.56
3351
-windows64-56
3351
.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
windows64
</string>
<string>
windows64
</string>
...
@@ -3129,7 +3129,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
...
@@ -3129,7 +3129,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
source_type
</key>
<key>
source_type
</key>
<string>
git
</string>
<string>
git
</string>
<key>
version
</key>
<key>
version
</key>
<string>
v0.7.8.56
2170
</string>
<string>
v0.7.8.56
3351
</string>
</map>
</map>
<key>
tut
</key>
<key>
tut
</key>
<map>
<map>
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llframetimer.cpp
+
8
−
0
View file @
cdf2bdaf
...
@@ -29,6 +29,14 @@
...
@@ -29,6 +29,14 @@
#include
"llframetimer.h"
#include
"llframetimer.h"
// On Windows we build a static lib and link with that
// On macOS we don't bother building a stand alone lib, just include the one source file we need for Tracy support
#if LL_DARWIN
#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
#include
"TracyClient.cpp"
#endif // LL_PROFILER_CONFIGURATION
#endif // LL_DARWIN
// Static members
// Static members
//LLTimer LLFrameTimer::sInternalTimer;
//LLTimer LLFrameTimer::sInternalTimer;
U64
LLFrameTimer
::
sStartTotalTime
=
totalTime
();
U64
LLFrameTimer
::
sStartTotalTime
=
totalTime
();
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llprofiler.h
+
2
−
0
View file @
cdf2bdaf
...
@@ -32,7 +32,9 @@
...
@@ -32,7 +32,9 @@
#define LL_PROFILER_CONFIG_TRACY 2 // Profiling on: Only Tracy
#define LL_PROFILER_CONFIG_TRACY 2 // Profiling on: Only Tracy
#define LL_PROFILER_CONFIG_TRACY_FAST_TIMER 3 // Profiling on: Fast Timers + Tracy
#define LL_PROFILER_CONFIG_TRACY_FAST_TIMER 3 // Profiling on: Fast Timers + Tracy
#ifndef LL_PROFILER_CONFIGURATION
#define LL_PROFILER_CONFIGURATION LL_PROFILER_CONFIG_FAST_TIMER
#define LL_PROFILER_CONFIGURATION LL_PROFILER_CONFIG_FAST_TIMER
#endif
#if defined(LL_PROFILER_CONFIGURATION) && (LL_PROFILER_CONFIGURATION > LL_PROFILER_CONFIG_NONE)
#if defined(LL_PROFILER_CONFIGURATION) && (LL_PROFILER_CONFIGURATION > LL_PROFILER_CONFIG_NONE)
#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment