SL-18958 Fix for broken water distortion map and depth buffer. Incidental decruft.

1 files changed, 2 insertions, 5 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index a8db69a9a4..d6b2aa2289 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -372,11 +372,8 @@ bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth)
 
 	if (bindDepth)
 	{
-
-		if (renderTarget->getDepth() && !renderTarget->canSampleDepth())
-		{
-			LL_ERRS() << "Cannot bind a render buffer for sampling.  Allocate render target with depth buffer sampling enabled." << LL_ENDL;
-		}
+        llassert(renderTarget->getDepth()); // target MUST have a depth buffer attachment
+        llassert(renderTarget->canSampleDepth()); // depth buffer attachment MUST be sampleable
 
 		bindManual(renderTarget->getUsage(), renderTarget->getDepth());
 	}