summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparamset.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-04 01:01:07 +0100
committerKitty Barnett <develop@catznip.com>2013-02-04 01:01:07 +0100
commitd149aea87c3214ea9510ea43a7e23e03cdcb27e6 (patch)
treefbda1184d646a86b63d5496fe64e9a7659788f1d /indra/newview/llwlparamset.cpp
parent0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff)
parent132db13fb6bb6dd802d3ee000a10e91127403547 (diff)
Merged with viewer-dev-materials
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
-rw-r--r--indra/newview/llwlparamset.cpp8
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)