diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-01 13:41:31 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-01 13:41:31 -0800 |
| commit | 5a8610ccb7e1f5a0e4d54170ac922e6820ce3acb (patch) | |
| tree | 13af4da0c897474ca41d7c797b15fe3148ad6ada /indra/llrender/llshadermgr.cpp | |
| parent | 6716e543a160dd50913309834e7bd2d00034854c (diff) | |
SL-9996, SL-1130, SL-5546
Fix bug with setting texture matrix for rigged mesh.
Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth.
Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning
(we can no longer depend on them being mutex to each other).
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 807e41dc97..3989c1e2e4 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1350,7 +1350,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("sh_input_g"); mReservedUniforms.push_back("sh_input_b"); - mReservedUniforms.push_back("sun_up_factor"); + mReservedUniforms.push_back("sun_moon_glow_factor"); mReservedUniforms.push_back("water_edge"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); |