diff options
| author | Paul Thomson <paulthomson@google.com> | 2021-02-02 21:06:24 +0000 |
|---|---|---|
| committer | Paul Thomson <paulthomson@google.com> | 2021-02-04 20:24:48 +0000 |
| commit | 94989c24540a0a764428c7ba303d050cce2fdbe5 (patch) | |
| tree | 360251ccd65620f2c49615a0e53d2013a4577c71 /third_party | |
| parent | 059f11383ed1d44a872ce0c30308ab53f3f3c3e7 (diff) | |
| parent | 4d0115cccfcb3b73d20b6513b1c40748e6403c50 (diff) | |
| download | amber-94989c24540a0a764428c7ba303d050cce2fdbe5.tar.gz | |
Merge commit '4d0115cccfcb3b73d20b6513b1c40748e6403c50' into sc-dev
Conflicts:
Android.mk
samples/Android.mk
third_party/Android.mk
Bug: b/169021525
Change-Id: I9c24ae3e9d5cad75e2360325f1cdc1f77b0f7c35
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/CMakeLists.txt | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 356acb1..4319556 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -38,6 +38,8 @@ if (${AMBER_ENABLE_SHADERC}) set(SHADERC_THIRD_PARTY_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "") set(SHADERC_SKIP_TESTS ON CACHE BOOL ON) + set(SHADERC_ENABLE_WERROR_COMPILE OFF CACHE BOOL "disable werror") + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/shaderc) endif() @@ -65,14 +67,26 @@ if (${AMBER_USE_LOCAL_VULKAN}) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vulkan-validationlayers) endif() +if (${AMBER_ENABLE_VK_DEBUGGING}) + set(CPPDAP_JSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/json) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppdap) +endif() + if (${AMBER_ENABLE_SWIFTSHADER}) - set(BUILD_EGL FALSE CACHE BOOL FALSE) - set(BUILD_GLESv2 FALSE CACHE BOOL FALSE) - set(BUILD_GLES_CM FALSE CACHE BOOL FALSE) - set(BUILD_VULKAN TRUE CACHE BOOL TRUE) - set(BUILD_SAMPLES FALSE CACHE BOOL FALSE) - set(BUILD_TESTS FALSE CACHE BOOL FALSE) - set(WARNINGS_AS_ERRORS FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_EGL FALSE) + set(SWIFTSHADER_BUILD_GLESv2 FALSE) + set(SWIFTSHADER_BUILD_GLES_CM FALSE) + set(SWIFTSHADER_BUILD_VULKAN TRUE) + set(SWIFTSHADER_BUILD_SAMPLES FALSE) + set(SWIFTSHADER_BUILD_TESTS FALSE) + set(SWIFTSHADER_WARNINGS_AS_ERRORS FALSE) + set(SWIFTSHADER_LOGGING_LEVEL "Error") + + if (${AMBER_ENABLE_VK_DEBUGGING}) + set(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER TRUE) + set(SWIFTSHADER_BUILD_CPPDAP FALSE) # Already built above + endif (${AMBER_ENABLE_VK_DEBUGGING}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/swiftshader) endif() @@ -131,14 +145,21 @@ if (${AMBER_ENABLE_DXC}) endif() if (${AMBER_ENABLE_CLSPV}) - set(CLSPV_LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/llvm" CACHE STRING "") - set(CLSPV_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/clang" CACHE STRING "") + if (NOT DEFINED AMBER_CLSPV_DIR) + set(AMBER_CLSPV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv") + endif() + if (NOT DEFINED AMBER_CLSPV_LLVM_DIR) + set(AMBER_CLSPV_LLVM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm") + endif() + + set(CLSPV_LLVM_SOURCE_DIR "${AMBER_CLSPV_LLVM_DIR}/llvm" CACHE STRING "") + set(CLSPV_CLANG_SOURCE_DIR "${AMBER_CLSPV_LLVM_DIR}/clang" CACHE STRING "") set(SPIRV_HEADERS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers" CACHE STRING "") set(SPIRV_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools" CACHE STRING "") set(LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL 0 FORCE) set(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN ON CACHE STRING "") - set(LLVM_BUILD_STATIC ON CACHE BOOL "") + set(LLVM_BUILD_STATIC OFF CACHE BOOL "") set(LLVM_INCLUDE_BENCHMARKS OFF CACHE BOOL "") set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") @@ -146,5 +167,5 @@ if (${AMBER_ENABLE_CLSPV}) set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "") set(LLVM_INCLUDE_UTILS OFF CACHE BOOL "") - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/clspv) + add_subdirectory(${AMBER_CLSPV_DIR} ${CMAKE_CURRENT_BINARY_DIR}/clspv) endif() |