diff options
| author | Geenz <geenz@geenzo.com> | 2013-01-11 06:37:21 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-01-11 06:37:21 -0500 |
| commit | eda11a25a465dd87b187f63da661f2ce02925deb (patch) | |
| tree | e77e33b4ee7b6f18f314576948be1560c3640ce9 /indra/llrender | |
| parent | e8f6734d67ce1f61c5745bc1b25a9e5d1d599aca (diff) | |
Initial (largely complete) gamma correct rendering implementation.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 3b1ec281c9..e52411ebe5 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1121,6 +1121,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("lightMap"); mReservedUniforms.push_back("bloomMap"); mReservedUniforms.push_back("projectionMap"); + + mReservedUniforms.push_back("global_gamma"); + mReservedUniforms.push_back("texture_gamma"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 4b93aae735..a711a64919 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -164,6 +164,10 @@ public: DEFERRED_LIGHT, DEFERRED_BLOOM, DEFERRED_PROJECTION, + + GLOBAL_GAMMA, + TEXTURE_GAMMA, + END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |