Move multiplanar_options into ir/transform folder. The only thing in the core/common folder was multiplanar_options.h. Move it out of core/common and into core/ir/transform alongside the other multiplanar files. Change-Id: If763b596aa34bd7659f4d0a430e24b0d0c827b37 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/234554 Reviewed-by: James Price <jrprice@google.com> Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/core/BUILD.cmake b/src/tint/lang/core/BUILD.cmake index daafcbe..96666be 100644 --- a/src/tint/lang/core/BUILD.cmake +++ b/src/tint/lang/core/BUILD.cmake
@@ -34,7 +34,6 @@ # Do not modify this file directly ################################################################################ -include(lang/core/common/BUILD.cmake) include(lang/core/constant/BUILD.cmake) include(lang/core/intrinsic/BUILD.cmake) include(lang/core/ir/BUILD.cmake)
diff --git a/src/tint/lang/core/common/BUILD.bazel b/src/tint/lang/core/common/BUILD.bazel deleted file mode 100644 index dd7672c..0000000 --- a/src/tint/lang/core/common/BUILD.bazel +++ /dev/null
@@ -1,61 +0,0 @@ -# Copyright 2024 The Dawn & Tint Authors -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -################################################################################ -# File generated by 'tools/src/cmd/gen' using the template: -# tools/src/cmd/gen/build/BUILD.bazel.tmpl -# -# To regenerate run: './tools/run gen' -# -# Do not modify this file directly -################################################################################ - -load("//src/tint:flags.bzl", "COPTS") -load("@bazel_skylib//lib:selects.bzl", "selects") -cc_library( - name = "common", - srcs = [ - "placeholder.cc", - ], - hdrs = [ - "multiplanar_options.h", - ], - deps = [ - "//src/tint/api/common", - "//src/tint/utils", - "//src/tint/utils/containers", - "//src/tint/utils/ice", - "//src/tint/utils/macros", - "//src/tint/utils/math", - "//src/tint/utils/memory", - "//src/tint/utils/rtti", - "//src/utils", - ], - copts = COPTS, - visibility = ["//visibility:public"], -) -
diff --git a/src/tint/lang/core/common/BUILD.cmake b/src/tint/lang/core/common/BUILD.cmake deleted file mode 100644 index 0fbf031..0000000 --- a/src/tint/lang/core/common/BUILD.cmake +++ /dev/null
@@ -1,59 +0,0 @@ -# Copyright 2024 The Dawn & Tint Authors -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -################################################################################ -# File generated by 'tools/src/cmd/gen' using the template: -# tools/src/cmd/gen/build/BUILD.cmake.tmpl -# -# To regenerate run: './tools/run gen' -# -# Do not modify this file directly -################################################################################ - -################################################################################ -# Target: tint_lang_core_common -# Kind: lib -################################################################################ -tint_add_target(tint_lang_core_common lib - lang/core/common/multiplanar_options.h - lang/core/common/placeholder.cc -) - -tint_target_add_dependencies(tint_lang_core_common lib - tint_api_common - tint_utils - tint_utils_containers - tint_utils_ice - tint_utils_macros - tint_utils_math - tint_utils_memory - tint_utils_rtti -) - -tint_target_add_external_dependencies(tint_lang_core_common lib - "src_utils" -)
diff --git a/src/tint/lang/core/common/BUILD.gn b/src/tint/lang/core/common/BUILD.gn deleted file mode 100644 index 669aa92..0000000 --- a/src/tint/lang/core/common/BUILD.gn +++ /dev/null
@@ -1,58 +0,0 @@ -# Copyright 2024 The Dawn & Tint Authors -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -################################################################################ -# File generated by 'tools/src/cmd/gen' using the template: -# tools/src/cmd/gen/build/BUILD.gn.tmpl -# -# To regenerate run: './tools/run gen' -# -# Do not modify this file directly -################################################################################ - -import("../../../../../scripts/dawn_overrides_with_defaults.gni") -import("../../../../../scripts/tint_overrides_with_defaults.gni") - -import("${tint_src_dir}/tint.gni") - -libtint_source_set("common") { - sources = [ - "multiplanar_options.h", - "placeholder.cc", - ] - deps = [ - "${dawn_root}/src/utils:utils", - "${tint_src_dir}/api/common", - "${tint_src_dir}/utils", - "${tint_src_dir}/utils/containers", - "${tint_src_dir}/utils/ice", - "${tint_src_dir}/utils/macros", - "${tint_src_dir}/utils/math", - "${tint_src_dir}/utils/memory", - "${tint_src_dir}/utils/rtti", - ] -}
diff --git a/src/tint/lang/core/common/placeholder.cc b/src/tint/lang/core/common/placeholder.cc deleted file mode 100644 index 60769ee..0000000 --- a/src/tint/lang/core/common/placeholder.cc +++ /dev/null
@@ -1,36 +0,0 @@ -// Copyright 2024 The Dawn & Tint Authors -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// CMake requires that targets contain at least on file. This file is used when we want to create -// empty targets. - -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wmissing-variable-declarations" -#endif - -// A placeholder symbol used to emit a symbol for this lib target. -int tint_core_common_symbol = 1;
diff --git a/src/tint/lang/core/ir/transform/BUILD.bazel b/src/tint/lang/core/ir/transform/BUILD.bazel index 31b487a..ef932bd 100644 --- a/src/tint/lang/core/ir/transform/BUILD.bazel +++ b/src/tint/lang/core/ir/transform/BUILD.bazel
@@ -80,6 +80,7 @@ "demote_to_helper.h", "direct_variable_access.h", "multiplanar_external_texture.h", + "multiplanar_options.h", "prepare_push_constants.h", "preserve_padding.h", "prevent_infinite_loops.h", @@ -99,7 +100,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir", @@ -165,7 +165,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir",
diff --git a/src/tint/lang/core/ir/transform/BUILD.cmake b/src/tint/lang/core/ir/transform/BUILD.cmake index 14d4e45..f094201 100644 --- a/src/tint/lang/core/ir/transform/BUILD.cmake +++ b/src/tint/lang/core/ir/transform/BUILD.cmake
@@ -63,6 +63,7 @@ lang/core/ir/transform/direct_variable_access.h lang/core/ir/transform/multiplanar_external_texture.cc lang/core/ir/transform/multiplanar_external_texture.h + lang/core/ir/transform/multiplanar_options.h lang/core/ir/transform/prepare_push_constants.cc lang/core/ir/transform/prepare_push_constants.h lang/core/ir/transform/preserve_padding.cc @@ -98,7 +99,6 @@ tint_target_add_dependencies(tint_lang_core_ir_transform lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir @@ -158,7 +158,6 @@ tint_target_add_dependencies(tint_lang_core_ir_transform_test test tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir @@ -239,7 +238,6 @@ tint_api_common tint_cmd_fuzz_ir_fuzz tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_ir tint_lang_core_ir_transform
diff --git a/src/tint/lang/core/ir/transform/BUILD.gn b/src/tint/lang/core/ir/transform/BUILD.gn index 4b35426..824ffd6 100644 --- a/src/tint/lang/core/ir/transform/BUILD.gn +++ b/src/tint/lang/core/ir/transform/BUILD.gn
@@ -69,6 +69,7 @@ "direct_variable_access.h", "multiplanar_external_texture.cc", "multiplanar_external_texture.h", + "multiplanar_options.h", "prepare_push_constants.cc", "prepare_push_constants.h", "preserve_padding.cc", @@ -104,7 +105,6 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir", @@ -159,7 +159,6 @@ "${tint_src_dir}:gmock_and_gtest", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir", @@ -230,7 +229,6 @@ "${tint_src_dir}/api/common", "${tint_src_dir}/cmd/fuzz/ir:fuzz", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/ir", "${tint_src_dir}/lang/core/ir/transform",
diff --git a/src/tint/lang/core/ir/transform/multiplanar_external_texture.h b/src/tint/lang/core/ir/transform/multiplanar_external_texture.h index 26214f4..6ed53c1 100644 --- a/src/tint/lang/core/ir/transform/multiplanar_external_texture.h +++ b/src/tint/lang/core/ir/transform/multiplanar_external_texture.h
@@ -28,7 +28,7 @@ #ifndef SRC_TINT_LANG_CORE_IR_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_ #define SRC_TINT_LANG_CORE_IR_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_ -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/utils/result.h" // Forward declarations.
diff --git a/src/tint/lang/core/ir/transform/multiplanar_external_texture_test.cc b/src/tint/lang/core/ir/transform/multiplanar_external_texture_test.cc index 5e7978e..9089411 100644 --- a/src/tint/lang/core/ir/transform/multiplanar_external_texture_test.cc +++ b/src/tint/lang/core/ir/transform/multiplanar_external_texture_test.cc
@@ -29,8 +29,8 @@ #include <utility> -#include "src/tint/lang/core/common/multiplanar_options.h" #include "src/tint/lang/core/ir/transform/helper_test.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/core/type/external_texture.h" namespace tint::core::ir::transform {
diff --git a/src/tint/lang/core/common/multiplanar_options.h b/src/tint/lang/core/ir/transform/multiplanar_options.h similarity index 92% rename from src/tint/lang/core/common/multiplanar_options.h rename to src/tint/lang/core/ir/transform/multiplanar_options.h index f18b508..51d8a85 100644 --- a/src/tint/lang/core/common/multiplanar_options.h +++ b/src/tint/lang/core/ir/transform/multiplanar_options.h
@@ -25,8 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef SRC_TINT_LANG_CORE_COMMON_MULTIPLANAR_OPTIONS_H_ -#define SRC_TINT_LANG_CORE_COMMON_MULTIPLANAR_OPTIONS_H_ +#ifndef SRC_TINT_LANG_CORE_IR_TRANSFORM_MULTIPLANAR_OPTIONS_H_ +#define SRC_TINT_LANG_CORE_IR_TRANSFORM_MULTIPLANAR_OPTIONS_H_ #include <unordered_map> @@ -55,4 +55,4 @@ } // namespace tint::transform::multiplanar -#endif // SRC_TINT_LANG_CORE_COMMON_MULTIPLANAR_OPTIONS_H_ +#endif // SRC_TINT_LANG_CORE_IR_TRANSFORM_MULTIPLANAR_OPTIONS_H_
diff --git a/src/tint/lang/glsl/writer/common/BUILD.bazel b/src/tint/lang/glsl/writer/common/BUILD.bazel index 0f2d5cc..3ee4bd9 100644 --- a/src/tint/lang/glsl/writer/common/BUILD.bazel +++ b/src/tint/lang/glsl/writer/common/BUILD.bazel
@@ -54,8 +54,8 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast",
diff --git a/src/tint/lang/glsl/writer/common/BUILD.cmake b/src/tint/lang/glsl/writer/common/BUILD.cmake index cbb585a..df596f3 100644 --- a/src/tint/lang/glsl/writer/common/BUILD.cmake +++ b/src/tint/lang/glsl/writer/common/BUILD.cmake
@@ -55,8 +55,8 @@ tint_target_add_dependencies(tint_lang_glsl_writer_common lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant + tint_lang_core_ir_transform tint_lang_core_type tint_lang_wgsl tint_lang_wgsl_ast
diff --git a/src/tint/lang/glsl/writer/common/BUILD.gn b/src/tint/lang/glsl/writer/common/BUILD.gn index 36d9bc1..0ce37a8 100644 --- a/src/tint/lang/glsl/writer/common/BUILD.gn +++ b/src/tint/lang/glsl/writer/common/BUILD.gn
@@ -59,8 +59,8 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/lang/wgsl", "${tint_src_dir}/lang/wgsl/ast",
diff --git a/src/tint/lang/glsl/writer/common/option_helpers.h b/src/tint/lang/glsl/writer/common/option_helpers.h index d3388bc..bba18c7 100644 --- a/src/tint/lang/glsl/writer/common/option_helpers.h +++ b/src/tint/lang/glsl/writer/common/option_helpers.h
@@ -31,7 +31,7 @@ #include <unordered_map> #include "src/tint/api/common/binding_point.h" -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/glsl/writer/common/options.h" #include "src/tint/utils/diagnostic/diagnostic.h"
diff --git a/src/tint/lang/glsl/writer/raise/BUILD.bazel b/src/tint/lang/glsl/writer/raise/BUILD.bazel index 6767e81..b520f84 100644 --- a/src/tint/lang/glsl/writer/raise/BUILD.bazel +++ b/src/tint/lang/glsl/writer/raise/BUILD.bazel
@@ -61,7 +61,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir",
diff --git a/src/tint/lang/glsl/writer/raise/BUILD.cmake b/src/tint/lang/glsl/writer/raise/BUILD.cmake index 4f44f73b..ff8f07d 100644 --- a/src/tint/lang/glsl/writer/raise/BUILD.cmake +++ b/src/tint/lang/glsl/writer/raise/BUILD.cmake
@@ -62,7 +62,6 @@ tint_target_add_dependencies(tint_lang_glsl_writer_raise lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir
diff --git a/src/tint/lang/glsl/writer/raise/BUILD.gn b/src/tint/lang/glsl/writer/raise/BUILD.gn index a4d1866..1f4da65 100644 --- a/src/tint/lang/glsl/writer/raise/BUILD.gn +++ b/src/tint/lang/glsl/writer/raise/BUILD.gn
@@ -66,7 +66,6 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir",
diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel b/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel index 1e195ea..7da657b 100644 --- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel
@@ -47,8 +47,8 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl",
diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake b/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake index 4b7aba9..4b09f81 100644 --- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake
@@ -48,8 +48,8 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_ast_printer lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant + tint_lang_core_ir_transform tint_lang_core_type tint_lang_hlsl_writer_common tint_lang_wgsl
diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn b/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn index 5fbb843..f637dfd 100644 --- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn +++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn
@@ -52,8 +52,8 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/lang/hlsl/writer/common", "${tint_src_dir}/lang/wgsl",
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.bazel b/src/tint/lang/hlsl/writer/common/BUILD.bazel index 10a9e23..b8a4e91 100644 --- a/src/tint/lang/hlsl/writer/common/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/common/BUILD.bazel
@@ -51,7 +51,7 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/wgsl/ast", "//src/tint/utils", "//src/tint/utils/containers",
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.cmake b/src/tint/lang/hlsl/writer/common/BUILD.cmake index d07ad25..ec49646 100644 --- a/src/tint/lang/hlsl/writer/common/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/common/BUILD.cmake
@@ -50,7 +50,7 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_common lib tint_api_common tint_lang_core - tint_lang_core_common + tint_lang_core_ir_transform tint_lang_wgsl_ast tint_utils tint_utils_containers
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.gn b/src/tint/lang/hlsl/writer/common/BUILD.gn index d3ad32f..8bbae62 100644 --- a/src/tint/lang/hlsl/writer/common/BUILD.gn +++ b/src/tint/lang/hlsl/writer/common/BUILD.gn
@@ -56,7 +56,7 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/wgsl/ast", "${tint_src_dir}/utils", "${tint_src_dir}/utils/containers",
diff --git a/src/tint/lang/hlsl/writer/common/option_helpers.h b/src/tint/lang/hlsl/writer/common/option_helpers.h index df52ab7..3a255af 100644 --- a/src/tint/lang/hlsl/writer/common/option_helpers.h +++ b/src/tint/lang/hlsl/writer/common/option_helpers.h
@@ -31,7 +31,7 @@ #include <unordered_map> #include "src/tint/api/common/binding_point.h" -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/hlsl/writer/common/options.h" #include "src/tint/utils/diagnostic/diagnostic.h"
diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.bazel b/src/tint/lang/hlsl/writer/raise/BUILD.bazel index 5f2feba..68e98ba 100644 --- a/src/tint/lang/hlsl/writer/raise/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/raise/BUILD.bazel
@@ -67,7 +67,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir",
diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.cmake b/src/tint/lang/hlsl/writer/raise/BUILD.cmake index 4971a9f..94703ba 100644 --- a/src/tint/lang/hlsl/writer/raise/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/raise/BUILD.cmake
@@ -66,7 +66,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_raise lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir
diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.gn b/src/tint/lang/hlsl/writer/raise/BUILD.gn index 1be19e4..dee99dd 100644 --- a/src/tint/lang/hlsl/writer/raise/BUILD.gn +++ b/src/tint/lang/hlsl/writer/raise/BUILD.gn
@@ -72,7 +72,6 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir",
diff --git a/src/tint/lang/msl/writer/BUILD.bazel b/src/tint/lang/msl/writer/BUILD.bazel index 4551c1d..2c9dcd4 100644 --- a/src/tint/lang/msl/writer/BUILD.bazel +++ b/src/tint/lang/msl/writer/BUILD.bazel
@@ -47,9 +47,9 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/utils", "//src/tint/utils/containers",
diff --git a/src/tint/lang/msl/writer/BUILD.cmake b/src/tint/lang/msl/writer/BUILD.cmake index 5cc11e0..cbb9047 100644 --- a/src/tint/lang/msl/writer/BUILD.cmake +++ b/src/tint/lang/msl/writer/BUILD.cmake
@@ -53,9 +53,9 @@ tint_target_add_dependencies(tint_lang_msl_writer lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_ir + tint_lang_core_ir_transform tint_lang_core_type tint_utils tint_utils_containers
diff --git a/src/tint/lang/msl/writer/BUILD.gn b/src/tint/lang/msl/writer/BUILD.gn index ed45a9a..68ca4f4 100644 --- a/src/tint/lang/msl/writer/BUILD.gn +++ b/src/tint/lang/msl/writer/BUILD.gn
@@ -52,9 +52,9 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/ir", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/utils", "${tint_src_dir}/utils/containers",
diff --git a/src/tint/lang/msl/writer/common/BUILD.bazel b/src/tint/lang/msl/writer/common/BUILD.bazel index 1f9666f..c6fb127 100644 --- a/src/tint/lang/msl/writer/common/BUILD.bazel +++ b/src/tint/lang/msl/writer/common/BUILD.bazel
@@ -53,7 +53,7 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/utils", "//src/tint/utils/containers",
diff --git a/src/tint/lang/msl/writer/common/BUILD.cmake b/src/tint/lang/msl/writer/common/BUILD.cmake index a511a2b..0dc347e 100644 --- a/src/tint/lang/msl/writer/common/BUILD.cmake +++ b/src/tint/lang/msl/writer/common/BUILD.cmake
@@ -54,7 +54,7 @@ tint_target_add_dependencies(tint_lang_msl_writer_common lib tint_api_common tint_lang_core - tint_lang_core_common + tint_lang_core_ir_transform tint_lang_core_type tint_utils tint_utils_containers
diff --git a/src/tint/lang/msl/writer/common/BUILD.gn b/src/tint/lang/msl/writer/common/BUILD.gn index 51d18bc..b8e1d72 100644 --- a/src/tint/lang/msl/writer/common/BUILD.gn +++ b/src/tint/lang/msl/writer/common/BUILD.gn
@@ -58,7 +58,7 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/utils", "${tint_src_dir}/utils/containers",
diff --git a/src/tint/lang/msl/writer/common/option_helpers.h b/src/tint/lang/msl/writer/common/option_helpers.h index a0a1c06..92696e1 100644 --- a/src/tint/lang/msl/writer/common/option_helpers.h +++ b/src/tint/lang/msl/writer/common/option_helpers.h
@@ -31,7 +31,7 @@ #include <unordered_map> #include "src/tint/api/common/binding_point.h" -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/msl/writer/common/options.h" #include "src/tint/utils/result.h"
diff --git a/src/tint/lang/msl/writer/raise/BUILD.bazel b/src/tint/lang/msl/writer/raise/BUILD.bazel index 0890ad8..5bca288 100644 --- a/src/tint/lang/msl/writer/raise/BUILD.bazel +++ b/src/tint/lang/msl/writer/raise/BUILD.bazel
@@ -61,7 +61,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir",
diff --git a/src/tint/lang/msl/writer/raise/BUILD.cmake b/src/tint/lang/msl/writer/raise/BUILD.cmake index d81631c..4128fcc 100644 --- a/src/tint/lang/msl/writer/raise/BUILD.cmake +++ b/src/tint/lang/msl/writer/raise/BUILD.cmake
@@ -62,7 +62,6 @@ tint_target_add_dependencies(tint_lang_msl_writer_raise lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir
diff --git a/src/tint/lang/msl/writer/raise/BUILD.gn b/src/tint/lang/msl/writer/raise/BUILD.gn index 669be61..e6de1d4 100644 --- a/src/tint/lang/msl/writer/raise/BUILD.gn +++ b/src/tint/lang/msl/writer/raise/BUILD.gn
@@ -66,7 +66,6 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir",
diff --git a/src/tint/lang/spirv/writer/BUILD.bazel b/src/tint/lang/spirv/writer/BUILD.bazel index c0ab7c2..b3fb378 100644 --- a/src/tint/lang/spirv/writer/BUILD.bazel +++ b/src/tint/lang/spirv/writer/BUILD.bazel
@@ -47,9 +47,9 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/utils", "//src/tint/utils/containers",
diff --git a/src/tint/lang/spirv/writer/BUILD.cmake b/src/tint/lang/spirv/writer/BUILD.cmake index 6bacaed..d53367f 100644 --- a/src/tint/lang/spirv/writer/BUILD.cmake +++ b/src/tint/lang/spirv/writer/BUILD.cmake
@@ -53,9 +53,9 @@ tint_target_add_dependencies(tint_lang_spirv_writer lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_ir + tint_lang_core_ir_transform tint_lang_core_type tint_utils tint_utils_containers
diff --git a/src/tint/lang/spirv/writer/BUILD.gn b/src/tint/lang/spirv/writer/BUILD.gn index 2226ea9..3ca5caf 100644 --- a/src/tint/lang/spirv/writer/BUILD.gn +++ b/src/tint/lang/spirv/writer/BUILD.gn
@@ -52,9 +52,9 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/ir", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/utils", "${tint_src_dir}/utils/containers",
diff --git a/src/tint/lang/spirv/writer/common/BUILD.bazel b/src/tint/lang/spirv/writer/common/BUILD.bazel index a623f51..6b7aa09 100644 --- a/src/tint/lang/spirv/writer/common/BUILD.bazel +++ b/src/tint/lang/spirv/writer/common/BUILD.bazel
@@ -59,7 +59,7 @@ ], deps = [ "//src/tint/api/common", - "//src/tint/lang/core/common", + "//src/tint/lang/core/ir/transform", "//src/tint/utils", "//src/tint/utils/containers", "//src/tint/utils/diagnostic",
diff --git a/src/tint/lang/spirv/writer/common/BUILD.cmake b/src/tint/lang/spirv/writer/common/BUILD.cmake index d41e8e3..f3085d9 100644 --- a/src/tint/lang/spirv/writer/common/BUILD.cmake +++ b/src/tint/lang/spirv/writer/common/BUILD.cmake
@@ -60,7 +60,7 @@ tint_target_add_dependencies(tint_lang_spirv_writer_common lib tint_api_common - tint_lang_core_common + tint_lang_core_ir_transform tint_utils tint_utils_containers tint_utils_diagnostic
diff --git a/src/tint/lang/spirv/writer/common/BUILD.gn b/src/tint/lang/spirv/writer/common/BUILD.gn index bc87ba7..7d7ea05 100644 --- a/src/tint/lang/spirv/writer/common/BUILD.gn +++ b/src/tint/lang/spirv/writer/common/BUILD.gn
@@ -64,7 +64,7 @@ deps = [ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", - "${tint_src_dir}/lang/core/common", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/utils", "${tint_src_dir}/utils/containers", "${tint_src_dir}/utils/diagnostic",
diff --git a/src/tint/lang/spirv/writer/common/option_helpers.h b/src/tint/lang/spirv/writer/common/option_helpers.h index 82c1e6c..355861f 100644 --- a/src/tint/lang/spirv/writer/common/option_helpers.h +++ b/src/tint/lang/spirv/writer/common/option_helpers.h
@@ -31,7 +31,7 @@ #include <unordered_map> #include "src/tint/api/common/binding_point.h" -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/spirv/writer/common/options.h" #include "src/tint/utils/result.h"
diff --git a/src/tint/lang/spirv/writer/raise/BUILD.bazel b/src/tint/lang/spirv/writer/raise/BUILD.bazel index e8c3bac..1bd116c 100644 --- a/src/tint/lang/spirv/writer/raise/BUILD.bazel +++ b/src/tint/lang/spirv/writer/raise/BUILD.bazel
@@ -65,7 +65,6 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir",
diff --git a/src/tint/lang/spirv/writer/raise/BUILD.cmake b/src/tint/lang/spirv/writer/raise/BUILD.cmake index a2e905b..93f2fef 100644 --- a/src/tint/lang/spirv/writer/raise/BUILD.cmake +++ b/src/tint/lang/spirv/writer/raise/BUILD.cmake
@@ -66,7 +66,6 @@ tint_target_add_dependencies(tint_lang_spirv_writer_raise lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_intrinsic tint_lang_core_ir
diff --git a/src/tint/lang/spirv/writer/raise/BUILD.gn b/src/tint/lang/spirv/writer/raise/BUILD.gn index c6ea3b3..afbcfe5 100644 --- a/src/tint/lang/spirv/writer/raise/BUILD.gn +++ b/src/tint/lang/spirv/writer/raise/BUILD.gn
@@ -70,7 +70,6 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/intrinsic", "${tint_src_dir}/lang/core/ir",
diff --git a/src/tint/lang/wgsl/ast/transform/BUILD.bazel b/src/tint/lang/wgsl/ast/transform/BUILD.bazel index e1f4a9e..2fa58a9 100644 --- a/src/tint/lang/wgsl/ast/transform/BUILD.bazel +++ b/src/tint/lang/wgsl/ast/transform/BUILD.bazel
@@ -109,8 +109,8 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", @@ -172,9 +172,9 @@ deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/core/common", "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", + "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast",
diff --git a/src/tint/lang/wgsl/ast/transform/BUILD.cmake b/src/tint/lang/wgsl/ast/transform/BUILD.cmake index 1c8567f..908433d 100644 --- a/src/tint/lang/wgsl/ast/transform/BUILD.cmake +++ b/src/tint/lang/wgsl/ast/transform/BUILD.cmake
@@ -108,8 +108,8 @@ tint_target_add_dependencies(tint_lang_wgsl_ast_transform lib tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant + tint_lang_core_ir_transform tint_lang_core_type tint_lang_wgsl tint_lang_wgsl_ast @@ -176,9 +176,9 @@ tint_target_add_dependencies(tint_lang_wgsl_ast_transform_test test tint_api_common tint_lang_core - tint_lang_core_common tint_lang_core_constant tint_lang_core_ir + tint_lang_core_ir_transform tint_lang_core_type tint_lang_wgsl tint_lang_wgsl_ast
diff --git a/src/tint/lang/wgsl/ast/transform/BUILD.gn b/src/tint/lang/wgsl/ast/transform/BUILD.gn index 2286bb7..b07c465 100644 --- a/src/tint/lang/wgsl/ast/transform/BUILD.gn +++ b/src/tint/lang/wgsl/ast/transform/BUILD.gn
@@ -114,8 +114,8 @@ "${dawn_root}/src/utils:utils", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/lang/wgsl", "${tint_src_dir}/lang/wgsl/ast", @@ -176,9 +176,9 @@ "${tint_src_dir}:gmock_and_gtest", "${tint_src_dir}/api/common", "${tint_src_dir}/lang/core", - "${tint_src_dir}/lang/core/common", "${tint_src_dir}/lang/core/constant", "${tint_src_dir}/lang/core/ir", + "${tint_src_dir}/lang/core/ir/transform", "${tint_src_dir}/lang/core/type", "${tint_src_dir}/lang/wgsl", "${tint_src_dir}/lang/wgsl/ast",
diff --git a/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h index c335fae..9ae282b 100644 --- a/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h +++ b/src/tint/lang/wgsl/ast/transform/multiplanar_external_texture.h
@@ -33,7 +33,7 @@ #include "src/tint/api/common/binding_point.h" #include "src/tint/lang/core/builtin_fn.h" -#include "src/tint/lang/core/common/multiplanar_options.h" +#include "src/tint/lang/core/ir/transform/multiplanar_options.h" #include "src/tint/lang/wgsl/ast/struct_member.h" #include "src/tint/lang/wgsl/ast/transform/transform.h"