AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

manually roll swiftshader

Browse Source 
some of the cmake flags changed names

c.f. https://swiftshader.googlesource.com/SwiftShader.git/+/f6d3cbb2830306f3ef51a72cd3f798684d107c14

Change-Id: I6f5f7d06c88035c097d7079ef93665110d15be70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264291
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2020-01-14 06:43:21 -06:00 committed by Skia Commit-Bot
parent 7ef10b66ec
commit 0a0ae9ed2a
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -31,7 +31,7 @@ deps = {
"third_party/externals/spirv-cross" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@53ab2144b90abede33be5161aec5dfc94ddc3caf",
"third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@29c11140baaf9f7fdaa39a583672c556bf1795a1",
"third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@0c4feb643b89d1792b02f7cbef315e9d95633bd7",
"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@110236f3ce70c292658b1b7372903dc55f43ad35",
"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@f6d3cbb2830306f3ef51a72cd3f798684d107c14",
#"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs.git@4080840928c0b05a80cda0d14ac2e2615f679f1a",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@47af7c547f8551bd25424e56354a2ae1e9062859",

7
infra/bots/recipe_modules/build/default.py
View File

@ -39,7 +39,10 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
cc, cxx: compiler binaries to use
out: target directory for libEGL.so and libGLESv2.so
"""
swiftshader_opts = ['-DBUILD_TESTS=OFF', '-DWARNINGS_AS_ERRORS=0']
swiftshader_opts = [
'-DSWIFTSHADER_BUILD_TESTS=OFF',
'-DSWIFTSHADER_WARNINGS_AS_ERRORS=0',
]
cmake_bin = str(api.vars.slave_dir.join('cmake_linux', 'bin'))
env = {
'CC': cc,
@ -60,7 +63,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
'-I%s/include/c++/v1' % libcxx_msan,
])
swiftshader_opts.extend([
'-DMSAN=ON',
'-DSWIFTSHADER_MSAN=ON',
'-DCMAKE_C_FLAGS=%s' % msan_cflags,
'-DCMAKE_CXX_FLAGS=%s' % msan_cflags,
])

6
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN.json
View File

@ -35,9 +35,9 @@
{
"cmd": [
"cmake",
"-DBUILD_TESTS=OFF",
"-DWARNINGS_AS_ERRORS=0",
"-DMSAN=ON",
"-DSWIFTSHADER_BUILD_TESTS=OFF",
"-DSWIFTSHADER_WARNINGS_AS_ERRORS=0",
"-DSWIFTSHADER_MSAN=ON",
"-DCMAKE_C_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1",
"-DCMAKE_CXX_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1",
"[START_DIR]/cache/work/skia/third_party/externals/swiftshader",

4
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
View File

@ -35,8 +35,8 @@
{
"cmd": [
"cmake",
"-DBUILD_TESTS=OFF",
"-DWARNINGS_AS_ERRORS=0",
"-DSWIFTSHADER_BUILD_TESTS=OFF",
"-DSWIFTSHADER_WARNINGS_AS_ERRORS=0",
"[START_DIR]/cache/work/skia/third_party/externals/swiftshader",
"-GNinja"
],