diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-31 23:06:53 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-31 23:06:53 +0000 |
| commit | 2456715a407cc11f3e0077cb3c54e21188e6ec86 (patch) | |
| tree | b52162e8c228c2822d9a1165a1c81dfa3e47661e /indra/llrender | |
| parent | 29e8215faaf0ed949ffadd81eeb92b43d6af1f3f (diff) | |
| parent | f1ee481b82275cfadbce156514920750ebdd3065 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #253)
SL-10443, SL-9994, SL-10374, SL-10081
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 2076947a00..807e41dc97 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -197,7 +197,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } // we want this BEFORE shadows and AO because those facilities use pos/norm access - if (features->isDeferred || features->hasShadows || features->hasAmbientOcclusion) + if (features->isDeferred) { if (!shader->attachObject("deferred/deferredUtil.glsl")) { @@ -1351,6 +1351,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("sh_input_b"); mReservedUniforms.push_back("sun_up_factor"); + mReservedUniforms.push_back("water_edge"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 0b1a97d880..8651265834 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -249,6 +249,7 @@ public: SH_INPUT_L1B, SUN_UP_FACTOR, + WATER_EDGE_FACTOR, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |