diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
| commit | 299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch) | |
| tree | 985a3fe37b693cf377c953a880c967f5e29b2abc /indra/llrender/llimagegl.cpp | |
| parent | 01ee25cca43b175567859becd1eacf77db24af55 (diff) | |
| parent | 93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff) | |
Automated merge with file:///Users/oz/Work/V-PR
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 60a5962234..9ca3a23d52 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1414,6 +1414,8 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre void LLImageGL::deleteDeadTextures() { + bool reset = false; + while (!sDeadTextureList.empty()) { GLuint tex = sDeadTextureList.front(); @@ -1426,12 +1428,22 @@ void LLImageGL::deleteDeadTextures() { tex_unit->unbind(tex_unit->getCurrType()); stop_glerror(); + + if (i > 0) + { + reset = true; + } } } glDeleteTextures(1, &tex); stop_glerror(); } + + if (reset) + { + gGL.getTexUnit(0)->activate(); + } } void LLImageGL::destroyGLTexture() |