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
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