summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-28 14:44:36 -0500
committerDave Parks <davep@lindenlab.com>2010-09-28 14:44:36 -0500
commit91a8d7a2191e670e160e64859792db390b5d1757 (patch)
treed72df970ca62e24c2eab3d2cea0787d760ee88be /indra
parentd43aef498bf305ba88839b653e68b3c1ad889cdd (diff)
Fix for crash when attempting to create a 16X multisample buffer (just clamp to 8 samples for now)
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index df000d45f8..64922ee991 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -565,6 +565,7 @@ void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY)
if (LLPipeline::sRenderDeferred)
{
+ samples = llmin(samples, (U32) 8); //cap multisample buffers to 8 samples when rendering deferred
//allocate deferred rendering color buffers
mDeferredScreen.allocate(resX, resY, GL_RGBA, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE);
mDeferredDepth.allocate(resX, resY, 0, TRUE, FALSE, LLTexUnit::TT_RECT_TEXTURE, FALSE);