diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-24 04:03:27 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-24 04:03:27 -0700 |
| commit | e290dd3fa175c2a891cc4f4e0c401edb10cedfb4 (patch) | |
| tree | 2a542af707196211e78051cbb8a75a1a1583538d /indra/llrender | |
| parent | 72a0ae58e909b017c07e543bc99adc1db5e89180 (diff) | |
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index fea4ee2819..942f6dc86f 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1138,7 +1138,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("global_gamma"); mReservedUniforms.push_back("texture_gamma"); - + mReservedUniforms.push_back("display_gamma"); + mReservedUniforms.push_back("specular_color"); mReservedUniforms.push_back("env_intensity"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index c049e935b8..2cbeea5049 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -168,7 +168,8 @@ public: GLOBAL_GAMMA, TEXTURE_GAMMA, - + DISPLAY_GAMMA, + SPECULAR_COLOR, ENVIRONMENT_INTENSITY, |