Merge pull request #46 from intel-innersource/fix/update-pmc-fps-calc

Adding cpu wait time into fps calculation

Author: markgalvan-intel

PresentMon/Console.cpp

@@ -278,8 +278,8 @@ void UpdateConsole(uint32_t processId, ProcessInfo const& processInfo)
                 RuntimeToString(chain.mPresentRuntime),
                 chain.mPresentSyncInterval,
                 chain.mPresentFlags,
-                chain.mAvgCPUBusy,
-                CalculateFPSForPrintf(chain.mAvgCPUBusy));
+                chain.mAvgCPUDuration,
+                CalculateFPSForPrintf(chain.mAvgCPUDuration));
 
             if (args.mTrackDisplay) {
                 ConsolePrint(L" Display=%.3fms (%.1f fps)",

PresentMon/OutputThread.cpp

@@ -277,7 +277,7 @@ static void ReportMetrics1(
     }
 
     if (computeAvg) {
-        UpdateAverage(&chain->mAvgCPUBusy, metrics.msBetweenPresents);
+        UpdateAverage(&chain->mAvgCPUDuration, metrics.msBetweenPresents);
         UpdateAverage(&chain->mAvgGPUDuration, metrics.msGPUDuration);
         if (metrics.msUntilDisplayed > 0) {
             UpdateAverage(&chain->mAvgDisplayLatency, metrics.msUntilDisplayed);
@@ -335,7 +335,7 @@ static void ReportMetrics(
     }
 
     if (computeAvg) {
-        UpdateAverage(&chain->mAvgCPUBusy, metrics.mCPUBusy);
+        UpdateAverage(&chain->mAvgCPUDuration, metrics.mCPUBusy + metrics.mCPUWait);
         UpdateAverage(&chain->mAvgGPUDuration, gpuDuration);
         if (displayed) {
             UpdateAverage(&chain->mAvgDisplayLatency, metrics.mDisplayLatency);

PresentMon/PresentMon.hpp

@@ -130,7 +130,7 @@ struct SwapChainData {
     bool        mPresentInfoValid = false;
 
     // Frame statistics
-    float mAvgCPUBusy = 0.f;
+    float mAvgCPUDuration = 0.f;
     float mAvgGPUDuration = 0.f;
     float mAvgDisplayLatency = 0.f;
     float mAvgDisplayedTime = 0.f;