Merge pull request #503 from GameTechDev/bug/pm_ult_failures

Bug/pm ult failures

Author: planetchili

PresentMon/CsvOutput.cpp

@@ -339,7 +339,7 @@ void WriteCsvHeader<FrameMetrics>(FILE* fp)
                          L",DisplayedTime"
                          L",AnimationError"
                          L",AnimationTime"
-                         L",FlipDelay");
+                         L",MsFlipDelay");
         }
         if (args.mTrackInput) {
             fwprintf(fp, L",AllInputToPhotonLatency");
@@ -371,7 +371,7 @@ void WriteCsvHeader<FrameMetrics>(FILE* fp)
         if (args.mTrackDisplay) {
             fwprintf(fp, L",MsAnimationError"
                 L",AnimationTime"
-                L",FlipDelay");
+                L",MsFlipDelay");
         }
         if (args.mTrackInput) {
             fwprintf(fp, L",MsAllInputToPhotonLatency");

PresentMon/PresentMon.vcxproj

@@ -189,10 +189,10 @@
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc.exe -um -v -z %(Filename)Events -h .\  %(FullPath)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Autogenerate header from DD events manifest</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)Events.rc;%(Filename)Events.h;%(Filename)_MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)Events.rc;%(Filename)Events.h;%(Filename)Events_MSG00001.bin</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc.exe -um -v -z %(Filename)Events -h .\  %(FullPath)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Autogenerate header from DD events manifest</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)Events.rc;%(Filename)Events.h;%(Filename)_MSG00001.bin</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)Events.rc;%(Filename)Events.h;%(Filename)Events_MSG00001.bin</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>