meson: drop duplicate inc_nir from libiris

[mesa.git] / src / gallium / drivers / iris / meson.build

diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 1eb19863bf1fb9db57b527e2aa3a662943458d02..4c1665a8ccebce08a3cf1db1b4ec0a4231e9b907 100644 (file)
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2019 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 files_libiris = files(
+  'driinfo_iris.h',
   'iris_batch.c',
   'iris_batch.h',
   'iris_binder.c',
@@ -34,48 +35,66 @@ files_libiris = files(
   'iris_fence.c',
   'iris_fence.h',
   'iris_formats.c',
+  'iris_genx_macros.h',
+  'iris_genx_protos.h',
+  'iris_monitor.c',
   'iris_pipe.h',
   'iris_pipe_control.c',
   'iris_program.c',
   'iris_program_cache.c',
-  'iris_query.c',
   'iris_resolve.c',
   'iris_resource.c',
   'iris_resource.h',
   'iris_screen.c',
   'iris_screen.h',
+  'iris_disk_cache.c',
+)
+
+iris_driinfo_h = custom_target(
+  'iris_driinfo.h',
+  input : files(
+    '../../../util/merge_driinfo.py',
+    '../../auxiliary/pipe-loader/driinfo_gallium.h', 'driinfo_iris.h'
+  ),
+  output : 'iris_driinfo.h',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
 )
 
 iris_gen_libs = []
-foreach v : ['80', '90', '100', '110']
-  _lib = static_library(
+foreach v : ['80', '90', '100', '110', '120']
+  iris_gen_libs += static_library(
     'libiris_gen@0@'.format(v),
-    ['iris_blorp.c', 'iris_state.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel, inc_nir],
-    c_args : [c_vis_args, no_override_init_args,
-              '-DGEN_VERSIONx10=@0@'.format(v)],
-    dependencies : [dep_libdrm, dep_valgrind],
+    ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],
+    include_directories : [inc_common, inc_intel],
+    c_args : [
+      c_vis_args, no_override_init_args, c_sse2_args,
+      '-DGEN_VERSIONx10=@0@'.format(v),
+    ],
+    dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
   )
-  iris_gen_libs += _lib
 endforeach
 
 libiris = static_library(
   'iris',
-  [files_libiris, gen_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
+  [files_libiris, gen_xml_pack, iris_driinfo_h],
   include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_intel, inc_nir,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_intel,
     inc_gallium_drivers,
     # these should not be necessary, but main/macros.h...
     inc_mesa, inc_mapi
   ],
-  c_args : [c_vis_args],
-  cpp_args : [cpp_vis_args],
-  dependencies : [dep_libdrm, dep_valgrind],
-  link_with : [iris_gen_libs, libintel_common, libintel_compiler, libintel_dev,
-               libisl, libblorp],
+  c_args : [c_vis_args, c_sse2_args],
+  cpp_args : [cpp_vis_args, c_sse2_args],
+  dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers],
+  link_with : [
+    iris_gen_libs, libintel_compiler, libintel_dev, libisl,
+    libblorp, libintel_perf
+  ],
 )
 
 driver_iris = declare_dependency(
   compile_args : '-DGALLIUM_IRIS',
+  sources : iris_driinfo_h,
   link_with : [libiris, libiriswinsys],
 )