Merge branch 'main' into feature/ipm-cli

Author: planetchili

.gitignore

@@ -57,3 +57,8 @@ PresentMon/ddETWExternalEvents.h
 PresentMon/ddETWExternalEvents.rc
 
 PresentMon/ddETWExternalEventsTEMP.BIN
+
+# Local runsettings files (user-specific test configurations)
+*.local.runsettings
+
+Directory.Build.props

ETLTrimmer/main.cpp

@@ -297,8 +297,15 @@ class TempFile
     }
     ~TempFile()
     {
-        std::filesystem::remove((const wchar_t*)name_);
+        pmquell(std::filesystem::remove((const wchar_t*)name_))
     }
+
+    TempFile() = default;
+    TempFile(const TempFile&) = delete;
+    TempFile& operator=(const TempFile&) = delete;
+    TempFile(TempFile&&) = delete;
+    TempFile& operator=(TempFile&&) = delete;
+
 private:
     CComBSTR name_ = "null-log.etl.tmp";
 };
@@ -374,6 +381,8 @@ int main(int argc, const char** argv)
         traceConsumer.mTrackGPUVideo = true;  // ... GPU video work (separately from non-video GPU work).
         traceConsumer.mTrackInput = true;     // ... keyboard/mouse latency.
         traceConsumer.mTrackFrameType = true; // ... the frame type communicated through the Intel-PresentMon provider.
+        traceConsumer.mTrackAppTiming = true; // ... app timing data communicated through the Intel-PresentMon provider.
+        traceConsumer.mTrackPcLatency = true; // ... Nvidia PCL stats.
         EnableProvidersListing(0, nullptr, &traceConsumer, true, true, pFilter);
     }
 

IntelPresentMon/AppCef/AppCef.rc

@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "flask.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 1,0,5,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Intel(R) Corporation"
             VALUE "FileDescription", "Intel(R) PresentMon application"
-            VALUE "FileVersion", "1.0.4.0"
+            VALUE "FileVersion", "1.0.5.0"
             VALUE "InternalName", "CefNano.exe"
             VALUE "LegalCopyright", "Copyright (C) 2017-2025"
             VALUE "OriginalFilename", "CefNano.exe"
             VALUE "ProductName", "Intel(R) PresentMon"
-            VALUE "ProductVersion", "2.3.1.0"
+            VALUE "ProductVersion", "2.4.0.0"
         END
     END
     BLOCK "VarFileInfo"

IntelPresentMon/AppCef/ipm-ui-vue/BlockLists/TargetBlockList.txt

@@ -25,6 +25,7 @@ bethesdanethelper.exe
 bethesdanetlauncher.exe
 blend.exe
 blender.exe
+bootstrapperui_v2.exe
 bsglauncher.exe
 calculator.exe
 calculatorapp.exe

IntelPresentMon/AppCef/ipm-ui-vue/package-lock.json

@@ -30,7 +30,7 @@
     "sass": "^1.86.3",
     "sass-loader": "^16.0.5",
     "typescript": "~5.8.0",
-    "vite": "^6.3.5",
+    "vite": "^6.3.6",
     "vite-plugin-vue-devtools": "^7.7.2",
     "vue-tsc": "^2.2.8"
   }

IntelPresentMon/AppCef/ipm-ui-vue/package.json

@@ -97,8 +97,8 @@ watch(
 
       <v-row class="mt-8">
         <v-col cols="3">
-          Rainbow Flash
-          <p class="text-medium-emphasis text-caption mb-0">Cycle through a rainbow of colors instead of using above flash color.</p>
+          Rainbow Strip
+          <p class="text-medium-emphasis text-caption mb-0">Draw a strip on the left-hand side of the screen that cycles through colors every frame.</p>
         </v-col>
         <v-col cols="9">
           <v-switch v-model="prefs.preferences.flashInjectionUseRainbow" label="Enable"></v-switch>

IntelPresentMon/AppCef/ipm-ui-vue/src/views/FlashConfigView.vue

@@ -171,9 +171,6 @@
     <ClInclude Include="log\TimePoint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="log\Subsystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -234,6 +231,9 @@
     <ClInclude Include="ref\GeneratedReflectionHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="win\MessageBox.h">
       <Filter>Header Files</Filter>
     </ClInclude>

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters

@@ -1,6 +1,7 @@
 #pragma once
 #include <cmath>
 #include <limits>
+#include <algorithm>
 
 namespace pmon::util
 {
@@ -53,4 +54,9 @@ namespace pmon::util
 		const auto conversionFactor = srcFactor / dstFactor;
 		return To(fromExtended * conversionFactor);
 	}
+	template<typename T>
+	T CalculateEma(T prevEma, T newSample, T alpha)
+	{
+		return prevEma + alpha * (newSample - prevEma);
+	}
 }

IntelPresentMon/CommonUtilities/Math.h

@@ -4,6 +4,10 @@
 
 namespace pmon::util
 {
+    // Helper: dependent_false for static_assert in templates.
+    template<typename T>
+    struct dependent_false : std::false_type {};
+
     // deconstruct member pointer into the object type the pointer works with and the member type
     template <typename T> struct MemberPointerInfo;
     template <typename S, typename M>