Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers

This commit is contained in:
Drake Arconis
2012-07-15 17:46:51 -04:00
2 changed files with 4 additions and 0 deletions

View File

@@ -793,6 +793,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
}
mTex.push_back(tex);
mInternalFormat.push_back(color_fmt);
return true;
}

View File

@@ -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();
}