diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
| commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
| tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/newview/llviewerdisplay.cpp | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 413a3ac819..9c3643128b 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -155,11 +155,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) // Clean up memory the pools may have allocated if (rebuild) { - if (!gViewerWindow->renderingFastFrame()) - { - gFrameStats.start(LLFrameStats::REBUILD); - gPipeline.rebuildPools(); - } + gFrameStats.start(LLFrameStats::REBUILD); + gPipeline.rebuildPools(); } return; } @@ -359,14 +356,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) } } - if (rebuild) - { - if (gViewerWindow->renderingFastFrame()) - { - gFrameStats.start(LLFrameStats::STATE_SORT); - gFrameStats.start(LLFrameStats::REBUILD); - } - } ///////////////////////////// // @@ -452,7 +441,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) gPipeline.updateCull(); stop_glerror(); - if (rebuild && !gViewerWindow->renderingFastFrame()) + if (rebuild) { LLFastTimer t(LLFastTimer::FTM_REBUILD); @@ -516,12 +505,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) // glPopMatrix(); //} - if (gViewerWindow->renderingFastFrame()) - { - gFrameStats.start(LLFrameStats::RENDER_SYNC); - gFrameStats.start(LLFrameStats::RENDER_GEOM); - } - else if (!(gLogoutRequestSent && gHaveSavedSnapshot) + if (!(gLogoutRequestSent && gHaveSavedSnapshot) && !gRestoreGL && !gDisconnected) { @@ -566,7 +550,7 @@ void render_ui_and_swap() if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { LLFastTimer t(LLFastTimer::FTM_RENDER_UI); - if (!gViewerWindow->renderingFastFrame() && !gDisconnected) + if (!gDisconnected) { render_ui_3d(); #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -587,8 +571,6 @@ void render_ui_and_swap() gViewerWindow->mWindow->swapBuffers(); } } - - gViewerWindow->finishFirstFastFrame(); } void render_ui_3d() |