diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-19 17:54:48 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-19 17:54:48 +0000 |
| commit | 1ef89151bda78b39f44071cfdbb28f1f0450b436 (patch) | |
| tree | 70700a5b62831c62af693fa88c8c7c5f47fc77ac /indra | |
| parent | 800b08efd01d55c87b24c5b300c7f676af18413d (diff) | |
| parent | 741d283c0e51d96c3f4e3d42284422f856a7b4f7 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #100)
SL-9696
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 4dd0d3ec98..56f3b75792 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -718,12 +718,11 @@ void LLDrawPoolWater::shade() sNeedsDistortionUpdate = TRUE; face->renderIndexed(); } - // MAINT-9006 using squash clip even for deferred keeps - // horizon consistent between ALM and non-ALM rendering - // I can't think of a reason we'd want to avoid it. - g - //else if (gGLManager.mHasDepthClamp || deferred_render) - else if (gGLManager.mHasDepthClamp) - { + // using squash clip for deferred rendering makes the horizon lines match + // between ALM and non-ALM rendering (SL-1655), but introduces an ugly seem between + // near and far water(SL-9696)...we're going to live with the former and not cause the latter + else if (gGLManager.mHasDepthClamp || deferred_render)
+ { face->renderIndexed(); } else |