From 10fe67f4a6f167d2f3a3f56551a56da3f8c5b5aa Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 15 Jul 2012 16:41:31 -0500 Subject: [PATCH] FBO tweaks. Release multisample fbo in LLPipeline::releaseScreenBuffers, and fixed LLRenderBuffer::mInternalFormat falling out of sync with LLRenderBuffer::mTex. --- indra/llrender/llrendertarget.cpp | 1 + indra/newview/pipeline.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 6ea20e977..ceb865ad1 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -793,6 +793,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt) } mTex.push_back(tex); + mInternalFormat.push_back(color_fmt); return true; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bd2424294..f71adc331 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -693,6 +693,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) } mSampleBuffer.release(); + mScreen.release(); if (LLPipeline::sRenderDeferred) { @@ -906,6 +907,8 @@ void LLPipeline::releaseScreenBuffers() { mShadow[i].release(); } + + mSampleBuffer.release(); }