aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/llfasttimer.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index 2e66496..60281fd 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -70,6 +71,14 @@ public:
70 FTM_UPDATE_AVATAR, 71 FTM_UPDATE_AVATAR,
71 72
72 // common render components 73 // common render components
74 FTM_SHADOW_GEOMETRY,
75 FTM_SHADOW_RENDER,
76 FTM_SHADOW_TERRAIN,
77 FTM_SHADOW_AVATAR,
78 FTM_SHADOW_SIMPLE,
79 FTM_SHADOW_ALPHA,
80 FTM_SHADOW_TREE,
81
73 FTM_RENDER_GEOMETRY, 82 FTM_RENDER_GEOMETRY,
74 FTM_RENDER_TERRAIN, 83 FTM_RENDER_TERRAIN,
75 FTM_RENDER_SIMPLE, 84 FTM_RENDER_SIMPLE,
@@ -185,11 +194,13 @@ public:
185 enum { FTM_MAX_DEPTH = 64 }; 194 enum { FTM_MAX_DEPTH = 64 };
186 195
187public: 196public:
197 static LLFastTimer::EFastTimerType sCurType;
198
188 LLFastTimer(EFastTimerType type) 199 LLFastTimer(EFastTimerType type)
189 { 200 {
190#if FAST_TIMER_ON 201#if FAST_TIMER_ON
191 mType = type; 202 mType = type;
192 203 sCurType = type;
193 // These don't get counted, because they use CPU clockticks 204 // These don't get counted, because they use CPU clockticks
194 //gTimerBins[gCurTimerBin]++; 205 //gTimerBins[gCurTimerBin]++;
195 //LLTimer::sNumTimerCalls++; 206 //LLTimer::sNumTimerCalls++;