diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
| commit | 1f4bc180502d1a4448e18715596a61ae9f406c4f (patch) | |
| tree | 009f70b9f3d27ce28571d0f056a169497bb74b9f /indra/newview/llwlparamset.cpp | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | 2b51a7a60942b1efc99cee43489ef2f92fa7a188 (diff) | |
merge
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 02d914a812..22fba90f65 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -91,8 +91,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 +119,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const { val.mV[0] = i->second.asBoolean(); } - + stop_glerror(); shader->uniform4fv(param, 1, val.mV); + stop_glerror(); } } } |