summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender2dutils.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:04:13 -0700
committerRichard Linden <none@none>2013-09-05 14:04:13 -0700
commitcbe397ad13665c7bc993e10d8fe1e4a876253378 (patch)
tree52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/llrender/llrender2dutils.cpp
parent12688c8b549d2baa33509dca60bbe14b039b17db (diff)
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/llrender/llrender2dutils.cpp')
-rw-r--r--indra/llrender/llrender2dutils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 3ac2d0b809..14894c53b4 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -1062,7 +1062,7 @@ void gl_rect_2d_simple( S32 width, S32 height )
gGL.end();
}
-static LLFastTimer::DeclareTimer FTM_RENDER_SEGMENTED_RECT ("Render segmented rectangle");
+static LLTrace::TimeBlock FTM_RENDER_SEGMENTED_RECT ("Render segmented rectangle");
void gl_segmented_rect_2d_tex(const S32 left,
const S32 top,
@@ -1073,7 +1073,7 @@ void gl_segmented_rect_2d_tex(const S32 left,
const S32 border_size,
const U32 edges)
{
- LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);
+ LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
S32 width = llabs(right - left);
S32 height = llabs(top - bottom);
@@ -1232,7 +1232,7 @@ void gl_segmented_rect_2d_fragment_tex(const LLRect& rect,
const F32 end_fragment,
const U32 edges)
{
- LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);
+ LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
const S32 left = rect.mLeft;
const S32 right = rect.mRight;
const S32 top = rect.mTop;
@@ -1419,7 +1419,7 @@ void gl_segmented_rect_2d_fragment_tex(const LLRect& rect,
void gl_segmented_rect_3d_tex(const LLRectf& clip_rect, const LLRectf& center_uv_rect, const LLRectf& center_draw_rect,
const LLVector3& width_vec, const LLVector3& height_vec)
{
- LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);
+ LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
gGL.begin(LLRender::QUADS);
{