livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-34374 - OOM fatal error mostly in debug text rendering 

Make this non-fatal as the majority are in debug text. we are probably out of memory though so crash might just move elsewhere.
LL are investigating further.
master
Beq 2024-10-18 23:59:02 +01:00
parent e8c432dc33
commit a0805bbdb6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llimagegl.cpp
View File

@ -1243,8 +1243,13 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
if (!scratch)
{
LLError::LLUserWarningMsg::showOutOfMemory();
LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
// <FS:Beq> FIRE-34374 - OOM Crash 80% of which are in render debug text
// LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
// << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
LL_WARNS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
<< " bytes for a manual image W" << width << " H" << height << LL_ENDL;
return;
// </FS:Beq>
}
U32 pixel_count = (U32)(width * height);