From 39018947081772bf7226d757c647520c54b18fd2 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 23 Apr 2008 01:04:01 +0000 Subject: QAR-488 Viewer 1.20 RC 2 merge Branch_1-20-Viewer -r 84760 : 85100 -> release --- indra/llrender/llrendertarget.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 593a5a18e5..cbadb029ac 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -80,15 +80,16 @@ void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32 stop_glerror(); - if (depth) + if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject) { - stop_glerror(); - allocateDepth(); - stop_glerror(); - } - if ((sUseFBO && use_fbo) && gGLManager.mHasFramebufferObject) - { + if (depth) + { + stop_glerror(); + allocateDepth(); + stop_glerror(); + } + glGenFramebuffersEXT(1, (GLuint *) &mFBO); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mFBO); -- cgit v1.2.3