summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2023-01-20 18:47:17 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2023-01-20 18:47:17 +0200
commitaac046c81e28725761876b40f5bf00e12daa9471 (patch)
treec17a80cde09d6663e9c793a056600ab1fa4ff7c7 /indra
parent6cbe17305c08646d571c90d7df6fc174db6f9aeb (diff)
SL-19004 FIXED Autotune doesn't try to improve settings with VSync on and target FPS 60
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llperfstats.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp
index 8d2f4e68ae..cb5c674a32 100644
--- a/indra/newview/llperfstats.cpp
+++ b/indra/newview/llperfstats.cpp
@@ -488,7 +488,8 @@ namespace LLPerfStats
}
// LL_DEBUGS() << "AUTO_TUNE: Target frame time:"<< LLPerfStats::raw_to_us(target_frame_time_raw) << "usecs (non_avatar is " << LLPerfStats::raw_to_us(non_avatar_time_raw) << "usecs) Max cost limited=" << renderAvatarMaxART_ns << LL_ENDL;
}
- else if( LLPerfStats::raw_to_ns(target_frame_time_raw) > (LLPerfStats::raw_to_ns(tot_frame_time_raw) + renderAvatarMaxART_ns) )
+ else if(( LLPerfStats::raw_to_ns(target_frame_time_raw) > (LLPerfStats::raw_to_ns(tot_frame_time_raw) + renderAvatarMaxART_ns) ) ||
+ (tunables.vsyncEnabled && (target_fps == LLPerfStats::vsync_max_fps) && (target_frame_time_raw > getMeanTotalFrameTime())))
{
if(belowTargetFPS == true)
{