Adding in AFMF fixes

Author: markgalvan-intel

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -529,9 +529,9 @@ static void ReportMetricsHelper(
     size_t displayIndex = displayed && nextDisplayedPresent != nullptr ? displayCount - 1 : 0;
 
     // Figure out what display index to attribute cpu work, gpu work, animation error, and input
-    // latency to.
+    // latency to. Start looking from the current display index.
     size_t appIndex = 0;
-    for (size_t i = 0; i < displayCount; ++i) {
+    for (size_t i = displayIndex; i < displayCount; ++i) {
         if (p->Displayed_FrameType[i] == FrameType::NotSet ||
             p->Displayed_FrameType[i] == FrameType::Application) {
             appIndex = i;

PresentData/PresentMonTraceConsumer.cpp

@@ -1263,7 +1263,7 @@ void PMTraceConsumer::HandleDXGKEvent(EVENT_RECORD* pEventRecord)
                         // Apply any pending FlipFrameType events
                         auto ii = mPendingFlipFrameTypeEvents.find(vidPnLayerId);
                         if (ii != mPendingFlipFrameTypeEvents.end()) {
-                            if (present != nullptr) {
+                            if (present != nullptr && ii->second.PresentId == PresentId[i]) {
                                 ApplyFlipFrameType(present, ii->second.Timestamp, ii->second.FrameType);
                             }
                             mPendingFlipFrameTypeEvents.erase(ii);

PresentMon/OutputThread.cpp

@@ -331,9 +331,9 @@ static void ReportMetricsHelper(
     size_t displayIndex = displayed && nextDisplayedPresent != nullptr ? displayCount - 1 : 0;
 
     // Figure out what display index to attribute cpu work, gpu work, animation error, and input
-    // latency to.
+    // latency to. Start looking from the current display index.
     size_t appIndex = 0;
-    for (size_t i = 0; i < displayCount; ++i) {
+    for (size_t i = displayIndex; i < displayCount; ++i) {
         if (p->Displayed[i].first == FrameType::NotSet ||
             p->Displayed[i].first == FrameType::Application) {
             appIndex = i;