diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-26 15:44:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-26 15:44:02 -0500 |
| commit | fd578f1136301a3b5574e213b39743635f8cff14 (patch) | |
| tree | 1c4971317f05527b922df556b92f0dd57b805bcb | |
| parent | 28ccf4190e83670af2f03015ac16db6b9c76c805 (diff) | |
MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems.
| -rw-r--r-- | indra/newview/lldrawable.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index c1f82edaaa..82ea5cd5a6 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -432,7 +432,7 @@ void LLDrawable::makeActive() updatePartition(); } - llassert(isRoot() || mParent->isActive()); + llassert(isAvatar() || isRoot() || mParent->isActive()); } diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index a93b2b71de..fa42b157a7 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -129,7 +129,7 @@ void LLViewerDynamicTexture::preRender(BOOL clear_depth) llassert(mFullHeight <= 512); llassert(mFullWidth <= 512); - if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete()) + if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI) { //using offscreen render target, just use the bottom left corner mOrigin.set(0, 0); } @@ -216,7 +216,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() return TRUE; } - bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete(); + bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI; if (use_fbo) { |