diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-14 21:52:52 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-14 21:52:52 +0100 |
| commit | 1df7760d315430766bba44d4d4c64480b4a6138f (patch) | |
| tree | f84ded9bc43e43b2c2fc985ed7a95aa4f0add69c /indra/llrender | |
| parent | a167f8857fd242e007a6bcbcee80a54a953f29f3 (diff) | |
SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 1 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 78aed5eef6..3c25d6aaa8 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1319,6 +1319,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("single_mie_scattering_texture"); mReservedUniforms.push_back("irradiance_texture"); mReservedUniforms.push_back("blend_factor"); + mReservedUniforms.push_back("no_atmo"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 342f5d5507..7898b2d90a 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -233,6 +233,7 @@ public: ILLUMINANCE_TEX, BLEND_FACTOR, + NO_ATMO, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |