summaryrefslogtreecommitdiff
path: root/indra/llrender/llimagegl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-24 15:29:33 -0500
committerDave Parks <davep@lindenlab.com>2011-05-24 15:29:33 -0500
commit4353eeb9288c95b98935e60928ec0b80de4e6145 (patch)
tree6707a858286f25cf7e389ff2f5e92099e9b4569b /indra/llrender/llimagegl.cpp
parentfd574e34857accd55e736d855975767fd7768b79 (diff)
SH-469 GL_ARB_texture_multisample support
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
-rw-r--r--indra/llrender/llimagegl.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 30b66ae542..3a4139bace 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1083,12 +1083,17 @@ void LLImageGL::generateTextures(S32 numTextures, U32 *textures)
}
// static
-void LLImageGL::deleteTextures(S32 numTextures, U32 *textures)
+void LLImageGL::deleteTextures(S32 numTextures, U32 *textures, bool immediate)
{
for (S32 i = 0; i < numTextures; i++)
{
sDeadTextureList.push_back(textures[i]);
}
+
+ if (immediate)
+ {
+ LLImageGL::deleteDeadTextures();
+ }
}
// static