encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove libtint_core_src. 

This CL removes `libtint_core_src` and folds the dependencies into
`libtint`. Uses have been updated to require the specific libraries they
depend on.

Change-Id: I91118cc9db376c53597a8e588db654b3a4105386
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117586
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
dan sinclair 2023-01-25 19:52:28 +00:00 committed by Dawn LUCI CQ
parent 549fa71c8d
commit a3e90618dc
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/tint/BUILD.gn
View File

@ -137,12 +137,6 @@ source_set("tint_val") {
############################################################################### ###############################################################################
# Library - Tint core and optional modules of libtint # Library - Tint core and optional modules of libtint
############################################################################### ###############################################################################
# libtint source sets are divided into a non-optional core in :libtint_core_src
# and optional :libtint_*_src subsets, because ninja does not like having
# multiple source files with the same name, like function.cc, in the same
# source set
# target.
#
# Targets that want to use tint as a library should depend on ":libtint" and # Targets that want to use tint as a library should depend on ":libtint" and
# use the build flags to control what is included, instead of trying to specify # use the build flags to control what is included, instead of trying to specify
# the subsets that they want. # the subsets that they want.
@ -795,21 +789,6 @@ libtint_source_set("libtint_constant_src") {
] ]
} }
libtint_source_set("libtint_core_src") {
public_deps = [
":libtint_base_src",
":libtint_constant_src",
":libtint_initializer_src",
":libtint_inspector_src",
":libtint_sem_src",
":libtint_syntax_tree_src",
":libtint_text_src",
":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src",
]
}
libtint_source_set("libtint_reader_src") { libtint_source_set("libtint_reader_src") {
sources = [ sources = [
"reader/reader.cc", "reader/reader.cc",
@ -908,8 +887,10 @@ libtint_source_set("libtint_spv_writer_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_core_src", ":libtint_constant_src",
":libtint_syntax_tree_src",
":libtint_transform_src", ":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src", ":libtint_writer_src",
] ]
} }
@ -932,7 +913,6 @@ libtint_source_set("libtint_wgsl_reader_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_reader_src", ":libtint_reader_src",
":libtint_syntax_tree_src",
":libtint_text_src", ":libtint_text_src",
":libtint_type_src", ":libtint_type_src",
] ]
@ -948,7 +928,8 @@ libtint_source_set("libtint_wgsl_writer_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_core_src", ":libtint_syntax_tree_src",
":libtint_type_src",
":libtint_writer_src", ":libtint_writer_src",
] ]
} }
@ -963,8 +944,10 @@ libtint_source_set("libtint_msl_writer_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_core_src", ":libtint_constant_src",
":libtint_syntax_tree_src",
":libtint_transform_src", ":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src", ":libtint_writer_src",
] ]
} }
@ -979,8 +962,10 @@ libtint_source_set("libtint_hlsl_writer_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_core_src", ":libtint_constant_src",
":libtint_syntax_tree_src",
":libtint_transform_src", ":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src", ":libtint_writer_src",
] ]
} }
@ -995,14 +980,27 @@ libtint_source_set("libtint_glsl_writer_src") {
deps = [ deps = [
":libtint_base_src", ":libtint_base_src",
":libtint_core_src", ":libtint_constant_src",
":libtint_syntax_tree_src",
":libtint_transform_src", ":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src", ":libtint_writer_src",
] ]
} }
source_set("libtint") { source_set("libtint") {
public_deps = [ ":libtint_core_src" ] public_deps = [
":libtint_base_src",
":libtint_constant_src",
":libtint_initializer_src",
":libtint_inspector_src",
":libtint_sem_src",
":libtint_syntax_tree_src",
":libtint_text_src",
":libtint_transform_src",
":libtint_type_src",
":libtint_writer_src",
]
if (tint_build_spv_reader) { if (tint_build_spv_reader) {
public_deps += [ ":libtint_spv_reader_src" ] public_deps += [ ":libtint_spv_reader_src" ]