diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
| commit | c1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch) | |
| tree | 6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/llrender | |
| parent | d53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff) | |
| parent | d1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff) | |
Merging in main repository.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index e52411ebe5..9b2874c79d 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1124,6 +1124,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("global_gamma"); mReservedUniforms.push_back("texture_gamma"); + + mReservedUniforms.push_back("specular_color"); + mReservedUniforms.push_back("env_intensity"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index a711a64919..1c97ab4e60 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -168,6 +168,9 @@ public: GLOBAL_GAMMA, TEXTURE_GAMMA, + SPECULAR_COLOR, + ENVIRONMENT_INTENSITY, + END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |