[lavapipe] Consolidate mako inputs to mesa_python_action
Bug: 329499191
Change-Id: Ib17f46bcfb930146aa7df7ef60739facf75b40f1
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/1012032
Reviewed-by: Craig Stout <cstout@google.com>
Commit-Queue: John Rosasco <rosasco@google.com>
diff --git a/mesa.gni b/mesa.gni
index 8474979..fefef06 100644
--- a/mesa.gni
+++ b/mesa.gni
@@ -21,6 +21,7 @@
import("//build/python/python_binary.gni")
import("//src/graphics/lib/magma/gnbuild/magma.gni")
+import("//third_party/mako/py_srcs.gni")
mesa_build_root = "//third_party/mesa"
@@ -137,7 +138,9 @@
}
}
-# Executes a python script with PYTHONPATH=${magma_python_path}
+mako_python_path = rebase_path("//third_party/mako")
+
+# Executes a python script with PYTHONPATH=${mako_python_path}
#
# Parameters
# Same as for action().
@@ -156,7 +159,7 @@
args = [
rebase_path(python_exe_src, root_build_dir),
- magma_python_path,
+ mako_python_path,
# path to write stdout to, which we don't need.
"/dev/stdout",
@@ -170,9 +173,10 @@
invoker.script,
# Some file that we can use as a signal that the other files
- # in magma_python_path have changed.
- "${magma_python_path}/doc/build/changelog.rst",
- ]
+ # in mako_python_path have changed.
+ "${mako_python_path}/doc/build/changelog.rst",
+ ] + third_party_mako_srcs
+
if (defined(invoker.inputs)) {
inputs += invoker.inputs
}
diff --git a/src/compiler/nir/BUILD.gn b/src/compiler/nir/BUILD.gn
index fa81bed..aacfac2 100644
--- a/src/compiler/nir/BUILD.gn
+++ b/src/compiler/nir/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
config("nir_public_config") {
@@ -327,7 +326,7 @@
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "nir_intrinsics.py" ] + third_party_mako_srcs
+ inputs = [ "nir_intrinsics.py" ]
args = [
"--outdir",
@@ -341,7 +340,7 @@
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "nir_intrinsics.py" ] + third_party_mako_srcs
+ inputs = [ "nir_intrinsics.py" ]
args = [
"--outdir",
@@ -356,9 +355,9 @@
outputs = [ "$target_gen_dir/$output_name" ]
inputs = [
- "$script",
- "nir_intrinsics.py",
- ] + third_party_mako_srcs
+ "$script",
+ "nir_intrinsics.py",
+ ]
args = [
"--outdir",
diff --git a/src/compiler/spirv/BUILD.gn b/src/compiler/spirv/BUILD.gn
index 4fd9767..876c938 100644
--- a/src/compiler/spirv/BUILD.gn
+++ b/src/compiler/spirv/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
config("spirv_public_config") {
@@ -78,7 +77,7 @@
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "spirv.core.grammar.json" ] + third_party_mako_srcs
+ inputs = [ "spirv.core.grammar.json" ]
args = [
rebase_path(".") + "/spirv.core.grammar.json",
@@ -91,7 +90,7 @@
script = "vtn_gather_types_c.py"
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "spirv.core.grammar.json" ] + third_party_mako_srcs
+ inputs = [ "spirv.core.grammar.json" ]
args = [
rebase_path(".") + "/spirv.core.grammar.json",
rebase_path(target_gen_dir, root_build_dir) + "/$output_name",
@@ -103,7 +102,7 @@
script = "vtn_generator_ids_h.py"
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "spir-v.xml" ] + third_party_mako_srcs
+ inputs = [ "spir-v.xml" ]
args = [
rebase_path(".") + "/spir-v.xml",
rebase_path(target_gen_dir, root_build_dir) + "/$output_name",
diff --git a/src/gallium/auxiliary/BUILD.gn b/src/gallium/auxiliary/BUILD.gn
index 6de1618..d7632ba 100644
--- a/src/gallium/auxiliary/BUILD.gn
+++ b/src/gallium/auxiliary/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
mesa_source_set("gallivm") {
@@ -463,8 +462,7 @@
script = "driver_trace/enums2names.py"
- inputs = [ "$mesa_build_root/src/gallium/include/pipe/p_defines.h" ] +
- third_party_mako_srcs
+ inputs = [ "$mesa_build_root/src/gallium/include/pipe/p_defines.h" ]
args = [
rebase_path("$mesa_build_root", root_build_dir) +
diff --git a/src/gallium/frontends/lavapipe/BUILD.gn b/src/gallium/frontends/lavapipe/BUILD.gn
index 7c2f4b3..b8ba591 100644
--- a/src/gallium/frontends/lavapipe/BUILD.gn
+++ b/src/gallium/frontends/lavapipe/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../../mesa.gni")
mesa_python_action("lvp_entrypoints") {
@@ -31,11 +30,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_entrypoints_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
diff --git a/src/intel/BUILD.gn b/src/intel/BUILD.gn
index 5f12a5c..50a3186 100644
--- a/src/intel/BUILD.gn
+++ b/src/intel/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../mesa.gni")
config("intel_config") {
@@ -245,7 +244,7 @@
outputs = [ "$target_gen_dir/$output_name" ]
- inputs = [ "isl/isl_format_layout.csv" ] + third_party_mako_srcs
+ inputs = [ "isl/isl_format_layout.csv" ]
args = [
"--csv",
diff --git a/src/intel/ds/BUILD.gn b/src/intel/ds/BUILD.gn
index a7dd209..f1f9cdc 100644
--- a/src/intel/ds/BUILD.gn
+++ b/src/intel/ds/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
config("ds_config") {
@@ -63,7 +62,6 @@
]
inputs = [ "//third_party/mesa/src/util/perf/u_trace.py" ]
- inputs += third_party_mako_srcs
args = [
"-p",
diff --git a/src/intel/vulkan/BUILD.gn b/src/intel/vulkan/BUILD.gn
index 60b40b7..caa4cff 100644
--- a/src/intel/vulkan/BUILD.gn
+++ b/src/intel/vulkan/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
declare_args() {
@@ -250,11 +249,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_entrypoints_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
@@ -286,7 +285,7 @@
script = "${mesa_build_root}/src/util/glsl2spirv.py"
float64_glsl = "${mesa_build_root}/src/compiler/glsl/float64.glsl"
- sources = [ float64_glsl ] + third_party_mako_srcs
+ sources = [ float64_glsl ]
inputs = [ "${host_out_dir}/glslang_validator" ]
args = [
diff --git a/src/vulkan/runtime/BUILD.gn b/src/vulkan/runtime/BUILD.gn
index 96baaab..6f18dbe 100644
--- a/src/vulkan/runtime/BUILD.gn
+++ b/src/vulkan/runtime/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
config("common") {
@@ -175,11 +174,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_cmd_queue_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
@@ -204,11 +203,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_entrypoints_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
@@ -237,11 +236,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_entrypoints_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
@@ -272,11 +271,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_dispatch_trampolines_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
@@ -296,8 +295,7 @@
script = "$mesa_build_root/src/vulkan/runtime/vk_physical_device_features.py"
- inputs =
- [ "$mesa_build_root/src/vulkan/registry/vk.xml" ] + third_party_mako_srcs
+ inputs = [ "$mesa_build_root/src/vulkan/registry/vk.xml" ]
args = [
"--xml",
diff --git a/src/vulkan/util/BUILD.gn b/src/vulkan/util/BUILD.gn
index f12d85d..387cc6d 100644
--- a/src/vulkan/util/BUILD.gn
+++ b/src/vulkan/util/BUILD.gn
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-import("//third_party/mako/py_srcs.gni")
import("../../../mesa.gni")
config("config_util") {
@@ -73,8 +72,7 @@
script = "gen_enum_to_str.py"
- inputs =
- [ "$mesa_build_root/src/vulkan/registry/vk.xml" ] + third_party_mako_srcs
+ inputs = [ "$mesa_build_root/src/vulkan/registry/vk.xml" ]
args = [
"--xml",
@@ -96,7 +94,7 @@
"vk_extensions.py",
"$mesa_build_root/src/vulkan/registry/vk.xml",
"$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- ] + third_party_mako_srcs
+ ]
args = [
"--xml",
@@ -116,8 +114,7 @@
script = "vk_extensions_gen.py"
- inputs =
- [ "vk_extensions.py", "$mesa_build_root/src/vulkan/registry/vk.xml" ] + third_party_mako_srcs
+ inputs = [ "vk_extensions.py", "$mesa_build_root/src/vulkan/registry/vk.xml" ]
args = [
"--xml",
diff --git a/src/vulkan/wsi/BUILD.gn b/src/vulkan/wsi/BUILD.gn
index 43eacea..4951a6a 100644
--- a/src/vulkan/wsi/BUILD.gn
+++ b/src/vulkan/wsi/BUILD.gn
@@ -20,7 +20,6 @@
# IN THE SOFTWARE.
import("../../../mesa.gni")
-import("//third_party/mako/py_srcs.gni")
config("wsi_config") {
include_dirs = [
@@ -38,11 +37,11 @@
script = "$mesa_build_root/src/vulkan/util/vk_entrypoints_gen.py"
inputs = [
- "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
- "$mesa_build_root/src/vulkan/util/vk_extensions.py",
- "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
- "$mesa_build_root/src/vulkan/registry/vk.xml",
- ] + third_party_mako_srcs
+ "$mesa_build_root/src/vulkan/util/vk_dispatch_table_gen.py",
+ "$mesa_build_root/src/vulkan/util/vk_extensions.py",
+ "$mesa_build_root/src/vulkan/util/vk_entrypoints.py",
+ "$mesa_build_root/src/vulkan/registry/vk.xml",
+ ]
args = [
"--xml",
