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

Crashfix; handle errors in release builds more gracefully as a crash.

Nicky 2012-09-01 15:24:54 +02:00
parent 9a3befa67a
commit 1e20476c2e
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llrender/llrendertarget.cpp
View File

@ -163,11 +163,29 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt)
}
U32 offset = mTex.size();
if (offset >= 4 ||
(offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers)))
// <FS:ND> Crashfix; Handle error gracefully
// if (offset >= 4 ||
// (offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers)))
// {
// llerrs << "Too many color attachments!" << llendl;
// }
if( offset >= 4 )
{
llerrs << "Too many color attachments!" << llendl;
llwarns << "Too many color attachments" << llendl;
llassert( offset < 4 );
return false;
}
if( offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers) )
{
llwarns << "FBO not used or no drawbuffers available; mFBO=" << (U32)mFBO << " gGLManager.mHasDrawBuffers=" << (U32)gGLManager.mHasDrawBuffers << llendl;
llassert( mFBO != 0 );
llassert( gGLManager.mHasDrawBuffers );
return false;
}
// </FS:ND>
U32 tex;
LLImageGL::generateTextures(mUsage, color_fmt, 1, &tex);