diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
| commit | 837e4e5165cc3e6595577e90bae240e676be8ffe (patch) | |
| tree | 85c8e8a8cb6adf8abc87fe3a70d4513a1ab625e5 /indra/newview/llwlparamset.cpp | |
| parent | 570d02dc7e41c3e08477e7f759d632db78690eb4 (diff) | |
| parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) | |
Merge with viewer-experience
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 02d914a812..5bb7025031 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -69,12 +69,18 @@ LLWLParamSet::LLWLParamSet(void) : */ } +static LLFastTimer::DeclareTimer FTM_WL_PARAM_UPDATE("WL Param Update"); + void LLWLParamSet::update(LLGLSLShader * shader) const { + LLFastTimer t(FTM_WL_PARAM_UPDATE); + for(LLSD::map_const_iterator i = mParamValues.beginMap(); i != mParamValues.endMap(); ++i) { + + const std::string& param = i->first; if( param == "star_brightness" || param == "preset_num" || param == "sun_angle" || @@ -91,8 +97,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const val.mV[1] = F32(i->second[1].asReal()) + mCloudScrollYOffset; val.mV[2] = (F32) i->second[2].asReal(); val.mV[3] = (F32) i->second[3].asReal(); - - shader->uniform4fv(param, 1, val.mV); + stop_glerror(); + shader->uniform4fv(param, 1, val.mV); + stop_glerror(); } else // param is the uniform name { @@ -118,8 +125,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const { val.mV[0] = i->second.asBoolean(); } - + stop_glerror(); shader->uniform4fv(param, 1, val.mV); + stop_glerror(); } } } |