diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-23 11:36:22 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-23 11:36:22 -0700 |
| commit | b507d63566e8896af702dd10f5643dc29068a8a9 (patch) | |
| tree | 2fe8accc9802ad35364cd39b6e74efde0d7e0cfd /indra/newview/pipeline.cpp | |
| parent | 230c9b68d81bcf163a6627e8474e545e8ceb2282 (diff) | |
SL-11621
Remove all references to unused shader var global_gamma.
Remove many unused decls for gamma from shaders.
Make post-deferred gamma correction use display_gamma.
Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index eb1ffc91f7..448b65272b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7913,13 +7913,6 @@ void LLPipeline::renderBloom(bool for_snapshot, F32 zoom_factor, int subfield) mScreen.bindTexture(0, channel); } - if (!LLViewerCamera::getInstance()->cameraUnderWater()) - { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); - } else { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); - } - shader->uniform1f(LLShaderMgr::DOF_MAX_COF, CameraMaxCoF); shader->uniform1f(LLShaderMgr::DOF_RES_SCALE, CameraDoFResScale); shader->uniform1f(LLShaderMgr::DOF_WIDTH, dof_width-1); @@ -7961,13 +7954,6 @@ void LLPipeline::renderBloom(bool for_snapshot, F32 zoom_factor, int subfield) mScreen.bindTexture(0, channel); } - if (!LLViewerCamera::getInstance()->cameraUnderWater()) - { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); - } else { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); - } - gGL.begin(LLRender::TRIANGLE_STRIP); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); |