From e24d4c9f4d2f37ee80685c6ab276633b94b366b8 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 26 Jul 2018 20:06:26 +0300
Subject: MAINT-8923 Better allocation failure handling, createGLTexture
crashes
---
indra/llrender/llimagegl.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'indra/llrender')
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 89500dcc04..40217b2e80 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1262,7 +1262,8 @@ BOOL LLImageGL::createGLTexture()
stop_glerror();
if (!mTexName)
{
- LL_ERRS() << "LLImageGL::createGLTexture failed to make an empty texture" << LL_ENDL;
+ LL_WARNS() << "LLImageGL::createGLTexture failed to make an empty texture" << LL_ENDL;
+ return FALSE;
}
return TRUE ;
@@ -1395,7 +1396,16 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_
}
if (!mTexName)
{
- LL_ERRS() << "LLImageGL::createGLTexture failed to make texture" << LL_ENDL;
+ if (old_name)
+ {
+ sGlobalTextureMemory -= mTextureMemory;
+ LLImageGL::deleteTextures(1, &old_name);
+ disclaimMem(mTextureMemory);
+ stop_glerror();
+ }
+
+ LL_WARNS() << "LLImageGL::createGLTexture failed to make texture" << LL_ENDL;
+ return FALSE;
}
if (mUseMipMaps)
--
cgit v1.2.3