From b60e35040e41eb8ee084f89404fd86416c844ff7 Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Fri, 26 Apr 2019 09:31:09 -0700
Subject: [PATCH] another round of CR

---
 interface/resources/qml/Stats.qml                | 16 ++++++++--------
 interface/src/ui/Stats.cpp                       | 16 ++++++++--------
 .../src/display-plugins/OpenGLDisplayPlugin.cpp  |  3 +--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index 97c4aa9b41..135633e403 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -57,6 +57,14 @@ Item {
                     StatText {
                         text: "Avatars: " + root.avatarCount
                     }
+                    StatText {
+                        visible: true
+                        text: "Refresh: " + root.refreshRateRegime + " - " + root.refreshRateTarget
+                    }
+                    StatText {
+                        visible: root.expanded
+                        text:"    " + root.refreshRateMode + " - " + root.uxMode;
+                    }
                     StatText {
                         text: "Game Rate: " + root.gameLoopRate
                     }
@@ -77,14 +85,6 @@ Item {
                         visible: root.expanded
                         text: "    Present New Rate: " + root.presentnewrate.toFixed(2);
                     }
-                    StatText {
-                        visible: root.expanded
-                        text: "  RefreshRateController:\n    " +
-                            "refreshRateTarget:\t " + root.refreshRateTarget + "\n    " +
-                            "refreshRateMode:\t " + root.refreshRateMode + "\n    " +
-                            "refreshRateRegime:\t " + root.refreshRateRegime + "\n   " +
-                            "uxMode:\t " + root.uxMode;
-                    }
                     StatText {
                         visible: root.expanded
                         text: "    Present Drop Rate: " + root.presentdroprate.toFixed(2);
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 9b50b9e5da..8f289812fa 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -132,6 +132,14 @@ void Stats::updateStats(bool force) {
     STAT_UPDATE(notUpdatedAvatarCount, avatarManager->getNumAvatarsNotUpdated());
     STAT_UPDATE(serverCount, (int)nodeList->size());
     STAT_UPDATE_FLOAT(renderrate, qApp->getRenderLoopRate(), 0.1f);
+    RefreshRateManager& refreshRateManager = qApp->getRefreshRateManager();
+    std::string refreshRateMode = RefreshRateManager::refreshRateProfileToString(refreshRateManager.getRefreshRateProfile());
+    std::string refreshRateRegime = RefreshRateManager::refreshRateRegimeToString(refreshRateManager.getRefreshRateRegime());
+    std::string uxMode = RefreshRateManager::uxModeToString(refreshRateManager.getUXMode());
+    STAT_UPDATE(refreshRateMode, QString::fromStdString(refreshRateMode));
+    STAT_UPDATE(refreshRateRegime, QString::fromStdString(refreshRateRegime));
+    STAT_UPDATE(uxMode, QString::fromStdString(uxMode));
+    STAT_UPDATE(refreshRateTarget, refreshRateManager.getActiveRefreshRate());
     if (qApp->getActiveDisplayPlugin()) {
         auto displayPlugin = qApp->getActiveDisplayPlugin();
         auto stats = displayPlugin->getHardwareStats();
@@ -222,14 +230,6 @@ void Stats::updateStats(bool force) {
     STAT_UPDATE_FLOAT(speed, glm::length(myAvatar->getWorldVelocity()), 0.01f);
     STAT_UPDATE_FLOAT(yaw, myAvatar->getBodyYaw(), 0.1f);
     if (_expanded || force) {
-        RefreshRateManager& refreshRateManager = qApp->getRefreshRateManager();
-        std::string refreshRateMode = RefreshRateManager::refreshRateProfileToString(refreshRateManager.getRefreshRateProfile());
-        std::string refreshRateRegime = RefreshRateManager::refreshRateRegimeToString(refreshRateManager.getRefreshRateRegime());
-        std::string uxMode = RefreshRateManager::uxModeToString(refreshRateManager.getUXMode());
-        STAT_UPDATE(refreshRateMode, QString::fromStdString(refreshRateMode));
-        STAT_UPDATE(refreshRateRegime, QString::fromStdString(refreshRateRegime));
-        STAT_UPDATE(uxMode, QString::fromStdString(uxMode));
-        STAT_UPDATE(refreshRateTarget, refreshRateManager.getActiveRefreshRate());
         SharedNodePointer avatarMixer = nodeList->soloNodeOfType(NodeType::AvatarMixer);
         if (avatarMixer) {
             STAT_UPDATE(avatarMixerInKbps, (int)roundf(avatarMixer->getInboundKbps()));
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 6af7f1f92d..a7e27ca770 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -697,14 +697,13 @@ void OpenGLDisplayPlugin::present(const std::shared_ptr<RefreshRateController>&
     auto frameId = (uint64_t)presentCount();
     PROFILE_RANGE_EX(render, __FUNCTION__, 0xffffff00, frameId)
     uint64_t startPresent = usecTimestampNow();
-
+    refreshRateController->clockStartTime();
     {
         PROFILE_RANGE_EX(render, "updateFrameData", 0xff00ff00, frameId)
         updateFrameData();
     }
     incrementPresentCount();
 
-    refreshRateController->clockStartTime();
     if (_currentFrame) {
         auto correction = getViewCorrection();
         getGLBackend()->setCameraCorrection(correction, _prevRenderView);