livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CTS-237 WIP test performance to validate new ARC algorithm 

minor cleanup and fixing the linux build.
master
Nyx (Neal Orman) 2010-09-03 11:31:08 -04:00
parent 71422c6820
commit 3bbe5b6d96
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfasttimerview.cpp
View File

@ -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;

8
indra/newview/llviewercontrol.cpp
View File

@ -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,