From 741d283c0e51d96c3f4e3d42284422f856a7b4f7 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 19 Sep 2018 18:47:39 +0100 Subject: SL-9696 Remove squashfarclip hackery to make horizon lines in deferred match non-ALM rendering to avoid seam when rendering deferred. --- indra/newview/lldrawpoolwater.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'indra/newview') 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 -- cgit v1.2.3