Skip to content

S
swiftshader
Commit 5aebe18a by Nicolas Capens
Options

Build Subzero from the subtree directory.

The submodule is at /third-party/pnacl-subzero The subtree is at /third-party/subzero Bug swiftshader:47 Bug b/37478805 Change-Id: I2da86151f111448e962b6b24c085a2f288de18b4 Reviewed-on: https://swiftshader-review.googlesource.com/9608Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarCorentin Wallez <cwallez@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent f110e4d2
Showing with 19 additions and 19 deletions
CMakeLists.txt
...@@ -114,7 +114,7 @@ set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/src) ...@@ -114,7 +114,7 @@ set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
set(OPENGL_DIR ${SOURCE_DIR}/OpenGL) set(OPENGL_DIR ${SOURCE_DIR}/OpenGL)
set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler) set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler)
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/LLVM) set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/LLVM)
set(SUBZERO_DIR ${CMAKE_SOURCE_DIR}/third_party/pnacl-subzero) set(SUBZERO_DIR ${CMAKE_SOURCE_DIR}/third_party/subzero)
set(SUBZERO_LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/llvm-subzero) set(SUBZERO_LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/llvm-subzero)
set(TESTS_DIR ${CMAKE_SOURCE_DIR}/tests) set(TESTS_DIR ${CMAKE_SOURCE_DIR}/tests)
set(HELLO2_DIR ${CMAKE_SOURCE_DIR}/third_party/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2) set(HELLO2_DIR ${CMAKE_SOURCE_DIR}/third_party/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2)
......
src/Android.mk
...@@ -17,10 +17,10 @@ COMMON_C_INCLUDES += \ ...@@ -17,10 +17,10 @@ COMMON_C_INCLUDES += \
ifdef use_subzero ifdef use_subzero
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/pnacl-subzero/ \ $(LOCAL_PATH)/../third_party/subzero/ \
$(LOCAL_PATH)/../third_party/llvm-subzero/include/ \ $(LOCAL_PATH)/../third_party/llvm-subzero/include/ \
$(LOCAL_PATH)/../third_party/llvm-subzero/build/Android/include/ \ $(LOCAL_PATH)/../third_party/llvm-subzero/build/Android/include/ \
$(LOCAL_PATH)/../third_party/pnacl-subzero/pnacl-llvm/include/ $(LOCAL_PATH)/../third_party/subzero/pnacl-llvm/include/
else else
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/LLVM/include $(LOCAL_PATH)/../third_party/LLVM/include
......
src/Reactor/Android.mk
...@@ -22,7 +22,7 @@ LOCAL_CLANG := true ...@@ -22,7 +22,7 @@ LOCAL_CLANG := true
LOCAL_MODULE := libsubzero LOCAL_MODULE := libsubzero
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
SUBZERO_PATH := ../../third_party/pnacl-subzero SUBZERO_PATH := ../../third_party/subzero
LLVMDEPENDENCIES_PATH := ../../third_party/llvm-subzero LLVMDEPENDENCIES_PATH := ../../third_party/llvm-subzero
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
......
src/Reactor/BUILD.gn
...@@ -48,8 +48,8 @@ config("swiftshader_subzero_common_private_config") { ...@@ -48,8 +48,8 @@ config("swiftshader_subzero_common_private_config") {
} }
include_dirs = [ include_dirs = [
"../../third_party/pnacl-subzero", "../../third_party/subzero",
"../../third_party/pnacl-subzero/pnacl-llvm/include/", "../../third_party/subzero/pnacl-llvm/include/",
"../../third_party/llvm-subzero/include/", "../../third_party/llvm-subzero/include/",
] ]
...@@ -155,7 +155,7 @@ config("swiftshader_reactor_private_config") { ...@@ -155,7 +155,7 @@ config("swiftshader_reactor_private_config") {
if (use_swiftshader_with_subzero) { if (use_swiftshader_with_subzero) {
source_set("swiftshader_subzero") { source_set("swiftshader_subzero") {
subzero_dir = "../../third_party/pnacl-subzero" subzero_dir = "../../third_party/subzero"
subzero_llvm_dir = "../../third_party/llvm-subzero" subzero_llvm_dir = "../../third_party/llvm-subzero"
sources = [ sources = [
......
src/Reactor/SubzeroTest.vcxproj.filters
...@@ -21,42 +21,42 @@ ...@@ -21,42 +21,42 @@
<ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc"> <ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\XmmArith.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\XmmArith.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\DataMov.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\DataMov.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\ControlFlow.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\ControlFlow.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\LowLevel.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\Other.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\LowLevel.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\Other.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8632\TestUtil.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8664\TestUtil.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</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