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

#689 Fix for mirror stuttering.

meow-7.2.2
Jonathan "Geenz" Goodman 2024-02-01 10:18:17 -08:00
parent a4225663ac
commit 78140786ce
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llappviewer.cpp
View File

@ -1520,7 +1520,6 @@ bool LLAppViewer::doFrame()
LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df Snapshot"); LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df Snapshot");
pingMainloopTimeout("Main:Snapshot"); pingMainloopTimeout("Main:Snapshot");
gPipeline.mReflectionMapManager.update(); gPipeline.mReflectionMapManager.update();
gPipeline.mHeroProbeManager.update();
LLFloaterSnapshot::update(); // take snapshots LLFloaterSnapshot::update(); // take snapshots
LLFloaterSimpleSnapshot::update(); LLFloaterSimpleSnapshot::update();
gGLActive = FALSE; gGLActive = FALSE;

10
indra/newview/llviewerdisplay.cpp
View File

@ -656,6 +656,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
if (!gDisconnected) if (!gDisconnected)
{ {
// Render mirrors and associated hero probes before we render the rest of the scene.
// This ensures the scene state in the hero probes are exactly the same as the rest of the scene before we render it.
if (gPipeline.RenderMirrors && !gSnapshot)
{
LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("Update hero probes");
gPipeline.mHeroProbeManager.update();
}
LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("display - 1"); LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("display - 1");
LLAppViewer::instance()->pingMainloopTimeout("Display:Update"); LLAppViewer::instance()->pingMainloopTimeout("Display:Update");
if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD)) if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
@ -696,7 +704,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
} }
gPipeline.updateGL(); gPipeline.updateGL();
stop_glerror(); stop_glerror();
LLAppViewer::instance()->pingMainloopTimeout("Display:Cull"); LLAppViewer::instance()->pingMainloopTimeout("Display:Cull");