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

Git rid of "ForcePeriodicRenderingTime" - it's not in the LL viewer and wasn't used anyway

meow-7.2.2
Ansariel 2022-02-02 10:05:57 +01:00
parent ccb078ae08
commit 9bed2adb1b
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -18667,17 +18667,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Backup</key>
<integer>0</integer>
</map>
<key>ForcePeriodicRenderingTime</key>
<map>
<key>Comment</key>
<string>Periodically enable all rendering masks for a single frame.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>-1.0</real>
</map>
<key>ZoomDirect</key>
<map>
<key>Comment</key>

28
indra/newview/llappviewer.cpp
View File

@ -1651,10 +1651,6 @@ bool LLAppViewer::doFrame()
}
#endif
// </FS:Beq>
// <FS:Ansariel> MaxFPS Viewer-Chui merge error
LLTimer periodicRenderingTimer;
BOOL restore_rendering_masks = FALSE;
// </FS:Ansariel> MaxFPS Viewer-Chui merge error
// <FS:Ansariel> FIRE-22297: FPS limiter not working properly on Mac/Linux
LLTimer frameTimer;
@ -1678,30 +1674,6 @@ bool LLAppViewer::doFrame()
} // <FS:Beq/> perf stats
{
{FSPerfStats::RecordSceneTime T (FSPerfStats::StatType_t::RENDER_IDLE); // <FS:Beq> ensure we have the entire top scope of frame covered
// <FS:Ansariel> MaxFPS Viewer-Chui merge error
// Check if we need to restore rendering masks.
if (restore_rendering_masks)
{
gPipeline.popRenderDebugFeatureMask();
gPipeline.popRenderTypeMask();
}
// Check if we need to temporarily enable rendering.
//F32 periodic_rendering = gSavedSettings.getF32("ForcePeriodicRenderingTime");
static LLCachedControl<F32> periodic_rendering(gSavedSettings, "ForcePeriodicRenderingTime", -1.f);
if (periodic_rendering > F_APPROXIMATELY_ZERO && periodicRenderingTimer.getElapsedTimeF64() > periodic_rendering)
{
periodicRenderingTimer.reset();
restore_rendering_masks = TRUE;
gPipeline.pushRenderTypeMask();
gPipeline.pushRenderDebugFeatureMask();
gPipeline.setAllRenderTypes();
gPipeline.setAllRenderDebugFeatures();
}
else
{
restore_rendering_masks = FALSE;
}
// </FS:Ansariel> MaxFPS Viewer-Chui merge error
LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df processMiscNativeEvents" )
pingMainloopTimeout("Main:MiscNativeWindowEvents");