diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
| commit | 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 (patch) | |
| tree | 143580a4ff29c4c4df91c41e1429add4abaa3f87 /indra/llrender/llrendertarget.cpp | |
| parent | eb14fece837683ebc58540d7f10eb74f5a5fbd4e (diff) | |
merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
| -rw-r--r-- | indra/llrender/llrendertarget.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index cbadb029ac..4efe078ad7 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -33,6 +33,7 @@ #include "llrendertarget.h" #include "llglimmediate.h" +#include "llgl.h" BOOL LLRenderTarget::sUseFBO = FALSE; @@ -150,6 +151,15 @@ void LLRenderTarget::bindTarget() glViewport(0, 0, mResX, mResY); } +// static +void LLRenderTarget::unbindTarget() +{ + if (gGLManager.mHasFramebufferObject) + { + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + } +} + void LLRenderTarget::clear() { U32 mask = GL_COLOR_BUFFER_BIT; |