From a9a81b1068e0f764153337a2f59ee86ec53936ad Mon Sep 17 00:00:00 2001 From: Jordan Rhee Date: Thu, 17 Mar 2016 19:14:09 -0700 Subject: [PATCH] Enable precompiled headers in rosumd. --- render-only-sample/rosumd/RosUmd.cpp | 5 +- render-only-sample/rosumd/RosUmdAdapter.cpp | 2 +- render-only-sample/rosumd/RosUmdAdapter.h | 1 - render-only-sample/rosumd/RosUmdBlendState.h | 2 - .../rosumd/RosUmdCommandBuffer.cpp | 3 +- .../rosumd/RosUmdCommandBuffer.h | 1 - render-only-sample/rosumd/RosUmdDebug.h | 3 - .../rosumd/RosUmdDepthStencilState.h | 2 - .../rosumd/RosUmdDepthStencilView.h | 2 - render-only-sample/rosumd/RosUmdDevice.cpp | 7 +- render-only-sample/rosumd/RosUmdDevice.h | 3 - render-only-sample/rosumd/RosUmdDeviceDdi.cpp | 5 +- render-only-sample/rosumd/RosUmdDeviceDdi.h | 2 - .../rosumd/RosUmdElementLayout.h | 2 - render-only-sample/rosumd/RosUmdLogging.h | 3 +- .../rosumd/RosUmdRasterizerState.h | 2 - .../rosumd/RosUmdRenderTargetView.h | 2 - render-only-sample/rosumd/RosUmdResource.cpp | 1 + render-only-sample/rosumd/RosUmdSampler.h | 2 - render-only-sample/rosumd/RosUmdShader.cpp | 1 + render-only-sample/rosumd/RosUmdShader.h | 3 +- .../rosumd/RosUmdShaderResourceView.h | 2 - render-only-sample/rosumd/RosUmdUtil.cpp | 3 +- render-only-sample/rosumd/pixel.cpp | 1 + render-only-sample/rosumd/pixel.hpp | 2 - render-only-sample/rosumd/pixlib.cpp | 2 +- render-only-sample/rosumd/precomp.cpp | 1 + render-only-sample/rosumd/precomp.h | 16 ++++ render-only-sample/rosumd/rosumd.vcxproj | 94 ++++++++++--------- 29 files changed, 81 insertions(+), 94 deletions(-) create mode 100644 render-only-sample/rosumd/precomp.cpp create mode 100644 render-only-sample/rosumd/precomp.h diff --git a/render-only-sample/rosumd/RosUmd.cpp b/render-only-sample/rosumd/RosUmd.cpp index b3b41ab..3c190ff 100644 --- a/render-only-sample/rosumd/RosUmd.cpp +++ b/render-only-sample/rosumd/RosUmd.cpp @@ -1,6 +1,7 @@ -#include -#include +#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 index f4807c4..9039df3 100644 --- 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 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/render-only-sample/rosumd/RosUmdAdapter.h b/render-only-sample/rosumd/RosUmdAdapter.h index 3fea487..f4d1a25 100644 --- 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 index fbaf86c..39fb51a 100644 --- 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 index a60c483..af8897b 100644 --- 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 + RosUmdCommandBuffer::RosUmdCommandBuffer() { diff --git a/render-only-sample/rosumd/RosUmdCommandBuffer.h b/render-only-sample/rosumd/RosUmdCommandBuffer.h index 23e2110..12b91a6 100644 --- 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 index 3c98d9c..8168644 100644 --- a/render-only-sample/rosumd/RosUmdDebug.h +++ b/render-only-sample/rosumd/RosUmdDebug.h @@ -1,8 +1,5 @@ #pragma once -#include -#include - #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 index 840db76..23badb8 100644 --- 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 index 1a4edbb..8de209e 100644 --- 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 index 9a69558..6f4a438 100644 --- 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 -#include -#include - #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 index e70f927..a0b9634 100644 --- a/render-only-sample/rosumd/RosUmdDevice.h +++ b/render-only-sample/rosumd/RosUmdDevice.h @@ -7,9 +7,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once -#include "d3dumddi_.h" -#include - #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 index c50a6f8..d1201d1 100644 --- 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 -#include -#include - // // Ddi Tables // diff --git a/render-only-sample/rosumd/RosUmdDeviceDdi.h b/render-only-sample/rosumd/RosUmdDeviceDdi.h index 731973c..51648b7 100644 --- 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 index 82d18d8..fa6a339 100644 --- 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 index ffc9b67..264bfd4 100644 --- a/render-only-sample/rosumd/RosUmdLogging.h +++ b/render-only-sample/rosumd/RosUmdLogging.h @@ -1,7 +1,6 @@ #pragma once -#include -#include + class RosUmdLogging { diff --git a/render-only-sample/rosumd/RosUmdRasterizerState.h b/render-only-sample/rosumd/RosUmdRasterizerState.h index acf29f9..1a777c3 100644 --- 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 index 6079fbd..584eea8 100644 --- 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 index b0a6d47..82b7505 100644 --- 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 index 5792ab8..e75be69 100644 --- 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 index 3d745c8..4faac80 100644 --- 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 index f03e303..e0f1248 100644 --- 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 class RosUmdShader { diff --git a/render-only-sample/rosumd/RosUmdShaderResourceView.h b/render-only-sample/rosumd/RosUmdShaderResourceView.h index 58a5e31..7ea8d3d 100644 --- 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 index d44c885..04f35a7 100644 --- 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 #if VC4 diff --git a/render-only-sample/rosumd/pixel.cpp b/render-only-sample/rosumd/pixel.cpp index b8f7b24..ab8111c 100644 --- 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 index 3e04309..2c274f6 100644 --- 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 - struct IHVFormatInfo { DXGI_FORMAT m_Format; diff --git a/render-only-sample/rosumd/pixlib.cpp b/render-only-sample/rosumd/pixlib.cpp index 89dc71f..f56b756 100644 --- 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 new file mode 100644 index 0000000..ceeb0d6 --- /dev/null +++ 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 new file mode 100644 index 0000000..b99cdf7 --- /dev/null +++ b/render-only-sample/rosumd/precomp.h @@ -0,0 +1,16 @@ +#ifndef _ROSUMD_PRECOMP_H_ +#define _ROSUMD_PRECOMP_H_ + +#include +#include +#include +#include "d3dumddi_.h" + +#include +#include +#include + +#include +#include + +#endif // _ROSUMD_PRECOMP_H_ diff --git a/render-only-sample/rosumd/rosumd.vcxproj b/render-only-sample/rosumd/rosumd.vcxproj index dba175a..8620cbf 100644 --- a/render-only-sample/rosumd/rosumd.vcxproj +++ b/render-only-sample/rosumd/rosumd.vcxproj @@ -34,51 +34,6 @@ ARM64 - - - - - - - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {B87732A7-0D66-4692-96E2-2772BF77C3FC} {9181db3b-298d-4e39-a572-55bca4e4ac89} @@ -126,6 +81,8 @@ + Use + precomp.h Level4 true true @@ -135,6 +92,7 @@ Sync 4201;%(DisableSpecificWarnings) VC4=1;_USE_DECLSPECS_FOR_SAL=1;%(PreprocessorDefinitions) + ..\roscompiler;%(AdditionalIncludeDirectories) RosUmd.def @@ -173,6 +131,52 @@ + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +