summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2020-08-05 17:48:51 -0400
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2020-08-13 08:55:15 +0200
commit1ad921956d8b9ed35ba72f44bd62a7a78ab854cf (patch)
treed30791304f7c4ef86022f167be6d2be874c3a0ae
parent75cc5b8c2922e192dd8c3e6dc33d6e691f2485fe (diff)
panfrost: Build midgard_pack.h via meson
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6195>
-rw-r--r--src/panfrost/lib/meson.build12
-rw-r--r--src/panfrost/meson.build2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index f25b18fcf75..a24eebca002 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -42,9 +42,17 @@ libpanfrost_decode_files = files(
'decode.c',
)
+midgard_pack = custom_target(
+ 'midgard_pack.h',
+ input : ['gen_pack.py', 'midgard.xml'],
+ output : 'midgard_pack.h',
+ command : [prog_python, '@INPUT@'],
+ capture : true,
+)
+
libpanfrost_lib = static_library(
'panfrost_lib',
- [libpanfrost_lib_files],
+ [libpanfrost_lib_files, midgard_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
@@ -54,7 +62,7 @@ libpanfrost_lib = static_library(
libpanfrost_decode = static_library(
'panfrost_decode',
- [libpanfrost_decode_files],
+ [libpanfrost_decode_files, midgard_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index e015941a8a0..46605165d06 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -42,7 +42,7 @@ files_bifrost = files(
bifrost_compiler = executable(
'bifrost_compiler',
- [files_bifrost],
+ [files_bifrost, midgard_pack],
include_directories : [
inc_mapi,
inc_mesa,