Remove the Subzero submodule.

Bug swiftshader:47
Bug b/37478805

Change-Id: I7519eb7c743530a7bf6a4253244011c29d7ed7c5
Reviewed-on: https://swiftshader-review.googlesource.com/9609
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

diff --git a/.gitmodules b/.gitmodules
index 4ec5099..5a4e85a 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "third_party/pnacl-subzero"]
-       path = third_party/pnacl-subzero
-       url = https://chromium.googlesource.com/native_client/pnacl-subzero
 [submodule "third_party/googletest"]
        path = third_party/googletest
        url = https://github.com/google/googletest.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a85933..d67476e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -648,7 +648,6 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
         ${SUBZERO_DIR}/
         ${SUBZERO_LLVM_DIR}/include/
         ${SUBZERO_DIR}/pnacl-llvm/include/
-        ${SOURCE_DIR}/Reactor/SubmoduleCheck/
      )
 
     if(WIN32)

diff --git a/src/Reactor/SubmoduleCheck/src/IceTypes.h b/src/Reactor/SubmoduleCheck/src/IceTypes.h
deleted file mode 100644 (file)
index 0644afe..0000000
--- a/src/Reactor/SubmoduleCheck/src/IceTypes.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// These are not the headers you're looking for\r
-#error "Missing subzero submodule. Run git submodule update --init"
\ No newline at end of file

diff --git a/src/Reactor/Subzero.vcxproj b/src/Reactor/Subzero.vcxproj
index cace50f..34e87f6 100644 (file)
--- a/src/Reactor/Subzero.vcxproj
+++ b/src/Reactor/Subzero.vcxproj
@@ -87,7 +87,7 @@
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include</AdditionalIncludeDirectories>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -105,7 +105,7 @@
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include</AdditionalIncludeDirectories>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -125,7 +125,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include</AdditionalIncludeDirectories>\r
       <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -147,7 +147,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include</AdditionalIncludeDirectories>\r
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>\r

diff --git a/third_party/pnacl-subzero b/third_party/pnacl-subzero
deleted file mode 160000 (submodule)
index fb705a6..0000000
--- a/third_party/pnacl-subzero
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fb705a6d55003b2c32772ae49e25b0babcff5acc