diff options
author | Graham Linden <graham@lindenlab.com> | 2019-07-08 10:10:22 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-07-08 10:10:22 -0700 |
commit | 1d86dcd846ed5ea7734df507d15adf057cb2ebd0 (patch) | |
tree | 8177f71a7ef64c19ea0a4b10dacc45edda622e48 /indra/newview/lldynamictexture.cpp | |
parent | 9f2148cc1f2469a1f45f8f3f736251a0300d1d6a (diff) |
SL-10625 another shot across the bow
Move dynamic texture update (which does local back readback work) to just before swap
which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes.
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
-rw-r--r-- | indra/newview/lldynamictexture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index fa9a0712fa..5e283f7cd0 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -213,7 +213,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() sNumRenders = 0; if (gGLManager.mIsDisabled || LLPipeline::sMemAllocationThrottled) { - return TRUE; + return FALSE; } bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI; @@ -248,7 +248,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() result = TRUE; sNumRenders++; } - gGL.flush(); + //gGL.flush(); LLVertexBuffer::unbind(); dynamicTexture->postRender(result); @@ -261,6 +261,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances() gPipeline.mWaterDis.flush(); } + gGL.flush(); + return ret; } |