diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-30 08:37:07 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-30 08:37:07 -0800 |
| commit | acbc7f4cddd6ad999c2bc7690c10b85a414a8102 (patch) | |
| tree | 8af15ec5456494dc71d9eba0927ca4d5abb8aeac /indra/llrender | |
| parent | 38f69533780943b432edaac212475bea5fd013b6 (diff) | |
SL-10415, SL-10434
Further tweaking of directional shadow sampling to balance between peter-panning and shadow acne.
Move stars to just this side of the sky some to reduce parallax.
Remove decodeNormF and uses of decode_normal in favor of unified use of getNorm
(try to help the Intel HD x000 compiler learn to link correctly).
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 1 | ||||
| -rw-r--r-- | indra/llrender/llglslshader.h | 1 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 8 |
3 files changed, 0 insertions, 10 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 4dae61e185..528f23b3ee 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -80,7 +80,6 @@ LLShaderFeatures::LLShaderFeatures() , hasGamma(false) , hasSrgb(false) , encodesNormal(false) - , decodesNormal(false) , isDeferred(false) , hasIndirect(false) , hasShadows(false) diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 56d322fe6c..c06668eb43 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -52,7 +52,6 @@ public: bool hasAmbientOcclusion; bool hasSrgb; bool encodesNormal; - bool decodesNormal; bool isDeferred; bool hasIndirect; S32 mIndexedTextureChannels; diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 9db8fd1f05..2076947a00 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -253,14 +253,6 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } - if (features->decodesNormal) - { - if (!shader->attachObject("environment/decodeNormF.glsl")) - { - return FALSE; - } - } - if (features->hasAtmospherics) { if (!shader->attachObject("windlight/atmosphericsF.glsl")) |