Adding cpu wait time into fps calculation

Author: markgalvan-intel

PresentMon/Console.cpp

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

PresentMon/OutputThread.cpp

@@ -336,6 +336,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

@@ -131,6 +131,7 @@ struct SwapChainData {
 
     // Frame statistics
     float mAvgCPUBusy = 0.f;
+    float mAvgCPUDuration = 0.f;
     float mAvgGPUDuration = 0.f;
     float mAvgDisplayLatency = 0.f;
     float mAvgDisplayedTime = 0.f;