Skip to content

S
swiftshader
Commit 2876e097 by Nicolas Capens
Options

Add the D3D9 project to the solution.

Bug 22533227 Change-Id: I7dd953eecb169cb471aa9c1830f91b06f8bcc7ac Reviewed-on: https://swiftshader-review.googlesource.com/3731Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent ee16f0de
Showing with 27 additions and 46 deletions
src/Common/ExceptionHandling.hpp deleted 100644 → 0
#if 1
#define try
#define catch(x) if(false)
#endif
src/D3D9/D3D9.vcxproj
<?xml version="1.0" encoding="utf-8"?> <?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"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
...@@ -35,31 +35,37 @@ ...@@ -35,31 +35,37 @@
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
...@@ -140,7 +146,7 @@ ...@@ -140,7 +146,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
...@@ -174,7 +180,7 @@ ...@@ -174,7 +180,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;comctl32.lib;user32.lib;gdi32.lib;Psapi.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
...@@ -209,7 +215,7 @@ ...@@ -209,7 +215,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat> <DebugInformationFormat>
</DebugInformationFormat> </DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions> <FloatingPointExceptions>false</FloatingPointExceptions>
...@@ -249,7 +255,7 @@ ...@@ -249,7 +255,7 @@
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions> <FloatingPointExceptions>false</FloatingPointExceptions>
...@@ -294,7 +300,7 @@ ...@@ -294,7 +300,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat> <DebugInformationFormat>
</DebugInformationFormat> </DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions> <FloatingPointExceptions>false</FloatingPointExceptions>
...@@ -338,7 +344,7 @@ ...@@ -338,7 +344,7 @@
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ForcedIncludeFiles>ExceptionHandling.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles> <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions> <FloatingPointExceptions>false</FloatingPointExceptions>
...@@ -418,39 +424,6 @@ ...@@ -418,39 +424,6 @@
<None Include="d3d9.def" /> <None Include="d3d9.def" />
</ItemGroup> </ItemGroup>
<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"> <ProjectReference Include="..\SwiftShader\SwiftShader.vcxproj">
<Project>{7b02cb19-4cdf-4f79-bc9b-7f3f6164a003}</Project> <Project>{7b02cb19-4cdf-4f79-bc9b-7f3f6164a003}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
src/OpenGL/libGLES_CM/libGLES_CM.cbp
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
<Unit filename="../../Common/Configurator.hpp" /> <Unit filename="../../Common/Configurator.hpp" />
<Unit filename="../../Common/Debug.cpp" /> <Unit filename="../../Common/Debug.cpp" />
<Unit filename="../../Common/Debug.hpp" /> <Unit filename="../../Common/Debug.hpp" />
<Unit filename="../../Common/ExceptionHandling.hpp" />
<Unit filename="../../Common/Half.cpp" /> <Unit filename="../../Common/Half.cpp" />
<Unit filename="../../Common/Half.hpp" /> <Unit filename="../../Common/Half.hpp" />
<Unit filename="../../Common/Math.cpp" /> <Unit filename="../../Common/Math.cpp" />
......
src/OpenGL/libGLESv2/libGLESv2.cbp
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
<Unit filename="../../Common/Configurator.hpp" /> <Unit filename="../../Common/Configurator.hpp" />
<Unit filename="../../Common/Debug.cpp" /> <Unit filename="../../Common/Debug.cpp" />
<Unit filename="../../Common/Debug.hpp" /> <Unit filename="../../Common/Debug.hpp" />
<Unit filename="../../Common/ExceptionHandling.hpp" />
<Unit filename="../../Common/Half.cpp" /> <Unit filename="../../Common/Half.cpp" />
<Unit filename="../../Common/Half.hpp" /> <Unit filename="../../Common/Half.hpp" />
<Unit filename="../../Common/Math.cpp" /> <Unit filename="../../Common/Math.cpp" />
......
src/SwiftShader.sln
...@@ -251,6 +251,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLSimpleCube", "..\tests\O ...@@ -251,6 +251,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLSimpleCube", "..\tests\O
{3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67} = {3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67} {3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67} = {3EF851E7-4AAB-4C7C-9A79-3122CEA1EB67}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D9", "D3D9\D3D9.vcxproj", "{F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
...@@ -693,6 +695,18 @@ Global ...@@ -693,6 +695,18 @@ Global
{27E15292-4A8D-4BA0-8D9B-5D1ECFF85747}.Release|Win32.Build.0 = Release|Win32 {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.ActiveCfg = Release|x64
{27E15292-4A8D-4BA0-8D9B-5D1ECFF85747}.Release|x64.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment