From e2954fdbfd10d55e428e4a1e1fa6b80eba7051f4 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 18 Oct 2013 01:43:32 -0500 Subject: [PATCH] Fixed a bug where multisampled renderbuffers were being attached to non-FBO-enabled LLRenderTargets. --- indra/newview/pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index a36b9432a..86cdc5a4c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -851,7 +851,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) if (!mScreen.allocate(resX, resY, GL_RGBA, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false; - if(samples > 1) + if(samples > 1 && mScreen.getFBO()) { if(mSampleBuffer.allocate(resX,resY,GL_RGBA,TRUE,TRUE,LLTexUnit::TT_RECT_TEXTURE,FALSE,samples)) mScreen.setSampleBuffer(&mSampleBuffer);