diff options
author | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
commit | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (patch) | |
tree | 5a2652bef97f1bb2d76c0b86482cebe2b2505a79 /indra/llrender/llshadermgr.cpp | |
parent | 93503a05ec905ef2a8df39802fdc3475c961f3bc (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
The unbearable lightness of being norspec
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rwxr-xr-x | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index d1afd2ed28..d230574752 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1137,7 +1137,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("lightMap"); mReservedUniforms.push_back("bloomMap"); mReservedUniforms.push_back("projectionMap"); - + mReservedUniforms.push_back("norm_mat"); + mReservedUniforms.push_back("global_gamma"); mReservedUniforms.push_back("texture_gamma"); @@ -1183,7 +1184,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("alpha_ramp"); mReservedUniforms.push_back("origin"); - + mReservedUniforms.push_back("display_gamma"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); std::set<std::string> dupe_check; |