diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-11 09:36:01 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-11 09:36:01 -0800 |
| commit | aafa561215b7b69a72d00ed709d6411f6438474d (patch) | |
| tree | a9063b0bd31c0c1932b3193b1164f32e561c4975 /indra/newview/pipeline.cpp | |
| parent | 3e0c9087cd6b26a64831f99bf9be05daa1dec510 (diff) | |
SL-10500
Replace clamp on height in atmospherics calcs on fragment shader path.
Fix colorspace conversions in material shaders in forward rendering mode.
Fix deferred shaders not setting the sun_up_factor uniform and getting moonlight instead of sunlight.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8bc8de3dba..efb3b7c69b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8507,6 +8507,8 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_ shader.uniform1f(LLShaderMgr::DEFERRED_DEPTH_CUTOFF, RenderEdgeDepthCutoff); shader.uniform1f(LLShaderMgr::DEFERRED_NORM_CUTOFF, RenderEdgeNormCutoff); + LLEnvironment& environment = LLEnvironment::instance(); + shader.uniform1i(LLShaderMgr::SUN_UP_FACTOR, environment.getIsSunUp() ? 1 : 0); if (shader.getUniformLocation(LLShaderMgr::DEFERRED_NORM_MATRIX) >= 0) { |