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

Move SkSLMain into tools/skslc/Main.cpp.

Browse Source 
Change-Id: Id8d943b3eb752bad7f45c852c832c1f1fa0bdaca
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527776
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2022-04-05 15:38:49 -04:00 committed by SkCQ
parent dc28d75792
commit fb485f1229
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -638,7 +638,7 @@ if (skia_compile_sksl_tests) {
"SK_ENABLE_SPIRV_VALIDATION", "SK_ENABLE_SPIRV_VALIDATION",
] ]
sources = skslc_deps sources = skslc_deps
sources += [ "src/sksl/SkSLMain.cpp" ] sources += [ "tools/skslc/Main.cpp" ]
libs = [] libs = []
if (is_win) { if (is_win) {
sources += [ "src/ports/SkOSFile_win.cpp" ] sources += [ "src/ports/SkOSFile_win.cpp" ]

2
public.bzl
View File

@ -247,7 +247,7 @@ BASE_SRCS_ALL = struct(
"src/gpu/dawn/*", "src/gpu/dawn/*",
# Defines main. # Defines main.
"src/sksl/SkSLMain.cpp", "tools/skslc/Main.cpp",
# Only used to regenerate the lexer # Only used to regenerate the lexer
"src/sksl/lex/*", "src/sksl/lex/*",

27
src/sksl/BUILD.bazel
View File

@ -574,33 +574,6 @@ generated_cc_atom(
deps = [":SkSLLexer_hdr"], deps = [":SkSLLexer_hdr"],
) )
generated_cc_atom(
name = "SkSLMain_src",
srcs = ["SkSLMain.cpp"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLCompiler_hdr",
":SkSLDehydrator_hdr",
":SkSLFileOutputStream_hdr",
":SkSLStringStream_hdr",
":SkSLUtil_hdr",
"//include/core:SkGraphics_hdr",
"//include/core:SkStream_hdr",
"//include/private:SkStringView_hdr",
"//src/core:SkCpu_hdr",
"//src/core:SkOpts_hdr",
"//src/opts:SkChecksum_opts_hdr",
"//src/opts:SkVM_opts_hdr",
"//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr",
"//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
"//src/sksl/ir:SkSLUnresolvedFunction_hdr",
"//src/sksl/ir:SkSLVarDeclarations_hdr",
"//src/sksl/tracing:SkVMDebugTrace_hdr",
"//src/utils:SkShaderUtils_hdr",
"//src/utils:SkVMVisualizer_hdr",
],
)
generated_cc_atom( generated_cc_atom(
name = "SkSLMangler_hdr", name = "SkSLMangler_hdr",
hdrs = ["SkSLMangler.h"], hdrs = ["SkSLMangler.h"],

28
tools/skslc/BUILD.bazel Normal file
View File

@ -0,0 +1,28 @@
load("//bazel:macros.bzl", "generated_cc_atom")
generated_cc_atom(
name = "Main_src",
srcs = ["Main.cpp"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkGraphics_hdr",
"//include/core:SkStream_hdr",
"//include/private:SkStringView_hdr",
"//src/core:SkCpu_hdr",
"//src/core:SkOpts_hdr",
"//src/opts:SkChecksum_opts_hdr",
"//src/opts:SkVM_opts_hdr",
"//src/sksl:SkSLCompiler_hdr",
"//src/sksl:SkSLDehydrator_hdr",
"//src/sksl:SkSLFileOutputStream_hdr",
"//src/sksl:SkSLStringStream_hdr",
"//src/sksl:SkSLUtil_hdr",
"//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr",
"//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
"//src/sksl/ir:SkSLUnresolvedFunction_hdr",
"//src/sksl/ir:SkSLVarDeclarations_hdr",
"//src/sksl/tracing:SkVMDebugTrace_hdr",
"//src/utils:SkShaderUtils_hdr",
"//src/utils:SkVMVisualizer_hdr",
],
)

0
src/sksl/SkSLMain.cpp → tools/skslc/Main.cpp
View File