Skip to content

S
swiftshader
Commit 2a292716 by Nicolas Capens
Options

Revert "Removed Subzero compilation from SwiftShader solution"

It caused building Subzero individually to fail. Instead I've added a header which will get included when the submodule is not present and generates an error. The LLVM dependencies were split off into a separate project to make this work. This reverts commit d5d886eb. Change-Id: Ie80a02e20ac67d6a4e0984e1fbab84b880a03469 Reviewed-on: https://swiftshader-review.googlesource.com/7611Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent d5d886eb
Showing with 68 additions and 157 deletions
SwiftShader.sln
...@@ -261,6 +261,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Subzero", "src\Reactor\Subz ...@@ -261,6 +261,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Subzero", "src\Reactor\Subz
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubzeroTest", "src\Reactor\SubzeroTest.vcxproj", "{4EC107AB-89E8-4A0B-8366-B3E81085AE07}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubzeroTest", "src\Reactor\SubzeroTest.vcxproj", "{4EC107AB-89E8-4A0B-8366-B3E81085AE07}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubzeroLLVMDependencies", "src\Reactor\SubzeroLLVMDependencies.vcxproj", "{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
...@@ -737,17 +739,41 @@ Global ...@@ -737,17 +739,41 @@ Global
{F18D5ABF-CA3A-4B74-BDB2-4A1956C86F18}.Release|Win32.Build.0 = Release|Win32 {F18D5ABF-CA3A-4B74-BDB2-4A1956C86F18}.Release|Win32.Build.0 = Release|Win32
{F18D5ABF-CA3A-4B74-BDB2-4A1956C86F18}.Release|x64.ActiveCfg = Release|Win32 {F18D5ABF-CA3A-4B74-BDB2-4A1956C86F18}.Release|x64.ActiveCfg = Release|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|Win32.ActiveCfg = Debug|Win32 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|Win32.ActiveCfg = Debug|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|Win32.Build.0 = Debug|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|x64.ActiveCfg = Debug|x64 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|x64.ActiveCfg = Debug|x64
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Debug|x64.Build.0 = Debug|x64
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|Win32.ActiveCfg = Release|Win32 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|Win32.ActiveCfg = Release|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|Win32.Build.0 = Release|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|x64.ActiveCfg = Release|x64 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|x64.ActiveCfg = Release|x64
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Profile|x64.Build.0 = Release|x64
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|Win32.ActiveCfg = Release|Win32 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|Win32.ActiveCfg = Release|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|Win32.Build.0 = Release|Win32
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|x64.ActiveCfg = Release|x64 {0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|x64.ActiveCfg = Release|x64
{0EB31AEC-B020-46AB-BA05-730F6D01C29B}.Release|x64.Build.0 = Release|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|Win32.ActiveCfg = Debug|Win32 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|Win32.ActiveCfg = Debug|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|Win32.Build.0 = Debug|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|x64.ActiveCfg = Debug|x64 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|x64.ActiveCfg = Debug|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Debug|x64.Build.0 = Debug|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|Win32.ActiveCfg = Release|Win32 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|Win32.ActiveCfg = Release|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|Win32.Build.0 = Release|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|x64.ActiveCfg = Release|x64 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|x64.ActiveCfg = Release|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Profile|x64.Build.0 = Release|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|Win32.ActiveCfg = Release|Win32 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|Win32.ActiveCfg = Release|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|Win32.Build.0 = Release|Win32
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|x64.ActiveCfg = Release|x64 {4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|x64.ActiveCfg = Release|x64
{4EC107AB-89E8-4A0B-8366-B3E81085AE07}.Release|x64.Build.0 = Release|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Debug|Win32.ActiveCfg = Debug|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Debug|Win32.Build.0 = Debug|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Debug|x64.ActiveCfg = Debug|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Debug|x64.Build.0 = Debug|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Profile|Win32.ActiveCfg = Release|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Profile|Win32.Build.0 = Release|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Profile|x64.ActiveCfg = Release|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Profile|x64.Build.0 = Release|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Release|Win32.ActiveCfg = Release|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Release|Win32.Build.0 = Release|Win32
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Release|x64.ActiveCfg = Release|x64
{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
src/Reactor/SubmoduleCheck/src/IceTypes.h 0 → 100644
// These are not the headers you're looking for
#error "Missing subzero submodule. Run git submodule update --init"
\ No newline at end of file
src/Reactor/Subzero.vcxproj.filters
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter> </Filter>
<Filter Include="Source Files\LLVM">
<UniqueIdentifier>{af578803-bb6c-4fb6-a852-956e276b0b41}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.cpp">
...@@ -102,118 +99,22 @@ ...@@ -102,118 +99,22 @@
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\APInt.cpp"> <ClCompile Include="SubzeroReactor.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Atomic.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\circular_raw_ostream.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\CommandLine.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\ConvertUTF.c">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\ConvertUTFWrapper.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Debug.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\ErrorHandling.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\FoldingSet.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Hashing.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Host.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\ManagedStatic.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\MemoryBuffer.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Mutex.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Path.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Process.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Program.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\raw_os_ostream.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\raw_ostream.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Signals.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\SmallPtrSet.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\SmallVector.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\StringExtras.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\StringMap.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\StringRef.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\StringSaver.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\TargetParser.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Threading.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Timer.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\TimeValue.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Triple.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)third_party\llvm-subzero\lib\Support\Twine.cpp">
<Filter>Source Files\LLVM</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\src\IceInstX8664.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\src\IceTargetLoweringX8664.cpp"> <ClCompile Include="Routine.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\src\IceInstX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\src\IceTargetLoweringX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SubzeroReactor.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Routine.cpp"> <ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
...@@ -388,17 +289,17 @@ ...@@ -388,17 +289,17 @@
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\SZTargets.def"> <None Include="$(SolutionDir)third_party\pnacl-subzero\src\SZTargets.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="..\..\third_party\pnacl-subzero\src\IceInstX8664.def"> <None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.def">
<Filter>Header Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="..\..\third_party\pnacl-subzero\src\IceTargetLoweringX8664.def"> <None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.def">
<Filter>Header Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="..\..\third_party\pnacl-subzero\src\IceInstX8632.def"> <None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.def">
<Filter>Header Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="..\..\third_party\pnacl-subzero\src\IceTargetLoweringX8632.def"> <None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.def">
<Filter>Header Files</Filter> <Filter>Source Files</Filter>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
src/Reactor/SubzeroTest.vcxproj
...@@ -152,6 +152,9 @@ ...@@ -152,6 +152,9 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="Subzero.vcxproj"> <ProjectReference Include="Subzero.vcxproj">
<Project>{0eb31aec-b020-46ab-ba05-730f6d01c29b}</Project> <Project>{0eb31aec-b020-46ab-ba05-730f6d01c29b}</Project>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
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