From eda11a25a465dd87b187f63da661f2ce02925deb Mon Sep 17 00:00:00 2001 From: Geenz Date: Fri, 11 Jan 2013 06:37:21 -0500 Subject: Initial (largely complete) gamma correct rendering implementation. --- indra/newview/llwlparamset.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llwlparamset.cpp') 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 @@ -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) -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/llwlparamset.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/llwlparamset.cpp (limited to 'indra/newview/llwlparamset.cpp') diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp old mode 100644 new mode 100755 -- cgit v1.2.3 From bfbf64f39aefd747a81d48dc7b4eed75443e6dff Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 7 Jun 2013 16:50:22 -0500 Subject: NORSPEC-230 Fix for incorrect gamma under water. --- indra/newview/llwlparamset.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llwlparamset.cpp') diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 0b5e0235ee..dba3970635 100755 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -129,7 +129,7 @@ void LLWLParamSet::update(LLGLSLShader * shader) const } } - if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender) + if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && !LLPipeline::sUnderWaterRender) { shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); } else { -- cgit v1.2.3