SL-11610

Give bake its own RT to avoid issues with sharing the water distortion map.

Use glFinish to insure RTs will be complete.

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 863785889f..eb1ffc91f7 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1162,6 +1162,7 @@ void LLPipeline::releaseGLBuffers()
 
 	mWaterRef.release();
 	mWaterDis.release();
+    mBake.release();
 	mHighlight.release();
 	
 	for (U32 i = 0; i < 3; i++)
@@ -1221,12 +1222,13 @@ void LLPipeline::createGLBuffers()
     if (LLPipeline::sWaterReflections)
     { //water reflection texture
         U32 res = (U32) llmax(gSavedSettings.getS32("RenderWaterRefResolution"), 512);
-
         mWaterRef.allocate(res,res,GL_RGBA,TRUE,FALSE);
-        //always use FBO for mWaterDis so it can be used for avatar texture bakes
-        mWaterDis.allocate(res,res,GL_RGBA,TRUE,FALSE,LLTexUnit::TT_TEXTURE, true);
+        mWaterDis.allocate(res,res,GL_RGBA,TRUE,FALSE,LLTexUnit::TT_TEXTURE);
     }
 
+    // Use FBO for bake tex
+    mBake.allocate(512, 512, GL_RGBA, FALSE, FALSE, LLTexUnit::TT_TEXTURE, true);
+
 	mHighlight.allocate(256,256,GL_RGBA, FALSE, FALSE);
 
 	stop_glerror();