livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in graham_linden/viewer-eep-graham (pull request #100) 

SL-9696
meow-7.2.2
Rider Linden 2018-09-19 17:54:48 +00:00
parent 800b08efd0 741d283c0e
commit 1ef89151bd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/lldrawpoolwater.cpp
View File

@ -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