diff options
author | Graham Linden <graham@lindenlab.com> | 2019-07-24 12:52:24 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-07-24 12:52:24 -0700 |
commit | 41ede77744489c2a2d32849ea457bcbea516a588 (patch) | |
tree | 9f611afd7a33fc4a9c0bd40f779d4596ca00309a /indra/newview/pipeline.cpp | |
parent | 15f5d8caf8fc51999c4de4217ed5ac37fa911ae9 (diff) |
SL-10625
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ef88d43cc4..448b65272b 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++) @@ -1225,6 +1226,9 @@ void LLPipeline::createGLBuffers() 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(); @@ -1395,7 +1399,7 @@ bool LLPipeline::canUseVertexShaders() bool LLPipeline::canUseWindLightShaders() const { return (!LLPipeline::sDisableShaders && - /*gWLSkyProgram.mProgramObject != 0 &&*/ + gWLSkyProgram.mProgramObject != 0 && LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1); } |