summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendertarget.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-11 16:51:01 -0500
committerDave Parks <davep@lindenlab.com>2011-06-11 16:51:01 -0500
commit44f0a1b68118f662e68904eea83a3801b4577070 (patch)
treeaa62199ab302c092f25fb615d70afa2e8c4911a5 /indra/llrender/llrendertarget.cpp
parent99b05f9647353f9bf5a44b1eb424105598d2b725 (diff)
SH-1778 Physics shape display fix up.
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rw-r--r--indra/llrender/llrendertarget.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index e773a639b0..b6463309e1 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -75,6 +75,9 @@ LLRenderTarget::~LLRenderTarget()
void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, bool stencil, LLTexUnit::eTextureType usage, bool use_fbo, S32 samples)
{
stop_glerror();
+
+ release();
+
mResX = resx;
mResY = resy;
@@ -96,8 +99,6 @@ void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, boo
mSamples = 0;
}
- release();
-
if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject)
{
if (depth)
@@ -337,6 +338,8 @@ void LLRenderTarget::release()
LLImageGL::deleteTextures(mTex.size(), &mTex[0], true);
mTex.clear();
}
+
+ mResX = mResY = 0;
sBoundTarget = NULL;
}