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

SH-358 FIXED LLPipeline::renderBloom crash on Windows

Loren Shih 2010-11-04 16:30:59 -04:00
parent a788b0a88c
commit ffc07281ad
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewerdisplay.cpp
View File

@ -218,6 +218,16 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLMemType mt_render(LLMemType::MTYPE_RENDER);
LLFastTimer t(FTM_RENDER);
if (gResizeScreenTexture)
{ //skip render on frames where screen texture is resizing
gGL.flush();
glClear(GL_COLOR_BUFFER_BIT);
gViewerWindow->mWindow->swapBuffers();
gResizeScreenTexture = FALSE;
gPipeline.resizeScreenTexture();
return;
}
if (LLPipeline::sRenderFrameTest)
{
send_agent_pause();
@ -531,6 +541,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
gViewerWindow->setup3DViewport();
gPipeline.resetFrameStats(); // Reset per-frame statistics.
if (!gDisconnected)
{
LLMemType mt_du(LLMemType::MTYPE_DISPLAY_UPDATE);
@ -641,11 +652,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLVertexBuffer::clientCopy(0.016);
}
if (gResizeScreenTexture)
{
gResizeScreenTexture = FALSE;
gPipeline.resizeScreenTexture();
}
//if (gResizeScreenTexture)
//{
// gResizeScreenTexture = FALSE;
// gPipeline.resizeScreenTexture();
//}
gGL.setColorMask(true, true);
glClearColor(0,0,0,0);