summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-11 18:52:27 -0500
committerOz Linden <oz@lindenlab.com>2013-01-11 18:52:27 -0500
commit7d56fb04dfdf47768e2e81ec80d15737370af271 (patch)
tree29a9188f7ad87c687afca4f26f6f75649f19a5f4 /indra/llrender/llshadermgr.cpp
parent597b374f382946b95d556af82cad612124b3211a (diff)
parentde0863ed6e91fda0c1b5342b9fecf07c4af47d63 (diff)
merge gamma correction rendering
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r--indra/llrender/llshadermgr.cpp3
1 files changed, 3 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);