From 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 6 May 2008 18:09:03 +0000 Subject: merge release-QAR-511 Viewer 1.20 RC 5 merge Branch_1-20-Viewer -r 85828 : 86279 -> release --- indra/llrender/llrendertarget.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/llrender/llrendertarget.cpp') 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; -- cgit v1.2.3