Skip to content

S
swiftshader
Commit f6d3cbb2 by Sean Risser
Options

Add the PowerVR SDK as a git submodule

The primary purpose of doing this is to have all the PowerVR SDK examples in one place and remain up-to-date. This change also lets us simplify a bit of our CMakeLists.txt as we only need to use add_subdirectory to build everything we need. The PowerVR SDK examples are built by explicitly enabling SWIFTSHADER_BUILD_PVR_EXAMPLES (either through a cmake gui, or -DSWIFTSHADER_BUILD_PVR_EXAMPLES=ON on the command line). You must also specify a window system for the examples to use with something like "-DPVR_WINDOW_SYSTEM=X11". Several cmake option flags were renamed to start with "SWIFTSHADER_" to avoid name collisions with subdirectories. Bug: b/141361933 Change-Id: I6d2fac579f62ff4bc211d5fd5127fb670eb9b4bf Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39909Tested-by: 's avatarSean Risser <srisser@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 110236f3
Showing with 73 additions and 55 deletions
.gitmodules
...@@ -13,3 +13,7 @@ ...@@ -13,3 +13,7 @@
[submodule "third_party/libbacktrace/src"] [submodule "third_party/libbacktrace/src"]
path = third_party/libbacktrace/src path = third_party/libbacktrace/src
url = https://github.com/ianlancetaylor/libbacktrace.git url = https://github.com/ianlancetaylor/libbacktrace.git
[submodule "third_party/PowerVR_Examples"]
path = third_party/PowerVR_Examples
url = https://github.com/powervr-graphics/Native_SDK.git
.vscode/tasks.json
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
"..", "..",
"-GNinja", "-GNinja",
"-DCMAKE_BUILD_TYPE=${input:buildType}", "-DCMAKE_BUILD_TYPE=${input:buildType}",
"-DWARNINGS_AS_ERRORS=1", "-DSWIFTSHADER_WARNINGS_AS_ERRORS=1",
"-DDCHECK_ALWAYS_ON=1", "-DSWIFTSHADER_DCHECK_ALWAYS_ON=1",
"-DREACTOR_VERIFY_LLVM_IR=1", "-DREACTOR_VERIFY_LLVM_IR=1",
], ],
"options": { "options": {
...@@ -106,4 +106,4 @@ ...@@ -106,4 +106,4 @@
"description": "The type of build", "description": "The type of build",
}, },
] ]
} }
\ No newline at end of file
CMakeLists.txt
...@@ -88,31 +88,32 @@ if(NOT CMAKE_BUILD_TYPE) ...@@ -88,31 +88,32 @@ if(NOT CMAKE_BUILD_TYPE)
endif() endif()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo)
option(BUILD_EGL "Build the EGL library" 1) option(SWIFTSHADER_BUILD_EGL "Build the EGL library" 1)
option(BUILD_GLESv2 "Build the OpenGL ES 2 library" 1) option(SWIFTSHADER_BUILD_GLESv2 "Build the OpenGL ES 2 library" 1)
option(BUILD_GLES_CM "Build the OpenGL ES 1.1 library" 1) option(SWIFTSHADER_BUILD_GLES_CM "Build the OpenGL ES 1.1 library" 1)
option(BUILD_VULKAN "Build the Vulkan library" 1) option(SWIFTSHADER_BUILD_VULKAN "Build the Vulkan library" 1)
option(SWIFTSHADER_BUILD_PVR "Fetch and build the PowerVR examples" 0)
option(USE_GROUP_SOURCES "Group the source files in a folder tree for Visual Studio" 1)
option(SWIFTSHADER_USE_GROUP_SOURCES "Group the source files in a folder tree for Visual Studio" 1)
option(BUILD_SAMPLES "Build sample programs" 1)
option(BUILD_TESTS "Build test programs" 1) option(SWIFTSHADER_BUILD_SAMPLES "Build sample programs" 1)
option(SWIFTSHADER_BUILD_TESTS "Build test programs" 1)
option(MSAN "Build with memory sanitizer" 0)
option(ASAN "Build with address sanitizer" 0) option(SWIFTSHADER_MSAN "Build with memory sanitizer" 0)
option(TSAN "Build with thread sanitizer" 0) option(SWIFTSHADER_ASAN "Build with address sanitizer" 0)
option(UBSAN "Build with undefined behavior sanitizer" 0) option(SWIFTSHADER_TSAN "Build with thread sanitizer" 0)
option(WARNINGS_AS_ERRORS "Treat all warnings as errors" 1) option(SWIFTSHADER_UBSAN "Build with undefined behavior sanitizer" 0)
option(DCHECK_ALWAYS_ON "Check validation macros even in release builds" 0) option(SWIFTSHADER_WARNINGS_AS_ERRORS "Treat all warnings as errors" 1)
option(SWIFTSHADER_DCHECK_ALWAYS_ON "Check validation macros even in release builds" 0)
option(REACTOR_EMIT_DEBUG_INFO "Emit debug info for JIT functions" 0) option(REACTOR_EMIT_DEBUG_INFO "Emit debug info for JIT functions" 0)
option(REACTOR_EMIT_PRINT_LOCATION "Emit printing of location info for JIT functions" 0) option(REACTOR_EMIT_PRINT_LOCATION "Emit printing of location info for JIT functions" 0)
option(REACTOR_VERIFY_LLVM_IR "Check reactor-generated LLVM IR is valid even in release builds" 0) option(REACTOR_VERIFY_LLVM_IR "Check reactor-generated LLVM IR is valid even in release builds" 0)
option(LESS_DEBUG_INFO "Generate less debug info to reduce file size" 0) option(SWIFTSHADER_LESS_DEBUG_INFO "Generate less debug info to reduce file size" 0)
option(ENABLE_VULKAN_DEBUGGER "Enable vulkan debugger support" 0) option(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER "Enable vulkan debugger support" 0)
set(BUILD_MARL ${BUILD_VULKAN}) set(BUILD_MARL ${SWIFTSHADER_BUILD_VULKAN})
if(${BUILD_VULKAN} AND ${ENABLE_VULKAN_DEBUGGER}) if(${SWIFTSHADER_BUILD_VULKAN} AND ${SWIFTSHADER_ENABLE_VULKAN_DEBUGGER})
set(BUILD_CPPDAP 1) set(BUILD_CPPDAP 1)
else() else()
set(BUILD_CPPDAP 0) set(BUILD_CPPDAP 0)
...@@ -154,7 +155,7 @@ if (NOT TARGET gtest) ...@@ -154,7 +155,7 @@ if (NOT TARGET gtest)
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init) execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest)
endif() endif()
endif() endif()
...@@ -165,7 +166,7 @@ if (NOT TARGET libbacktrace) ...@@ -165,7 +166,7 @@ if (NOT TARGET libbacktrace)
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init) execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libbacktrace)
endif() endif()
endif() endif()
...@@ -211,6 +212,19 @@ function(DownloadBoost) ...@@ -211,6 +212,19 @@ function(DownloadBoost)
endif() endif()
endfunction() endfunction()
if (SWIFTSHADER_BUILD_PVR)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples/.git)
message(WARNING "
third_party/PowerVR_Examples submodule missing.
Running 'git submodule update --init' to download it:
")
execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples)
endif()
set(PVR_BUILD_EXAMPLES ON CACHE BOOL "Build the PowerVR SDK Examples" FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples)
endif()
########################################################### ###########################################################
# Convenience macros # Convenience macros
########################################################### ###########################################################
...@@ -241,7 +255,7 @@ macro(set_shared_library_export_map TARGET DIR) ...@@ -241,7 +255,7 @@ macro(set_shared_library_export_map TARGET DIR)
set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-exported_symbols_list ${DIR}/${TARGET}.exports") set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-exported_symbols_list ${DIR}/${TARGET}.exports")
set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_DEPENDS "${DIR}/${TARGET}.exports;") set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_DEPENDS "${DIR}/${TARGET}.exports;")
# Don't allow undefined symbols, unless it's a Sanitizer build. # Don't allow undefined symbols, unless it's a Sanitizer build.
if(NOT MSAN AND NOT ASAN AND NOT TSAN AND NOT UBSAN) if(NOT SWIFTSHADER_MSAN AND NOT SWIFTSHADER_ASAN AND NOT SWIFTSHADER_TSAN AND NOT SWIFTSHADER_UBSAN)
set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-undefined,error") set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-undefined,error")
endif() endif()
elseif(LINUX) elseif(LINUX)
...@@ -267,13 +281,13 @@ macro(set_shared_library_export_map TARGET DIR) ...@@ -267,13 +281,13 @@ macro(set_shared_library_export_map TARGET DIR)
set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--gc-sections") set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--gc-sections")
# Don't allow undefined symbols, unless it's a Sanitizer build. # Don't allow undefined symbols, unless it's a Sanitizer build.
if(NOT MSAN AND NOT ASAN AND NOT TSAN AND NOT UBSAN) if(NOT SWIFTSHADER_MSAN AND NOT SWIFTSHADER_ASAN AND NOT SWIFTSHADER_TSAN AND NOT SWIFTSHADER_UBSAN)
set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--no-undefined") set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--no-undefined")
endif() endif()
endif() endif()
endmacro() endmacro()
if(USE_GROUP_SOURCES) if(SWIFTSHADER_USE_GROUP_SOURCES)
group_all_sources(src) group_all_sources(src)
endif() endif()
...@@ -330,7 +344,7 @@ if(MSVC) ...@@ -330,7 +344,7 @@ if(MSVC)
add_definitions(-D_SBCS) # Single Byte Character Set (ASCII) add_definitions(-D_SBCS) # Single Byte Character Set (ASCII)
add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) # Disable MSVC warnings about std::aligned_storage being broken before VS 2017 15.8 add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) # Disable MSVC warnings about std::aligned_storage being broken before VS 2017 15.8
if(WARNINGS_AS_ERRORS) if(SWIFTSHADER_WARNINGS_AS_ERRORS)
set_cpp_flag("/WX") # Treat all warnings as errors set_cpp_flag("/WX") # Treat all warnings as errors
endif() endif()
...@@ -418,7 +432,7 @@ else() ...@@ -418,7 +432,7 @@ else()
set_cpp_flag("-fPIC") set_cpp_flag("-fPIC")
endif() endif()
if(LESS_DEBUG_INFO) if(SWIFTSHADER_LESS_DEBUG_INFO)
# Use -g1 to be able to get stack traces # Use -g1 to be able to get stack traces
set_cpp_flag("-g -g1" DEBUG) set_cpp_flag("-g -g1" DEBUG)
set_cpp_flag("-g -g1" RELWITHDEBINFO) set_cpp_flag("-g -g1" RELWITHDEBINFO)
...@@ -433,11 +447,11 @@ else() ...@@ -433,11 +447,11 @@ else()
set_cpp_flag("-s" RELEASE) set_cpp_flag("-s" RELEASE)
endif() endif()
if(WARNINGS_AS_ERRORS) if(SWIFTSHADER_WARNINGS_AS_ERRORS)
set_cpp_flag("-Werror") # Treat all warnings as errors set_cpp_flag("-Werror") # Treat all warnings as errors
endif() endif()
if(DCHECK_ALWAYS_ON) if(SWIFTSHADER_DCHECK_ALWAYS_ON)
list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DDCHECK_ALWAYS_ON") list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DDCHECK_ALWAYS_ON")
endif() endif()
...@@ -473,16 +487,16 @@ else() ...@@ -473,16 +487,16 @@ else()
set_cpp_flag("-fdata-sections" RELEASE) set_cpp_flag("-fdata-sections" RELEASE)
set_cpp_flag("-fomit-frame-pointer" RELEASE) set_cpp_flag("-fomit-frame-pointer" RELEASE)
if(MSAN) if(SWIFTSHADER_MSAN)
set_cpp_flag("-fsanitize=memory") set_cpp_flag("-fsanitize=memory")
set_linker_flag("-fsanitize=memory") set_linker_flag("-fsanitize=memory")
elseif(ASAN) elseif(SWIFTSHADER_ASAN)
set_cpp_flag("-fsanitize=address") set_cpp_flag("-fsanitize=address")
set_linker_flag("-fsanitize=address") set_linker_flag("-fsanitize=address")
elseif(TSAN) elseif(SWIFTSHADER_TSAN)
set_cpp_flag("-fsanitize=thread") set_cpp_flag("-fsanitize=thread")
set_linker_flag("-fsanitize=thread") set_linker_flag("-fsanitize=thread")
elseif(UBSAN) elseif(SWIFTSHADER_UBSAN)
set_cpp_flag("-fsanitize=undefined") set_cpp_flag("-fsanitize=undefined")
set_linker_flag("-fsanitize=undefined") set_linker_flag("-fsanitize=undefined")
endif() endif()
...@@ -1798,7 +1812,7 @@ file(GLOB VULKAN_LIST ...@@ -1798,7 +1812,7 @@ file(GLOB VULKAN_LIST
${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan/*.h} ${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan/*.h}
) )
if(ENABLE_VULKAN_DEBUGGER) if(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
file(GLOB_RECURSE VULKAN_DEBUG_LIST file(GLOB_RECURSE VULKAN_DEBUG_LIST
${VULKAN_DIR}/Debug/*.cpp ${VULKAN_DIR}/Debug/*.cpp
${VULKAN_DIR}/Debug/*.h ${VULKAN_DIR}/Debug/*.h
...@@ -1806,7 +1820,7 @@ if(ENABLE_VULKAN_DEBUGGER) ...@@ -1806,7 +1820,7 @@ if(ENABLE_VULKAN_DEBUGGER)
) )
list(APPEND VULKAN_LIST ${VULKAN_DEBUG_LIST}) list(APPEND VULKAN_LIST ${VULKAN_DEBUG_LIST})
list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DENABLE_VK_DEBUGGER") list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DENABLE_VK_DEBUGGER")
endif(ENABLE_VULKAN_DEBUGGER) endif(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
if(LINUX OR ANDROID) if(LINUX OR ANDROID)
list(APPEND VULKAN_LIST list(APPEND VULKAN_LIST
...@@ -1984,7 +1998,7 @@ else() ...@@ -1984,7 +1998,7 @@ else()
set(LIB_PREFIX "lib") set(LIB_PREFIX "lib")
endif() endif()
if(BUILD_EGL) if(SWIFTSHADER_BUILD_EGL)
add_library(libEGL SHARED ${EGL_LIST}) add_library(libEGL SHARED ${EGL_LIST})
set_target_properties(libEGL PROPERTIES set_target_properties(libEGL PROPERTIES
INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}" INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
...@@ -2013,7 +2027,7 @@ if(BUILD_EGL) ...@@ -2013,7 +2027,7 @@ if(BUILD_EGL)
) )
endif() endif()
if(BUILD_GLESv2) if(SWIFTSHADER_BUILD_GLESv2)
add_library(libGLESv2 SHARED ${GLES2_LIST}) add_library(libGLESv2 SHARED ${GLES2_LIST})
set_target_properties(libGLESv2 PROPERTIES set_target_properties(libGLESv2 PROPERTIES
INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}" INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
...@@ -2037,7 +2051,7 @@ if(BUILD_GLESv2) ...@@ -2037,7 +2051,7 @@ if(BUILD_GLESv2)
) )
endif() endif()
if(BUILD_GLES_CM) if(SWIFTSHADER_BUILD_GLES_CM)
add_library(libGLES_CM SHARED ${GLES_CM_LIST}) add_library(libGLES_CM SHARED ${GLES_CM_LIST})
set_target_properties(libGLES_CM PROPERTIES set_target_properties(libGLES_CM PROPERTIES
INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}" INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
...@@ -2069,7 +2083,7 @@ if(BUILD_CPPDAP) ...@@ -2069,7 +2083,7 @@ if(BUILD_CPPDAP)
add_subdirectory(${CPPDAP_DIR}) add_subdirectory(${CPPDAP_DIR})
endif(BUILD_CPPDAP) endif(BUILD_CPPDAP)
if(BUILD_VULKAN) if(SWIFTSHADER_BUILD_VULKAN)
if (NOT TARGET SPIRV-Tools) if (NOT TARGET SPIRV-Tools)
# This variable is also used by SPIRV-Tools to locate SPIRV-Headers # This variable is also used by SPIRV-Tools to locate SPIRV-Headers
set(SPIRV-Headers_SOURCE_DIR "${THIRD_PARTY_DIR}/SPIRV-Headers") set(SPIRV-Headers_SOURCE_DIR "${THIRD_PARTY_DIR}/SPIRV-Headers")
...@@ -2107,9 +2121,9 @@ if(BUILD_VULKAN) ...@@ -2107,9 +2121,9 @@ if(BUILD_VULKAN)
set_shared_library_export_map(vk_swiftshader ${SOURCE_DIR}/Vulkan) set_shared_library_export_map(vk_swiftshader ${SOURCE_DIR}/Vulkan)
set(VK_SWIFTSHADER_LIBS ${Reactor} marl ${OS_LIBS} SPIRV-Tools SPIRV-Tools-opt) set(VK_SWIFTSHADER_LIBS ${Reactor} marl ${OS_LIBS} SPIRV-Tools SPIRV-Tools-opt)
if(ENABLE_VULKAN_DEBUGGER) if(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
list(APPEND VK_SWIFTSHADER_LIBS cppdap) list(APPEND VK_SWIFTSHADER_LIBS cppdap)
endif(ENABLE_VULKAN_DEBUGGER) endif(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
target_link_libraries(vk_swiftshader ${VK_SWIFTSHADER_LIBS}) target_link_libraries(vk_swiftshader ${VK_SWIFTSHADER_LIBS})
add_custom_command( add_custom_command(
...@@ -2140,7 +2154,7 @@ endif() ...@@ -2140,7 +2154,7 @@ endif()
# Sample programs # Sample programs
########################################################### ###########################################################
if(BUILD_SAMPLES) if(SWIFTSHADER_BUILD_SAMPLES)
if(WIN32) if(WIN32)
add_executable(OGLES2HelloAPI ${HELLO2_DIR}/OGLES2HelloAPI_Windows.cpp) add_executable(OGLES2HelloAPI ${HELLO2_DIR}/OGLES2HelloAPI_Windows.cpp)
set_target_properties(OGLES2HelloAPI PROPERTIES set_target_properties(OGLES2HelloAPI PROPERTIES
...@@ -2178,7 +2192,8 @@ if(BUILD_SAMPLES) ...@@ -2178,7 +2192,8 @@ if(BUILD_SAMPLES)
endif() endif()
endif() endif()
if(BUILD_TESTS)
if(SWIFTSHADER_BUILD_TESTS)
set(REACTOR_UNIT_TESTS_LIST set(REACTOR_UNIT_TESTS_LIST
${SOURCE_DIR}/Reactor/ReactorUnitTests.cpp ${SOURCE_DIR}/Reactor/ReactorUnitTests.cpp
${THIRD_PARTY_DIR}/googletest/googletest/src/gtest-all.cc ${THIRD_PARTY_DIR}/googletest/googletest/src/gtest-all.cc
...@@ -2203,7 +2218,7 @@ if(BUILD_TESTS) ...@@ -2203,7 +2218,7 @@ if(BUILD_TESTS)
endif() endif()
endif() endif()
if(BUILD_TESTS) if(SWIFTSHADER_BUILD_TESTS)
set(GLES_UNITTESTS_LIST set(GLES_UNITTESTS_LIST
${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/unittests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/unittests.cpp
...@@ -2229,9 +2244,9 @@ if(BUILD_TESTS) ...@@ -2229,9 +2244,9 @@ if(BUILD_TESTS)
if(ANDROID) if(ANDROID)
target_link_libraries(gles-unittests -landroid) target_link_libraries(gles-unittests -landroid)
endif() endif()
endif(BUILD_TESTS) endif(SWIFTSHADER_BUILD_TESTS)
if(BUILD_TESTS) if(SWIFTSHADER_BUILD_TESTS)
# Math unit tests # Math unit tests
set(MATH_UNITTESTS_LIST set(MATH_UNITTESTS_LIST
${CMAKE_CURRENT_SOURCE_DIR}/tests/MathUnitTests/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/MathUnitTests/main.cpp
...@@ -2258,7 +2273,7 @@ if(BUILD_TESTS) ...@@ -2258,7 +2273,7 @@ if(BUILD_TESTS)
endif() endif()
endif() endif()
if(BUILD_TESTS AND BUILD_VULKAN) if(SWIFTSHADER_BUILD_TESTS AND SWIFTSHADER_BUILD_VULKAN)
set(VK_UNITTESTS_LIST set(VK_UNITTESTS_LIST
${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Driver.cpp
...@@ -2286,4 +2301,4 @@ if(BUILD_TESTS AND BUILD_VULKAN) ...@@ -2286,4 +2301,4 @@ if(BUILD_TESTS AND BUILD_VULKAN)
) )
target_link_libraries(vk-unittests ${OS_LIBS} SPIRV-Tools) target_link_libraries(vk-unittests ${OS_LIBS} SPIRV-Tools)
endif(BUILD_TESTS AND BUILD_VULKAN) endif(SWIFTSHADER_BUILD_TESTS AND SWIFTSHADER_BUILD_VULKAN)
tests/kokoro/macos/continuous.sh
...@@ -22,7 +22,7 @@ if [[ "${BUILD_TYPE}" == "Debug" ]]; then ...@@ -22,7 +22,7 @@ if [[ "${BUILD_TYPE}" == "Debug" ]]; then
ASAN="OFF" ASAN="OFF"
fi fi
cmake .. "-DASAN=${ASAN}" "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1" cmake .. "-DSWIFTSHADER_ASAN=${ASAN}" "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1"
make -j$(sysctl -n hw.logicalcpu) make -j$(sysctl -n hw.logicalcpu)
# Run unit tests # Run unit tests
...@@ -31,4 +31,4 @@ cd .. # Some tests must be run from project root ...@@ -31,4 +31,4 @@ cd .. # Some tests must be run from project root
build/ReactorUnitTests build/ReactorUnitTests
build/gles-unittests build/gles-unittests
build/vk-unittests build/vk-unittests
\ No newline at end of file
PowerVR_Examples @ c1605c99
Subproject commit c1605c99281797e5cd4c8439e1bc679706bbb311
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