diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
| commit | 39018947081772bf7226d757c647520c54b18fd2 (patch) | |
| tree | 74b00b3006878d7e576b84cb3240d98c22d67db9 /indra/llrender/llrendertarget.cpp | |
| parent | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (diff) | |
QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
| -rw-r--r-- | indra/llrender/llrendertarget.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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); |