diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-07-16 21:15:41 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-07-16 21:15:41 +0000 |
| commit | ced2ca2acd166a28dfca5c28f1c7dff46843a5a0 (patch) | |
| tree | ee2a0170c8814672c455261cd95ae9f73502256b /indra/newview/pipeline.cpp | |
| parent | bba3cc598785539c477e817ada18d9e7a4692286 (diff) | |
| parent | dc7aa170b80bb7d3f7725b5bddce08ff2da5a7a7 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #465)
SL-11605, SL-11610
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
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(); |