Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stab at fixing deferred snapshots.

Browse Source
This commit is contained in:
Shyotl
2012-05-22 23:37:50 -05:00
parent eb562c2470
commit a2649ceb5a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerdisplay.cpp
View File

@@ -769,7 +769,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
LLGLState::checkStates(); LLGLState::checkStates();
LLGLState::checkClientArrays(); LLGLState::checkClientArrays();
if (!for_snapshot || tiling) //if (!for_snapshot)
{ {
LLAppViewer::instance()->pingMainloopTimeout("Display:Imagery"); LLAppViewer::instance()->pingMainloopTimeout("Display:Imagery");
gPipeline.generateWaterReflection(*LLViewerCamera::getInstance()); gPipeline.generateWaterReflection(*LLViewerCamera::getInstance());
@@ -921,13 +921,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
if (to_texture) if (to_texture)
{ {
gGL.setColorMask(true, true); gGL.setColorMask(true, true);
if (LLPipeline::sRenderDeferred && !LLPipeline::sUnderWaterRender) if (LLPipeline::sRenderDeferred && !LLPipeline::sUnderWaterRender)
{ {
gPipeline.mDeferredScreen.bindTarget(); gPipeline.mDeferredScreen.bindTarget();
glClearColor(1,0,1,1); glClearColor(1,0,1,1);
gPipeline.mDeferredScreen.clear(); gPipeline.mDeferredScreen.clear();
} }
else if(!tiling) else
{ {
gPipeline.mScreen.bindTarget(); gPipeline.mScreen.bindTarget();
if (LLPipeline::sUnderWaterRender && !gPipeline.canUseWindLightShaders()) if (LLPipeline::sUnderWaterRender && !gPipeline.canUseWindLightShaders())
@@ -994,7 +995,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
GL_DEPTH_BUFFER_BIT, GL_NEAREST); GL_DEPTH_BUFFER_BIT, GL_NEAREST);
} }
} }
else if(!tiling) else
{ {
gPipeline.mScreen.flush(); gPipeline.mScreen.flush();
if(LLRenderTarget::sUseFBO) if(LLRenderTarget::sUseFBO)
@@ -1017,7 +1018,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
LLPipeline::sUnderWaterRender = FALSE; LLPipeline::sUnderWaterRender = FALSE;
LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI"); LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI");
if (!for_snapshot) if (!for_snapshot || LLPipeline::sRenderDeferred)
{ {
LLFastTimer t(FTM_RENDER_UI); LLFastTimer t(FTM_RENDER_UI);
gFrameStats.start(LLFrameStats::RENDER_UI); gFrameStats.start(LLFrameStats::RENDER_UI);