summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-10-10 18:44:03 +0100
committerGraham Linden <graham@lindenlab.com>2018-10-10 18:44:03 +0100
commit79d33f9d19a0c6e5ed34ffbd01a31cb2625e1ecc (patch)
treef0bbe587871419ecd36363c5c1d0def6e9166825 /indra/llrender
parent4b174a31c8db1bf7f378f9b088c1335651a34ec5 (diff)
Fix names of WATER_BLUR_MULTIPILER.
Give wave direction uniforms more meaningful names in shaders. Add comments on glow size/focus conversions for clarity.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index e483f723f0..8617b58d2e 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1276,8 +1276,8 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("refTex");
mReservedUniforms.push_back("eyeVec");
mReservedUniforms.push_back("time");
- mReservedUniforms.push_back("d1");
- mReservedUniforms.push_back("d2");
+ mReservedUniforms.push_back("waveDir1");
+ mReservedUniforms.push_back("waveDir2");
mReservedUniforms.push_back("lightDir");
mReservedUniforms.push_back("specular");
mReservedUniforms.push_back("lightExp");