ExtendedTools: Add present runtime to frames tab

Author: dmex

plugins/ExtendedTools/PresentMon/PresentMon.cpp

@@ -261,6 +261,8 @@ VOID PresentMonUpdateProcessStats(
         auto const& present0 = *chain.mPresentHistory[(chain.mNextPresentIndex - chain.mPresentHistoryCount) % SwapChainData::PRESENT_HISTORY_MAX_COUNT];
         auto const& presentN = *chain.mPresentHistory[(chain.mNextPresentIndex - 1) % SwapChainData::PRESENT_HISTORY_MAX_COUNT];
         auto const& lastPresented = *chain.mPresentHistory[(chain.mNextPresentIndex - 2) % SwapChainData::PRESENT_HISTORY_MAX_COUNT];
+        USHORT runtime = static_cast<USHORT>(presentN.Runtime);
+        USHORT presentMode = static_cast<USHORT>(presentN.PresentMode);
         DOUBLE cpuAvg;
         DOUBLE dspAvg = 0.0;
         DOUBLE latAvg = 0.0;
@@ -352,7 +354,9 @@ VOID PresentMonUpdateProcessStats(
             msBetweenPresents,
             msInPresentApi,
             msUntilRenderComplete,
-            msUntilDisplayed
+            msUntilDisplayed,
+            runtime,
+            presentMode
             );
     }
 }

plugins/ExtendedTools/exttools.h

@@ -362,6 +362,8 @@ typedef struct _ET_PROCESS_BLOCK
     FLOAT FramesMsUntilRenderComplete;
     FLOAT FramesMsUntilDisplayed;
     FLOAT FramesDisplayLatency;
+    USHORT FramesRuntime;
+    USHORT FramesPresentMode;
     PH_CIRCULAR_BUFFER_FLOAT FramesPerSecondHistory;
     PH_CIRCULAR_BUFFER_FLOAT FramesLatencyHistory;
     PH_CIRCULAR_BUFFER_FLOAT FramesMsBetweenPresentsHistory;

plugins/ExtendedTools/framemon.cpp

@@ -139,7 +139,9 @@ VOID EtAddGpuFrameToHashTable(
     _In_ DOUBLE MsBetweenPresents,
     _In_ DOUBLE MsInPresentApi,
     _In_ DOUBLE MsUntilRenderComplete,
-    _In_ DOUBLE MsUntilDisplayed
+    _In_ DOUBLE MsUntilDisplayed,
+    _In_ USHORT Runtime,
+    _In_ USHORT PresentMode
     )
 {
     ET_FPS_COUNTER lookupEntry;
@@ -166,6 +168,10 @@ VOID EtAddGpuFrameToHashTable(
             entry->DisplayLatency = DisplayLatency;
         //if (entry->DisplayFramesPerSecond < DisplayFramesPerSecond)
         //    entry->DisplayFramesPerSecond = DisplayFramesPerSecond;
+        if (entry->Runtime != Runtime)
+            entry->Runtime = Runtime;
+        if (entry->PresentMode != PresentMode)
+            entry->PresentMode = PresentMode;
     }
     else
     {
@@ -178,6 +184,8 @@ VOID EtAddGpuFrameToHashTable(
         lookupEntry.MsUntilDisplayed = MsUntilDisplayed;
         lookupEntry.DisplayLatency = DisplayLatency;
         //lookupEntry.DisplayFramesPerSecond = DisplayFramesPerSecond;
+        lookupEntry.Runtime = Runtime;
+        lookupEntry.PresentMode = PresentMode;
 
         PhAddEntryHashtable(EtFramesHashTable, &lookupEntry);
     }
@@ -229,6 +237,8 @@ VOID EtProcessFramesUpdateProcessBlock(
         ProcessBlock->FramesMsUntilDisplayed = (FLOAT)entry->MsUntilDisplayed;
         ProcessBlock->FramesDisplayLatency = (FLOAT)entry->DisplayLatency;
         //ProcessBlock->FramesDisplayFramesPerSecond = (FLOAT)entry->DisplayFramesPerSecond;
+        ProcessBlock->FramesRuntime = entry->Runtime;
+        ProcessBlock->FramesPresentMode = entry->PresentMode;
 
         PhAddItemCircularBuffer_FLOAT(&ProcessBlock->FramesPerSecondHistory, ProcessBlock->FramesPerSecond);
         PhAddItemCircularBuffer_FLOAT(&ProcessBlock->FramesLatencyHistory, ProcessBlock->FramesLatency);
@@ -249,6 +259,8 @@ VOID EtProcessFramesUpdateProcessBlock(
         ProcessBlock->FramesMsUntilDisplayed = 0;
         ProcessBlock->FramesDisplayLatency = 0;
         //ProcessBlock->FramesDisplayFramesPerSecond = 0;
+        ProcessBlock->FramesRuntime = 0;
+        ProcessBlock->FramesPresentMode = 0;
 
         PhAddItemCircularBuffer_FLOAT(&ProcessBlock->FramesPerSecondHistory, 0);
         PhAddItemCircularBuffer_FLOAT(&ProcessBlock->FramesLatencyHistory, 0);
@@ -260,3 +272,45 @@ VOID EtProcessFramesUpdateProcessBlock(
         //PhAddItemCircularBuffer_FLOAT(&ProcessBlock->FramesDisplayFramesPerSecondHistory, 0);
     }
 }
+
+PCWSTR EtPresentModeToString(
+    _In_ USHORT PresentMode
+    )
+{
+    switch (PresentMode)
+    {
+    case 1:
+        return L"Hardware: Legacy Flip";
+    case 2:
+        return L"Hardware: Legacy Copy to front buffer";
+    case 3:
+        return L"Hardware: Independent Flip";
+    case 4:
+        return L"Composed: Flip";
+    case 5:
+        return L"Composed: Copy with GPU GDI";
+    case 6:
+        return L"Composed: Copy with CPU GDI";
+    case 7:
+        return L"Composed: Composition Atlas";
+    case 8:
+        return L"Hardware Composed: Independent Flip";
+    }
+
+    return L"Other";
+}
+
+PCWSTR EtRuntimeToString(
+    _In_ USHORT Runtime
+    )
+{
+    switch (Runtime)
+    {
+    case 0:
+        return L"DXGI";
+    case 1:
+        return L"D3D9";
+    }
+
+    return L"Other";
+}

plugins/ExtendedTools/framemon.h

@@ -37,7 +37,9 @@ typedef struct _ET_FPS_COUNTER
     DOUBLE MsUntilRenderComplete;
     DOUBLE MsUntilDisplayed;
     DOUBLE DisplayLatency;
-    //DOUBLE DisplayFramesPerSecond;
+    //DOUBLE DisplayFramesPerSecond;   
+    USHORT Runtime;
+    USHORT PresentMode;
 } ET_FPS_COUNTER, *PET_FPS_COUNTER;
 
 VOID EtFramesMonitorInitialization(
@@ -65,7 +67,9 @@ VOID EtAddGpuFrameToHashTable(
     _In_ DOUBLE MsBetweenPresents,
     _In_ DOUBLE MsInPresentApi,
     _In_ DOUBLE MsUntilRenderComplete,
-    _In_ DOUBLE MsUntilDisplayed
+    _In_ DOUBLE MsUntilDisplayed,
+    _In_ USHORT Runtime,
+    _In_ USHORT PresentMode
     );
 
 VOID EtLockGpuFrameHashTable(
@@ -84,6 +88,14 @@ VOID EtProcessFramesUpdateProcessBlock(
     _In_ struct _ET_PROCESS_BLOCK* ProcessBlock
     );
 
+PCWSTR EtPresentModeToString(
+    _In_ USHORT PresentMode
+    );
+
+PCWSTR EtRuntimeToString(
+    _In_ USHORT Runtime
+    );
+
 // PresentMon.hpp
 
 BOOLEAN StartFpsTraceSession(

plugins/ExtendedTools/frameprp.c

@@ -383,6 +383,29 @@ VOID FramesPropUpdateGraphs(
     InvalidateRect(Context->FramesDisplayLatencyGraphHandle, NULL, FALSE);
 }
 
+VOID FramesPropUpdatePanel(
+    _In_ PET_FRAMES_CONTEXT Context
+    )
+{
+    PCWSTR runtime;
+    PCWSTR presentMode;
+    PPH_STRING string;
+    PH_FORMAT format[5];
+
+    runtime = EtRuntimeToString(Context->Block->FramesRuntime);
+    presentMode = EtPresentModeToString(Context->Block->FramesPresentMode);
+
+    PhInitFormatS(&format[0], L"FPS: ");
+    PhInitFormatS(&format[1], (PWSTR)presentMode);
+    PhInitFormatS(&format[2], L" (");
+    PhInitFormatS(&format[3], (PWSTR)runtime);
+    PhInitFormatC(&format[4], L')');
+
+    string = PhFormat(format, RTL_NUMBER_OF(format), 0);
+    PhSetWindowText(Context->FramesPerSecondGroupBox, PhGetString(string));
+    PhDereferenceObject(string);
+}
+
 VOID NTAPI FramesProcessesUpdatedHandler(
     _In_opt_ PVOID Parameter,
     _In_opt_ PVOID Context
@@ -1091,7 +1114,7 @@ INT_PTR CALLBACK EtpFramesPageDlgProc(
             if (!(processItem->State & PH_PROCESS_ITEM_REMOVED) && context->Enabled)
             {
                 FramesPropUpdateGraphs(context);
-                //FramesPropUpdatePanel(context);
+                FramesPropUpdatePanel(context);
             }
         }
         break;