meson: Add support for the vc5 driver.

v2: Default vc5 to off, since it requires the simulator currently.  Add
    missing dep on the XML generation from libbroadcom_vc5.

Reviewed-by: Dylan Baker <[email protected]> (v1)

3 files changed, 104 insertions, 0 deletions

diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
new file mode 100644
index 00000000000..bedf0ad522a
--- /dev/null
+++ b/src/broadcom/compiler/meson.build
@@ -0,0 +1,44 @@
+# Copyright © 2017 Broadcom
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libbroadcom_compiler_files = files(
+  'nir_to_vir.c',
+  'vir.c',
+  'vir_dump.c',
+  'vir_live_variables.c',
+  'vir_lower_uniforms.c',
+  'vir_opt_copy_propagate.c',
+  'vir_opt_dead_code.c',
+  'vir_register_allocate.c',
+  'vir_to_qpu.c',
+  'qpu_schedule.c',
+  'qpu_validate.c',
+  'v3d_compiler.h',
+  'v3d_nir_lower_io.c',
+)
+
+libbroadcom_compiler = static_library(
+  ['broadcom_compiler', v3d_xml_h, nir_opcodes_h, nir_builder_opcodes_h],
+  libbroadcom_compiler_files,
+  include_directories : [inc_common, inc_broadcom],
+  c_args : [c_vis_args, no_override_init_args],
+  dependencies : [dep_libdrm, dep_valgrind],
+  build_by_default : false,
+)
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 909ca108ebd..dbeee091139 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -21,3 +21,24 @@
 inc_broadcom = include_directories('.', 'cle')
 
 subdir('cle')
+
+if with_gallium_vc5
+  subdir('compiler')
+  subdir('qpu')
+
+  libbroadcom_vc5 = static_library(
+    'libbroadcom_vc5',
+    [
+      files(
+        'common/v3d_debug.c',
+       'clif/clif_dump.c',
+      ),
+      v3d_xml_pack,
+    ],
+    include_directories : [inc_common, inc_broadcom, inc_src],
+    c_args : [c_vis_args, no_override_init_args],
+    link_whole : [libbroadcom_compiler, libbroadcom_qpu],
+    build_by_default : false,
+    dependencies: dep_valgrind,
+  )
+endif
diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
new file mode 100644
index 00000000000..ca90aa23aa8
--- /dev/null
+++ b/src/broadcom/qpu/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2017 Broadcom
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libbroadcom_qpu_files = files(
+  'qpu_disasm.c',
+  'qpu_instr.c',
+  'qpu_pack.c',
+)
+
+libbroadcom_qpu = static_library(
+  ['broadcom_qpu', v3d_xml_h],
+  libbroadcom_qpu_files,
+  include_directories : [inc_common, inc_broadcom],
+  c_args : [c_vis_args, no_override_init_args],
+  dependencies : [dep_libdrm, dep_valgrind],
+  build_by_default : false,
+)
+
+test('qpu_disasm',
+  executable('qpu_disasm', 'tests/qpu_disasm.c',
+  link_with: [libbroadcom_qpu, libmesa_util],
+  include_directories: inc_common))