Enable precompiled headers in rosumd.

microsoft · Mar 18, 2016 · a9a81b1 · a9a81b1
1 parent 4554d18
commit a9a81b1
Show file tree

Hide file tree

Showing 29 changed files with 81 additions and 94 deletions.
diff --git a/render-only-sample/rosumd/RosUmd.cpp b/render-only-sample/rosumd/RosUmd.cpp
@@ -1,6 +1,7 @@
-#include <windows.h>
 
-#include <RosUmdLogging.h>
+#include "precomp.h"
+
+#include "RosUmdLogging.h"
 
 // TODO[bhouse] Turn ApiValidator back on
 

diff --git a/render-only-sample/rosumd/RosUmdAdapter.cpp b/render-only-sample/rosumd/RosUmdAdapter.cpp
@@ -1,9 +1,9 @@
+#include "precomp.h"
 #include "RosUmdAdapter.h"
 #include "RosUmdDevice.h"
 #include "RosUmdLogging.h"
 #include "RosAdapter.h"
 
-#include <new>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //

diff --git a/render-only-sample/rosumd/RosUmdAdapter.h b/render-only-sample/rosumd/RosUmdAdapter.h
@@ -7,7 +7,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "d3dumddi_.h"
 #include "RosAdapter.h"
 
 //==================================================================================================================================

diff --git a/render-only-sample/rosumd/RosUmdBlendState.h b/render-only-sample/rosumd/RosUmdBlendState.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdBlendState
 {
 public:

diff --git a/render-only-sample/rosumd/RosUmdCommandBuffer.cpp b/render-only-sample/rosumd/RosUmdCommandBuffer.cpp
@@ -1,8 +1,9 @@
+#include "precomp.h"
 #include "RosUmdCommandBuffer.h"
 #include "RosUmdResource.h"
 #include "RosUmdDevice.h"
 #include "RosUmdDebug.h"
-#include <math.h>
+
 
 RosUmdCommandBuffer::RosUmdCommandBuffer()
 {

diff --git a/render-only-sample/rosumd/RosUmdCommandBuffer.h b/render-only-sample/rosumd/RosUmdCommandBuffer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
 #include "RosGpuCommand.h"
 
 class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdDebug.h b/render-only-sample/rosumd/RosUmdDebug.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <windows.h>
-#include <exception>
-
 #define assert( _exp ) ( ( _exp ) ? true : (\
     OutputDebugStringW( L"Assertion Failed\n" ),\
     OutputDebugStringW( #_exp L"\n" ),\

diff --git a/render-only-sample/rosumd/RosUmdDepthStencilState.h b/render-only-sample/rosumd/RosUmdDepthStencilState.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdDepthStencilState
 {
     friend class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdDepthStencilView.h b/render-only-sample/rosumd/RosUmdDepthStencilView.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdDepthStencilView
 {
 friend class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdDevice.cpp b/render-only-sample/rosumd/RosUmdDevice.cpp
@@ -5,6 +5,7 @@
 // Copyright (C) Microsoft Corporation
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#include "precomp.h"
 #include "RosUmdDevice.h"
 #include "RosUmdResource.h"
 #include "RosUmdDebug.h"
@@ -22,10 +23,6 @@
 #include "RosContext.h"
 #include "RosUmdUtil.h"
 
-#include <exception>
-#include <typeinfo>
-#include <new>
-
 #if VC4
 
 #include "Vc4Hw.h"
@@ -35,8 +32,6 @@
 
 #endif
 
-#include "math.h"
-
 static
 BOOLEAN _IntersectRect(RECT* CONST pDst, RECT CONST* CONST pSrc1, RECT CONST* CONST pSrc2)
 {

diff --git a/render-only-sample/rosumd/RosUmdDevice.h b/render-only-sample/rosumd/RosUmdDevice.h
@@ -7,9 +7,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "d3dumddi_.h"
-#include <debugapi.h>
-
 #include "RosUmdCommandBuffer.h"
 #include "RosAllocation.h"
 #include "RosUmdUtil.h"

diff --git a/render-only-sample/rosumd/RosUmdDeviceDdi.cpp b/render-only-sample/rosumd/RosUmdDeviceDdi.cpp
@@ -1,3 +1,4 @@
+#include "precomp.h"
 #include "RosUmdDeviceDdi.h"
 #include "RosUmdDevice.h"
 #include "RosUmdResource.h"
@@ -15,10 +16,6 @@
 
 #include "RosContext.h"
 
-#include <exception>
-#include <typeinfo>
-#include <new>
-
 //
 // Ddi Tables
 //

diff --git a/render-only-sample/rosumd/RosUmdDeviceDdi.h b/render-only-sample/rosumd/RosUmdDeviceDdi.h
@@ -7,8 +7,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "d3dumddi_.h"
-
 #include "RosUmdLogging.h"
 
 class RosUmdDeviceDdi

diff --git a/render-only-sample/rosumd/RosUmdElementLayout.h b/render-only-sample/rosumd/RosUmdElementLayout.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdElementLayout
 {
 friend RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdLogging.h b/render-only-sample/rosumd/RosUmdLogging.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <debugapi.h>
-#include <stdio.h>
+
 
 class RosUmdLogging
 {

diff --git a/render-only-sample/rosumd/RosUmdRasterizerState.h b/render-only-sample/rosumd/RosUmdRasterizerState.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 
 class RosUmdRasterizerState
 {

diff --git a/render-only-sample/rosumd/RosUmdRenderTargetView.h b/render-only-sample/rosumd/RosUmdRenderTargetView.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdRenderTargetView
 {
 friend class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdResource.cpp b/render-only-sample/rosumd/RosUmdResource.cpp
@@ -5,6 +5,7 @@
 // Copyright (C) Microsoft Corporation
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#include "precomp.h"
 #include "RosUmdDevice.h"
 #include "RosUmdResource.h"
 #include "RosUmdDebug.h"

diff --git a/render-only-sample/rosumd/RosUmdSampler.h b/render-only-sample/rosumd/RosUmdSampler.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdSampler
 {
     friend class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdShader.cpp b/render-only-sample/rosumd/RosUmdShader.cpp
@@ -5,6 +5,7 @@
 // Copyright (C) Microsoft Corporation
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#include "precomp.h"
 #include "RosUmdDevice.h"
 #include "RosUmdShader.h"
 

diff --git a/render-only-sample/rosumd/RosUmdShader.h b/render-only-sample/rosumd/RosUmdShader.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "d3dumddi_.h"
 #include "RosUmdDevice.h"
-#include "..\roscompiler\roscompiler.h"
+#include <roscompiler.h>
 
 class RosUmdShader
 {

diff --git a/render-only-sample/rosumd/RosUmdShaderResourceView.h b/render-only-sample/rosumd/RosUmdShaderResourceView.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "d3dumddi_.h"
-
 class RosUmdShaderResourceView
 {
 friend class RosUmdDevice;

diff --git a/render-only-sample/rosumd/RosUmdUtil.cpp b/render-only-sample/rosumd/RosUmdUtil.cpp
@@ -6,9 +6,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "d3dumddi_.h"
+#include "precomp.h"
 #include "RosUmdUtil.h"
-#include <math.h>
 
 #if VC4
 

diff --git a/render-only-sample/rosumd/pixel.cpp b/render-only-sample/rosumd/pixel.cpp
@@ -8,6 +8,7 @@
  *
  ***************************************************************************/
 
+#include "precomp.h"
 #include "strsafe.h"
 #include "pixel.hpp"
 

diff --git a/render-only-sample/rosumd/pixel.hpp b/render-only-sample/rosumd/pixel.hpp
@@ -21,8 +21,6 @@
 #define DXGASSERT( x ) _Analysis_assume_( x );
 #endif
 
-#include <d3dumddi_.h>
-
 struct IHVFormatInfo
 {
     DXGI_FORMAT     m_Format;

diff --git a/render-only-sample/rosumd/pixlib.cpp b/render-only-sample/rosumd/pixlib.cpp
@@ -1,5 +1,5 @@
 
-
+#include "precomp.h"
 #include "pixel.cpp"
 
 // Bytes per "pixel" table index by DXGI_FORMAT

diff --git a/render-only-sample/rosumd/precomp.cpp b/render-only-sample/rosumd/precomp.cpp
@@ -0,0 +1 @@
+#include "precomp.h"
diff --git a/render-only-sample/rosumd/precomp.h b/render-only-sample/rosumd/precomp.h
@@ -0,0 +1,16 @@
+#ifndef _ROSUMD_PRECOMP_H_
+#define _ROSUMD_PRECOMP_H_
+
+#include <windows.h>
+#include <strsafe.h>
+#include <debugapi.h>
+#include "d3dumddi_.h"
+
+#include <exception>
+#include <typeinfo>
+#include <new>
+
+#include <stdio.h>
+#include <math.h>
+
+#endif // _ROSUMD_PRECOMP_H_
diff --git a/render-only-sample/rosumd/rosumd.vcxproj b/render-only-sample/rosumd/rosumd.vcxproj
@@ -34,51 +34,6 @@
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="RosUmd.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pixlib.cpp" />
-    <ClCompile Include="RosUmd.cpp" />
-    <ClCompile Include="RosUmdAdapter.cpp">
-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PreprocessToFile>
-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessToFile>
-    </ClCompile>
-    <ClCompile Include="RosUmdCommandBuffer.cpp" />
-    <ClCompile Include="RosUmdDevice.cpp" />
-    <ClCompile Include="RosUmdDeviceDdi.cpp" />
-    <ClCompile Include="RosUmdResource.cpp" />
-    <ClCompile Include="RosUmdShader.cpp" />
-    <ClCompile Include="RosUmdUtil.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\roscommon\RosAdapter.h" />
-    <ClInclude Include="..\roscommon\RosAllocation.h" />
-    <ClInclude Include="..\roscommon\RosGpuCommand.h" />
-    <ClInclude Include="..\roscommon\Vc4Ddi.h" />
-    <ClInclude Include="..\roscommon\Vc4Hw.h" />
-    <ClInclude Include="..\roscompiler\roscompiler.h" />
-    <ClInclude Include="d3dumddi_.h" />
-    <ClInclude Include="pixel.hpp" />
-    <ClInclude Include="RosContext.h" />
-    <ClInclude Include="RosUmdAdapter.h" />
-    <ClInclude Include="RosUmdBlendState.h" />
-    <ClInclude Include="RosUmdCommandBuffer.h" />
-    <ClInclude Include="RosUmdDebug.h" />
-    <ClInclude Include="RosUmdDepthStencilState.h" />
-    <ClInclude Include="RosUmdDepthStencilView.h" />
-    <ClInclude Include="RosUmdDevice.h" />
-    <ClInclude Include="RosUmdDeviceDdi.h" />
-    <ClInclude Include="RosUmdElementLayout.h" />
-    <ClInclude Include="RosUmdLogging.h" />
-    <ClInclude Include="RosUmdRasterizerState.h" />
-    <ClInclude Include="RosUmdRenderTargetView.h" />
-    <ClInclude Include="RosUmdResource.h" />
-    <ClInclude Include="RosUmdSampler.h" />
-    <ClInclude Include="RosUmdShader.h" />
-    <ClInclude Include="RosUmdShaderResourceView.h" />
-    <ClInclude Include="RosUmdUtil.h" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B87732A7-0D66-4692-96E2-2772BF77C3FC}</ProjectGuid>
     <TemplateGuid>{9181db3b-298d-4e39-a572-55bca4e4ac89}</TemplateGuid>
@@ -126,6 +81,8 @@
   <!-- Common configuration to debug/release -->
   <ItemDefinitionGroup>
     <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <SDLCheck>true</SDLCheck>
@@ -135,6 +92,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <DisableSpecificWarnings>4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PreprocessorDefinitions>VC4=1;_USE_DECLSPECS_FOR_SAL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\roscompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>RosUmd.def</ModuleDefinitionFile>
@@ -173,6 +131,52 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="RosUmd.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="pixlib.cpp" />
+    <ClCompile Include="RosUmd.cpp" />
+    <ClCompile Include="RosUmdAdapter.cpp" />
+    <ClCompile Include="RosUmdCommandBuffer.cpp" />
+    <ClCompile Include="RosUmdDevice.cpp" />
+    <ClCompile Include="RosUmdDeviceDdi.cpp" />
+    <ClCompile Include="RosUmdResource.cpp" />
+    <ClCompile Include="RosUmdShader.cpp" />
+    <ClCompile Include="RosUmdUtil.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="..\roscommon\RosAdapter.h" />
+    <ClInclude Include="..\roscommon\RosAllocation.h" />
+    <ClInclude Include="..\roscommon\RosGpuCommand.h" />
+    <ClInclude Include="..\roscommon\Vc4Ddi.h" />
+    <ClInclude Include="..\roscommon\Vc4Hw.h" />
+    <ClInclude Include="..\roscompiler\roscompiler.h" />
+    <ClInclude Include="d3dumddi_.h" />
+    <ClInclude Include="pixel.hpp" />
+    <ClInclude Include="RosContext.h" />
+    <ClInclude Include="RosUmdAdapter.h" />
+    <ClInclude Include="RosUmdBlendState.h" />
+    <ClInclude Include="RosUmdCommandBuffer.h" />
+    <ClInclude Include="RosUmdDebug.h" />
+    <ClInclude Include="RosUmdDepthStencilState.h" />
+    <ClInclude Include="RosUmdDepthStencilView.h" />
+    <ClInclude Include="RosUmdDevice.h" />
+    <ClInclude Include="RosUmdDeviceDdi.h" />
+    <ClInclude Include="RosUmdElementLayout.h" />
+    <ClInclude Include="RosUmdLogging.h" />
+    <ClInclude Include="RosUmdRasterizerState.h" />
+    <ClInclude Include="RosUmdRenderTargetView.h" />
+    <ClInclude Include="RosUmdResource.h" />
+    <ClInclude Include="RosUmdSampler.h" />
+    <ClInclude Include="RosUmdShader.h" />
+    <ClInclude Include="RosUmdShaderResourceView.h" />
+    <ClInclude Include="RosUmdUtil.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>