ac/nir, radv, radeonsi: Switch to using ac_shader_args

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

diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 0ca065f34e0cc4c6b0ee7ad315f0a33675cb2c54..3baf70a020e9aaa5e7be1032d79d857d3cb91fdf 100644 (file)
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -21,6 +21,7 @@
 files_libradeonsi = files(
   'cik_sdma.c',
   'driinfo_radeonsi.h',
+  'gfx10_query.c',
   'gfx10_shader_ngg.c',
   'si_blit.c',
   'si_buffer.c',
@@ -104,7 +105,7 @@ gfx10_format_table_h = custom_target(
   'gfx10_format_table.h',
   input : files(
     'gfx10_format_table.py',
-    '../../auxiliary/util/u_format.csv', '../../../amd/registers/gfx10-rsrc.json'
+    '../../../util/format/u_format.csv', '../../../amd/registers/gfx10-rsrc.json'
   ),
   output : 'gfx10_format_table.h',
   command : [prog_python, '@INPUT@'],
@@ -116,7 +117,7 @@ libradeonsi = static_library(
   'radeonsi',
   [files_libradeonsi, si_driinfo_h, sid_tables_h, gfx10_format_table_h],
   include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_amd_common_llvm,
     inc_gallium_drivers,
   ],
   c_args : ['-Wstrict-overflow=0', c_vis_args],
@@ -128,7 +129,7 @@ driver_radeonsi = declare_dependency(
   compile_args : '-DGALLIUM_RADEONSI',
   sources : si_driinfo_h,
   link_with : [
-    libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common,
+    libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm, libgalliumvl
   ],
   dependencies : idep_nir,
 )