Add the D3D9 project to the solution.
Bug 22533227
Change-Id: I7dd953eecb169cb471aa9c1830f91b06f8bcc7ac
Reviewed-on: https://swiftshader-review.googlesource.com/3731
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Common/ExceptionHandling.hpp b/src/Common/ExceptionHandling.hpp
deleted file mode 100644
index 4cbb8d6..0000000
--- a/src/Common/ExceptionHandling.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#if 1
- #define try
- #define catch(x) if(false)
-#endif
diff --git a/src/D3D9/D3D9.vcproj b/src/D3D9/D3D9.vcproj
deleted file mode 100644
index 3d265fd..0000000
--- a/src/D3D9/D3D9.vcproj
+++ /dev/null
@@ -1,650 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="D3D9"
- ProjectGUID="{F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- InlineFunctionExpansion="0"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="0"
- OmitFramePointers="false"
- AdditionalIncludeDirectories="..\Main;..\Renderer;..\Shader;..\Common;..\SwiftAsm;..\libjpeg;..\SwiftShader;..\D3D9;..\Reactor;..\LLVM\include;..\LLVM\win32"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;D3D9DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- ExceptionHandling="1"
- BasicRuntimeChecks="0"
- RuntimeLibrary="1"
- ForceConformanceInForLoopScope="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- ForcedIncludeFiles="ExceptionHandling.hpp"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib dxguid.lib comctl32.lib user32.lib gdi32.lib"
- OutputFile="$(OutDir)/d3d9.dll"
- LinkIncremental="2"
- IgnoreDefaultLibraryNames="libci.lib"
- ModuleDefinitionFile="d3d9.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/D3D9.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/D3D9.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- InlineFunctionExpansion="0"
- FavorSizeOrSpeed="0"
- OmitFramePointers="false"
- AdditionalIncludeDirectories="..\Main;..\Renderer;..\Shader;..\Common;..\SwiftAsm;..\libjpeg;..\SwiftShader;..\D3D9;..\Reactor;..\LLVM\include;..\LLVM\win32"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;D3D9DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- ExceptionHandling="1"
- BasicRuntimeChecks="0"
- RuntimeLibrary="1"
- ForceConformanceInForLoopScope="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- ForcedIncludeFiles="ExceptionHandling.hpp"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib dxguid.lib comctl32.lib user32.lib gdi32.lib"
- OutputFile="$(OutDir)/d3d9.dll"
- LinkIncremental="2"
- IgnoreDefaultLibraryNames="libci.lib"
- ModuleDefinitionFile="d3d9.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/D3D9.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/D3D9.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="0"
- OmitFramePointers="true"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\Main;..\Renderer;..\Shader;..\Common;..\SwiftAsm;..\libjpeg;..\SwiftShader;..\D3D9;..\Reactor;..\LLVM\include;..\LLVM\win32"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;D3D9DLL_EXPORTS;DLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_EXCEPTIONS=0"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- ForceConformanceInForLoopScope="true"
- UsePrecompiledHeader="0"
- ExpandAttributedSource="false"
- BrowseInformation="1"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- ForcedIncludeFiles="ExceptionHandling.hpp"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib dxguid.lib comctl32.lib user32.lib gdi32.lib"
- OutputFile="$(OutDir)/d3d9.dll"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames="libci.lib"
- ModuleDefinitionFile="d3d9.def"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- SetChecksum="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/D3D9.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="0"
- OmitFramePointers="true"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="..\Main;..\Renderer;..\Shader;..\Common;..\SwiftAsm;..\libjpeg;..\SwiftShader;..\D3D9;..\Reactor;..\LLVM\include;..\LLVM\win32"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;D3D9DLL_EXPORTS;DLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_EXCEPTIONS=0"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- ForceConformanceInForLoopScope="true"
- UsePrecompiledHeader="0"
- ExpandAttributedSource="false"
- BrowseInformation="1"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- ForcedIncludeFiles="ExceptionHandling.hpp"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib dxguid.lib comctl32.lib user32.lib gdi32.lib"
- OutputFile="$(OutDir)/d3d9.dll"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames="libci.lib"
- ModuleDefinitionFile="d3d9.def"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- SetChecksum="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/D3D9.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\Capabilities.cpp"
- >
- </File>
- <File
- RelativePath=".\D3D9.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AssemblerOutput="4"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- AssemblerOutput="4"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AssemblerOutput="3"
- ShowIncludes="false"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- AssemblerOutput="3"
- ShowIncludes="false"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\Debug.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3D9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3D9Ex.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DBaseTexture9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DCubeTexture9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DDevice9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DDevice9Ex.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DIndexBuffer9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DPixelShader9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DQuery9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DResource9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DStateBlock9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DSurface9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DSwapChain9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DTexture9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexBuffer9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexDeclaration9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexShader9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVolume9.cpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVolumeTexture9.cpp"
- >
- </File>
- <File
- RelativePath=".\SwiftShader.cpp"
- >
- </File>
- <File
- RelativePath=".\Unknown.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\Capabilities.hpp"
- >
- </File>
- <File
- RelativePath=".\Debug.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3D9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3D9Ex.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DBaseTexture9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DCubeTexture9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DDevice9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DDevice9Ex.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DIndexBuffer9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DPixelShader9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DQuery9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DResource9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DStateBlock9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DSurface9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DSwapChain9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DTexture9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexBuffer9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexDeclaration9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVertexShader9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVolume9.hpp"
- >
- </File>
- <File
- RelativePath=".\Direct3DVolumeTexture9.hpp"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\SwiftShader.h"
- >
- </File>
- <File
- RelativePath=".\SwiftShader.hpp"
- >
- </File>
- <File
- RelativePath=".\Unknown.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\D3D9.rc"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\d3d9.def"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/D3D9/D3D9.vcxproj b/src/D3D9/D3D9.vcxproj
index 33de5a2..6f81ad6 100644
--- a/src/D3D9/D3D9.vcxproj
+++ b/src/D3D9/D3D9.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -35,31 +35,37 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -140,7 +146,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -174,7 +180,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -209,7 +215,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -249,7 +255,7 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -294,7 +300,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -338,7 +344,7 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -418,39 +424,6 @@
<None Include="d3d9.def" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\LLVM\win32\Analysis\Analysis.vcxproj">
- <Project>{0622e827-8464-489d-8b1c-b0b496f35c08}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\CodeGen\CodeGen.vcxproj">
- <Project>{08ceb1bb-c2a4-4587-b9a9-aedb8fb44897}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\ExecutionEngine\ExecutionEngine.vcxproj">
- <Project>{76295ae8-a083-460e-9f80-6f2b8923264a}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\MC\MC.vcxproj">
- <Project>{12d00cfa-e393-4857-a436-c7324849de51}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\Support\Support.vcxproj">
- <Project>{28aa9146-3482-4f41-9cc6-407b1d258508}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\System\System.vcxproj">
- <Project>{0f8407f3-fa23-4cf1-83a9-dcbe0b361489}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\Target\Target.vcxproj">
- <Project>{059fbab8-c76d-48a0-aa75-3c57bd3eafe4}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\Transforms\Transforms.vcxproj">
- <Project>{c59374c1-9fc0-4147-b836-327dfdc52d99}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\VMCore\VMCore.vcxproj">
- <Project>{45cd78d7-c5d9-47fe-ad12-f3251eedaffb}</Project>
- </ProjectReference>
- <ProjectReference Include="..\LLVM\win32\x86\x86.vcxproj">
- <Project>{144eebf6-8c9b-4473-b715-2c821666af6c}</Project>
- </ProjectReference>
- <ProjectReference Include="..\Reactor\Reactor.vcxproj">
- <Project>{28fd076d-10b5-4bd8-a4cf-f44c7002a803}</Project>
- </ProjectReference>
<ProjectReference Include="..\SwiftShader\SwiftShader.vcxproj">
<Project>{7b02cb19-4cdf-4f79-bc9b-7f3f6164a003}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.cbp b/src/OpenGL/libGLES_CM/libGLES_CM.cbp
index 050c26d..511f127 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cbp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cbp
@@ -146,7 +146,6 @@
<Unit filename="../../Common/Configurator.hpp" />
<Unit filename="../../Common/Debug.cpp" />
<Unit filename="../../Common/Debug.hpp" />
- <Unit filename="../../Common/ExceptionHandling.hpp" />
<Unit filename="../../Common/Half.cpp" />
<Unit filename="../../Common/Half.hpp" />
<Unit filename="../../Common/Math.cpp" />
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cbp b/src/OpenGL/libGLESv2/libGLESv2.cbp
index b4dbcb1..b797561 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cbp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cbp
@@ -145,7 +145,6 @@
<Unit filename="../../Common/Configurator.hpp" />
<Unit filename="../../Common/Debug.cpp" />
<Unit filename="../../Common/Debug.hpp" />
- <Unit filename="../../Common/ExceptionHandling.hpp" />
<Unit filename="../../Common/Half.cpp" />
<Unit filename="../../Common/Half.hpp" />
<Unit filename="../../Common/Math.cpp" />
diff --git a/src/SwiftShader.sln b/src/SwiftShader.sln
index 4a7bf3c..d01ebc6 100644
--- a/src/SwiftShader.sln
+++ b/src/SwiftShader.sln
@@ -251,6 +251,8 @@
{3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67} = {3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D9", "D3D9\D3D9.vcxproj", "{F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -693,6 +695,18 @@
{27E15292-4A8D-4BA0-8D9B-5D1ECFF85747}.Release|Win32.Build.0 = Release|Win32
{27E15292-4A8D-4BA0-8D9B-5D1ECFF85747}.Release|x64.ActiveCfg = Release|x64
{27E15292-4A8D-4BA0-8D9B-5D1ECFF85747}.Release|x64.Build.0 = Release|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Debug|Win32.Build.0 = Debug|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Debug|x64.ActiveCfg = Debug|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Debug|x64.Build.0 = Debug|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Profile|Win32.ActiveCfg = Profile|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Profile|Win32.Build.0 = Profile|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Profile|x64.ActiveCfg = Profile|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Profile|x64.Build.0 = Profile|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Release|Win32.ActiveCfg = Release|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Release|Win32.Build.0 = Release|Win32
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Release|x64.ActiveCfg = Release|x64
+ {F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
