summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-05 10:49:05 -0600
committerDave Parks <davep@lindenlab.com>2010-03-05 10:49:05 -0600
commitc52ed438fb84c59435867c8752e04095a2a598ef (patch)
tree0d904a3673352d41803d736f28c93eb3a2d4893d /indra/newview/pipeline.cpp
parentf6b16271b5c2b957bcd945287b718d5457c68fcd (diff)
Remove some fast timers that were being futzy.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1ae8bc5481..2f4314f7e5 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -510,6 +510,7 @@ void LLPipeline::destroyGL()
}
static LLFastTimer::DeclareTimer FTM_RESIZE_SCREEN_TEXTURE("Resize Screen Texture");
+
void LLPipeline::resizeScreenTexture()
{
LLFastTimer ft(FTM_RESIZE_SCREEN_TEXTURE);
@@ -1726,12 +1727,8 @@ void LLPipeline::markOccluder(LLSpatialGroup* group)
}
}
-static LLFastTimer::DeclareTimer FTM_DO_OCCLUSION("Do Occlusion");
-
void LLPipeline::doOcclusion(LLCamera& camera)
{
- LLFastTimer t(FTM_DO_OCCLUSION);
-
LLVertexBuffer::unbind();
if (hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION))
@@ -1948,12 +1945,9 @@ void LLPipeline::updateGeom(F32 max_dtime)
updateMovedList(mMovedBridge);
}
-static LLFastTimer::DeclareTimer FTM_MARK_VISIBLE("Mark Visible");
-
void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera)
{
LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_VISIBLE);
- LLFastTimer t(FTM_MARK_VISIBLE);
if(!drawablep || drawablep->isDead())
{
@@ -4638,12 +4632,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
mLightMask = 0;
}
-static LLFastTimer::DeclareTimer FTM_ENABLE_LIGHTS("Enable Lights");
-
void LLPipeline::enableLights(U32 mask)
{
- LLFastTimer ftm(FTM_ENABLE_LIGHTS);
-
assertInitialized();
if (mLightingDetail == 0)
@@ -5497,6 +5487,7 @@ void LLPipeline::bindScreenToTexture()
}
static LLFastTimer::DeclareTimer FTM_RENDER_BLOOM("Bloom");
+
void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
{
LLMemType mt_ru(LLMemType::MTYPE_PIPELINE_RENDER_BLOOM);