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

GN: add sksl

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2296803002

Review-Url: https://codereview.chromium.org/2296803002
This commit is contained in:
mtklein 2016-08-30 10:37:19 -07:00 committed by Commit bot
parent 752f6ea78e
commit 9e0d9ddc0e
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BUILD.gn
View File

@ -68,6 +68,7 @@ config("skia_private") {
"src/pdf",
"src/ports",
"src/sfnt",
"src/sksl",
"src/utils",
"src/utils/win",
"third_party/etc1",
@ -134,6 +135,15 @@ pdf_gypi = exec_script("gn/gypi_to_gn.py",
"scope",
[ "gyp/pdf.gypi" ])
sksl_gypi = exec_script("gn/gypi_to_gn.py",
[
rebase_path("gyp/sksl.gypi"),
"--replace=<(skia_include_path)=include",
"--replace=<(skia_src_path)=src",
],
"scope",
[ "gyp/sksl.gypi" ])
utils_gypi = exec_script("gn/gypi_to_gn.py",
[
rebase_path("gyp/utils.gypi"),
@ -410,6 +420,7 @@ component("skia") {
sources += core_gypi.sources
sources += effects_gypi.sources
sources += gpu_gypi.skgpu_sources
sources += sksl_gypi.sources
sources += utils_gypi.sources
sources += [
"src/android/SkBitmapRegionCodec.cpp",
@ -688,8 +699,6 @@ if (skia_enable_tools) {
public_include_dirs = [ "tests" ]
sources = tests_sources - [
rebase_path("tests/PathOpsSkpClipTest.cpp"), # alternate main
rebase_path("tests/SkSLErrorTest.cpp"), # TODO: make work
rebase_path("tests/SkSLGLSLTest.cpp"), # TODO: make work
rebase_path("tests/SkpSkGrTest.cpp"), # doesn't compile
rebase_path("tests/skia_test.cpp"), # alternate main
]

25
gyp/sksl.gypi
View File

@ -4,20 +4,19 @@
# found in the LICENSE file.
{
'include_dirs': [
'../include',
'../include/config',
'../include/core',
'../include/private',
'../src/sksl',
'<(skia_include_path)/config',
'<(skia_include_path)/core',
'<(skia_include_path)/private',
'<(skia_src_path)/sksl',
],
'sources': [
'../src/sksl/SkSLCompiler.cpp',
'../src/sksl/SkSLIRGenerator.cpp',
'../src/sksl/SkSLParser.cpp',
'../src/sksl/SkSLGLSLCodeGenerator.cpp',
'../src/sksl/SkSLSPIRVCodeGenerator.cpp',
'../src/sksl/SkSLUtil.cpp',
'../src/sksl/ir/SkSLSymbolTable.cpp',
'../src/sksl/ir/SkSLType.cpp',
'<(skia_src_path)/sksl/SkSLCompiler.cpp',
'<(skia_src_path)/sksl/SkSLIRGenerator.cpp',
'<(skia_src_path)/sksl/SkSLParser.cpp',
'<(skia_src_path)/sksl/SkSLGLSLCodeGenerator.cpp',
'<(skia_src_path)/sksl/SkSLSPIRVCodeGenerator.cpp',
'<(skia_src_path)/sksl/SkSLUtil.cpp',
'<(skia_src_path)/sksl/ir/SkSLSymbolTable.cpp',
'<(skia_src_path)/sksl/ir/SkSLType.cpp',
],
}