diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-05 21:32:42 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-05 21:32:42 +0100 |
| commit | 5eed233618abd7020e130799be2abe0f986543f6 (patch) | |
| tree | 9916d719524b39fdda5ee7ca71046fc4ca0bee42 /indra/llrender | |
| parent | 4f9d8f555efe04924a7730d3c91faaae3ea56825 (diff) | |
SL-1925
More settings for rainbow/halo atmospheric effects, final default asset UUIDs, and shader mods.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 5 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 3c25d6aaa8..153cef0317 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1320,6 +1320,11 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("irradiance_texture"); mReservedUniforms.push_back("blend_factor"); mReservedUniforms.push_back("no_atmo"); + mReservedUniforms.push_back("moisture_level"); + mReservedUniforms.push_back("droplet_radius"); + mReservedUniforms.push_back("ice_level"); + mReservedUniforms.push_back("rainbow_map"); + mReservedUniforms.push_back("halo_map"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 7898b2d90a..ffdd2da529 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -234,6 +234,11 @@ public: BLEND_FACTOR, NO_ATMO, + MOISTURE_LEVEL, + DROPLET_RADIUS, + ICE_LEVEL, + RAINBOW_MAP, + HALO_MAP, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |