diff options
| author | Callum Prentice <callum@gmail.com> | 2020-10-14 13:47:26 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-10-14 13:47:26 -0700 |
| commit | 1cdcc00319c87b9be6ed677e4b36b0b53a1acb3e (patch) | |
| tree | e056d5af138131e577ba91428db3069007847a7d /indra/newview/lldynamictexture.cpp | |
| parent | a350009614c0840e5535d5c7d2281ecb3104642d (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Mostly automatic merge with canonical viewer after release
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 1e8c57ac6a..89c20904c1 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -125,11 +125,11 @@ BOOL LLViewerDynamicTexture::render() //----------------------------------------------------------------------------- void LLViewerDynamicTexture::preRender(BOOL clear_depth) { - //only images up to 1024*1024 are supported - llassert(mFullHeight <= 512); - llassert(mFullWidth <= 512); + gPipeline.allocatePhysicsBuffer(); + llassert(mFullWidth <= static_cast<S32>(gPipeline.mPhysicsDisplay.getWidth())); + llassert(mFullHeight <= static_cast<S32>(gPipeline.mPhysicsDisplay.getHeight())); - if (gGLManager.mHasFramebufferObject && gPipeline.mBake.isComplete()) + if (gGLManager.mHasFramebufferObject && gPipeline.mPhysicsDisplay.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.mBake.isComplete(); + bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mBake.isComplete() && !gGLManager.mIsATI; if (use_fbo) { |