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

FIRE-34374 - additional bypass of LL_ERR

master
Beq 2024-10-22 16:00:33 +01:00
parent eb8568af5b
commit 79aede07e3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llimagegl.cpp
View File

@ -1248,7 +1248,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
// << " 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;
return;
// </FS:Beq>
}
@ -1274,8 +1274,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);