Get DoF working

Need to fix up bloom.

DRTVWR-559
SL-19524
SL-19513

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 61a17e5f52..8f06ef4a42 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -1091,7 +1091,7 @@ S32 LLGLSLShader::bindTexture(S32 uniform, LLRenderTarget* texture, bool depth,
 
     if (uniform < 0 || uniform >= (S32)mTexture.size())
     {
-        LL_SHADER_UNIFORM_ERRS() << "Uniform out of range: " << uniform << LL_ENDL;
+        //LL_SHADER_UNIFORM_ERRS() << "Uniform out of range: " << uniform << LL_ENDL;
         return -1;
     }
 
@@ -1099,7 +1099,7 @@ S32 LLGLSLShader::bindTexture(S32 uniform, LLRenderTarget* texture, bool depth,
 
     if (uniform > -1)
     {
-        gGL.getTexUnit(uniform)->bindManual(texture->getUsage(), texture->getTexture(0));
+        gGL.getTexUnit(uniform)->bind(texture, depth);
 
 
         gGL.getTexUnit(uniform)->setTextureFilteringOption(mode);