summaryrefslogtreecommitdiff
path: root/indra/newview/lldynamictexture.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-05-17 18:34:14 -0500
committerDave Parks <davep@lindenlab.com>2012-05-17 18:34:14 -0500
commit08a621f0509bc6232e2ca1da0b0017ecd365f3ff (patch)
tree4aac1c36fd856c5119eb439869d70fbc2e1473ac /indra/newview/lldynamictexture.cpp
parentaa0a0542a10ba6faeca34afd6e323b505493d8dc (diff)
MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
-rw-r--r--indra/newview/lldynamictexture.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index a93b2b71de..bf8338e5f2 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -216,12 +216,14 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
return TRUE;
}
+#if 0 //THIS CAUSES MAINT-1092
bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete();
if (use_fbo)
{
gPipeline.mWaterDis.bindTarget();
}
+#endif
LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind();
@@ -256,10 +258,12 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
}
}
+#if 0
if (use_fbo)
{
gPipeline.mWaterDis.flush();
}
+#endif
return ret;
}