Merge branch 'release-gtd-external/rc2.3.0'

GameTechDev · Dec 17, 2024 · 8170aab · 8170aab
2 parents f5b8b75 + 7ec24eb
commit 8170aab
Show file tree

Hide file tree

Showing 86 changed files with 7,822 additions and 2,632 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,5 +41,3 @@ PresentData/PresentData.args.json
 IntelPresentMon/SampleClient/log.txt
 
 IntelPresentMon/PresentMonAPI2/Internal.h
-
-IntelPresentMon/CommonUtilities/git_hash.h
diff --git a/IntelPresentMon/AppCef/AppCef.rc b/IntelPresentMon/AppCef/AppCef.rc
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "flask.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 2,3,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.0.0"
+            VALUE "FileVersion", "1.0.3.0"
             VALUE "InternalName", "CefNano.exe"
             VALUE "LegalCopyright", "Copyright (C) 2017-2024"
             VALUE "OriginalFilename", "CefNano.exe"
             VALUE "ProductName", "Intel(R) PresentMon"
-            VALUE "ProductVersion", "2.1.0.0"
+            VALUE "ProductVersion", "2.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/IntelPresentMon/AppCef/CefNano.vcxproj b/IntelPresentMon/AppCef/CefNano.vcxproj
@@ -83,6 +83,9 @@
     <ProjectReference Include="..\Core\Core.vcxproj">
       <Project>{808f5ea9-ea09-4d72-87b4-5397d43cba54}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\Versioning\Versioning.vcxproj">
+      <Project>{c73aa532-e532-4d93-9279-905444653c08}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="AppCef.rc" />

diff --git a/IntelPresentMon/AppCef/source/util/PathSanitaryCheck.cpp b/IntelPresentMon/AppCef/source/util/PathSanitaryCheck.cpp
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <Core/source/infra/util/FolderResolver.h>
 #include <Core/source/infra/Logging.h>
+#include <CommonUtilities/str/String.h>
 
 
 namespace p2c::client::util
@@ -43,8 +44,9 @@ namespace p2c::client::util
 	}
 	bool PathSanitaryCheck(const std::filesystem::path& path, const std::filesystem::path& root)
 	{
-		const auto canonicalString = std::filesystem::weakly_canonical(path).wstring();
-		const auto rootString = root.wstring();
-		return canonicalString.starts_with(rootString);
+		const auto canonicalString = pmon::util::str::ToLower(std::filesystem::weakly_canonical(path).wstring());
+		const auto rootString = pmon::util::str::ToLower(root.wstring());
+        const auto isSanitary = canonicalString.starts_with(rootString);
+        return isSanitary;
 	}
 }
diff --git a/IntelPresentMon/AppCef/source/util/async/Introspect.h b/IntelPresentMon/AppCef/source/util/async/Introspect.h
@@ -34,8 +34,7 @@ namespace p2c::client::util::async
             // filter predicate to only pick up metrics usable in dynamic queries (plus hardcoded blacklist)
             const auto filterPred = [](const pmapi::intro::MetricView& m) { const auto type = m.GetType();
                 return
-                    (   m.GetId() != PM_METRIC_GPU_LATENCY &&
-                        m.GetId() != PM_METRIC_DISPLAY_LATENCY)
+                    (   m.GetId() != PM_METRIC_GPU_LATENCY)
                     &&
                     (   type == PM_METRIC_TYPE_DYNAMIC ||
                         type == PM_METRIC_TYPE_DYNAMIC_FRAME ||

diff --git a/IntelPresentMon/AppCef/source/winmain.cpp b/IntelPresentMon/AppCef/source/winmain.cpp
@@ -8,7 +8,7 @@
 #include <Core/source/infra/util/FolderResolver.h>
 #include <Core/source/cli/CliOptions.h>
 #include <CommonUtilities/log/IdentificationTable.h>
-#include <CommonUtilities/BuildId.h>
+#include <Versioning/BuildId.h>
 #include <CommonUtilities/win/Utilities.h>
 #include <PresentMonAPIWrapper/DiagnosticHandler.h>
 #include <dwmapi.h>
@@ -22,6 +22,7 @@
 
 using namespace p2c;
 using namespace pmon::util;
+using namespace pmon::bid;
 using p2c::cli::Options;
 namespace ccef = client::cef;
 using namespace std::chrono_literals;

diff --git a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj
@@ -19,7 +19,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BuildId.h" />
     <ClInclude Include="cli\CliFramework.h" />
     <ClInclude Include="Exception.h" />
     <ClInclude Include="IntervalWaiter.h" />
@@ -92,7 +91,6 @@
     <ClInclude Include="pipe\WrapAsio.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BuildId.cpp" />
     <ClCompile Include="cli\CliFramework.cpp" />
     <ClCompile Include="Exception.cpp" />
     <ClCompile Include="IntervalWaiter.cpp" />
@@ -137,8 +135,6 @@
     <ClCompile Include="win\Utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="build-scripts\pre-build.bat" />
-    <None Include="generated\.gitignore" />
     <None Include="vcpkg.json" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -271,10 +267,7 @@
       </SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
-    <PreBuildEvent>
-      <Command>build-scripts\pre-build.bat</Command>
-      <Message>Generating build ID</Message>
-    </PreBuildEvent>
+    <PreBuildEvent />
     <CustomBuildStep>
       <Command>
       </Command>
@@ -304,10 +297,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
-    <PreBuildEvent>
-      <Command>build-scripts\pre-build.bat</Command>
-      <Message>Generating build ID</Message>
-    </PreBuildEvent>
+    <PreBuildEvent />
     <CustomBuildStep>
       <Command>
       </Command>

diff --git a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters
@@ -204,9 +204,6 @@
     <ClInclude Include="third\reflect.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="BuildId.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PrecisionWaiter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -347,9 +344,6 @@
     <ClCompile Include="pipe\CoroMutex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="BuildId.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="PrecisionWaiter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -362,9 +356,5 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="vcpkg.json" />
-    <None Include="build-scripts\pre-build.bat">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="generated\.gitignore" />
   </ItemGroup>
 </Project>
diff --git a/IntelPresentMon/CommonUtilities/Math.h b/IntelPresentMon/CommonUtilities/Math.h
@@ -21,4 +21,36 @@ namespace pmon::util
 	{
 		return (a - b) < CommonEpsilon(a, b);
 	}
+	enum class MagnitudePrefix
+	{
+		Base,
+		Kilo,
+		Kibi,
+		Mega,
+		Mebi,
+		Giga,
+		Gibi,
+	};
+	constexpr double GetMagnitudeFactor(MagnitudePrefix prefix)
+	{
+		switch (prefix) {
+		case MagnitudePrefix::Base: return 1.;
+		case MagnitudePrefix::Kilo: return 1'000.;
+		case MagnitudePrefix::Kibi: return 1'024.;
+		case MagnitudePrefix::Mega: return 1'000'000.;
+		case MagnitudePrefix::Mebi: return 1'048'576.;
+		case MagnitudePrefix::Giga: return 1'000'000'000.;
+		case MagnitudePrefix::Gibi: return 1'073'741'824.;
+		default: return 0.;
+		}
+	}
+	template<typename From, typename To = From>
+	To ConvertMagnitudePrefix(From from, MagnitudePrefix fromPrefix, MagnitudePrefix toPrefix)
+	{
+		auto fromExtended = double(from);
+		const auto srcFactor = GetMagnitudeFactor(fromPrefix);
+		const auto dstFactor = GetMagnitudeFactor(toPrefix);
+		const auto conversionFactor = srcFactor / dstFactor;
+		return To(fromExtended * conversionFactor);
+	}
 }
diff --git a/IntelPresentMon/ControlLib/ControlLib.vcxproj b/IntelPresentMon/ControlLib/ControlLib.vcxproj
@@ -200,11 +200,13 @@
     <ClInclude Include="AmdPowerTelemetryProvider.h" />
     <ClInclude Include="Adl2Wrapper.h" />
     <ClInclude Include="CpuTelemetryInfo.h" />
+    <ClInclude Include="ctlpvttemp_api.h" />
     <ClInclude Include="DllModule.h" />
     <ClInclude Include="CpuTelemetry.h" />
     <ClInclude Include="Exceptions.h" />
     <ClInclude Include="IntelPowerTelemetryAdapter.h" />
     <ClInclude Include="Logging.h" />
+    <ClInclude Include="LoggingVerbose.h" />
     <ClInclude Include="MacroHelpers.h" />
     <ClInclude Include="nvapi.h" />
     <ClInclude Include="NvapiWrapper.h" />
@@ -227,6 +229,7 @@
     <ClCompile Include="AmdPowerTelemetryAdapter.cpp" />
     <ClCompile Include="Adl2Wrapper.cpp" />
     <ClCompile Include="cApiWrapper.cpp" />
+    <ClCompile Include="ctlpvttempWrapper.cpp" />
     <ClCompile Include="IntelPowerTelemetryProvider.cpp" />
     <ClCompile Include="IntelPowerTelemetryAdapter.cpp" />
     <ClCompile Include="NvapiWrapper.cpp" />

diff --git a/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters b/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters
@@ -76,6 +76,10 @@
     <ClInclude Include="PresentMonPowerTelemetry.h" />
     <ClInclude Include="TelemetryHistory.h" />
     <ClInclude Include="Exceptions.h" />
+    <ClInclude Include="ctlpvttemp_api.h">
+      <Filter>Intel</Filter>
+    </ClInclude>
+    <ClInclude Include="LoggingVerbose.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="NvapiWrapper.cpp">
@@ -116,5 +120,8 @@
     </ClCompile>
     <ClCompile Include="PowerTelemetryProviderFactory.cpp" />
     <ClCompile Include="CpuTelemetry.cpp" />
+    <ClCompile Include="ctlpvttempWrapper.cpp">
+      <Filter>Intel</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,5 +41,3 @@ PresentData/PresentData.args.json
		IntelPresentMon/SampleClient/log.txt

		IntelPresentMon/PresentMonAPI2/Internal.h

		IntelPresentMon/CommonUtilities/git_hash.h