diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-11 18:52:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-11 18:52:27 -0500 |
| commit | 7d56fb04dfdf47768e2e81ec80d15737370af271 (patch) | |
| tree | 29a9188f7ad87c687afca4f26f6f75649f19a5f4 /indra/newview/llwlparamset.cpp | |
| parent | 597b374f382946b95d556af82cad612124b3211a (diff) | |
| parent | de0863ed6e91fda0c1b5342b9fecf07c4af47d63 (diff) | |
merge gamma correction rendering
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index b04d30db55..0b5e0235ee 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -33,6 +33,7 @@ #include "llglslshader.h" #include "lluictrlfactory.h" #include "llsliderctrl.h" +#include "pipeline.h" #include <llgl.h> @@ -127,6 +128,13 @@ void LLWLParamSet::update(LLGLSLShader * shader) const } } } + + if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender) + { + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); + } else { + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); + } } void LLWLParamSet::set(const std::string& paramName, float x) |