diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-03 11:31:08 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-03 11:31:08 -0400 |
| commit | 3bbe5b6d96a53454adaa13ad6e590717c287c3f7 (patch) | |
| tree | e19c32a7939a0293e0346fe958cfb103c8747a16 /indra | |
| parent | 71422c6820cf77f299983f8f7aa9d618d5b2f525 (diff) | |
CTS-237 WIP test performance to validate new ARC algorithm
minor cleanup and fixing the linux build.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 2bfbe0e1c4..36aee733fd 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -1126,9 +1126,6 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t base_total_time += base_data[i]["Total"]["Time"].asReal(); } - LLSD::Real total_time = llmax(base_total_time, cur_total_time); - - //allocate raw scratch space LLPointer<LLImageRaw> scratch = new LLImageRaw(1024, 512, 3); @@ -1147,11 +1144,8 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t { std::string label = *iter; - LLSD::Real cur_start_time = -1.0; - LLSD::Real cur_end_time = 0.0; - LLSD::Real max_time = 0.0; - LLSD::Integer max_calls = 0.0; + LLSD::Integer max_calls = 0; LLSD::Real max_execution = 0.0; std::vector<LLSD::Real> cur_execution; diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index ebb5c1ce48..ec88813b5b 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -132,8 +132,7 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue) bool status = !newvalue.asBoolean(); if (!status) { - gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, - LLPipeline::RENDER_TYPE_WL_SKY, + gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_WL_SKY, LLPipeline::RENDER_TYPE_GROUND, LLPipeline::RENDER_TYPE_TERRAIN, LLPipeline::RENDER_TYPE_GRASS, @@ -144,13 +143,12 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue) LLPipeline::RENDER_TYPE_PARTICLES, LLPipeline::RENDER_TYPE_CLOUDS, LLPipeline::RENDER_TYPE_HUD_PARTICLES, - LLPipeline::END_RENDER_TYPES); + LLPipeline::END_RENDER_TYPES); gPipeline.setRenderDebugFeatureControl(LLPipeline::RENDER_DEBUG_FEATURE_UI, false); } else { - gPipeline.andRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, - LLPipeline::RENDER_TYPE_WL_SKY, + gPipeline.andRenderTypeMask(LLPipeline::RENDER_TYPE_WL_SKY, LLPipeline::RENDER_TYPE_GROUND, LLPipeline::RENDER_TYPE_TERRAIN, LLPipeline::RENDER_TYPE_GRASS, |