X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fcommon%2Fmeson.build;h=04e0da3e13ce532d5a405346ae60b705a9a2d182;hb=83139aca59a6d7da4c4b0abfcc1371f6fc076729;hp=8c526675c40d43555d9f401c1864436c844d2e55;hpb=5060c51b6f4dfb0d5358bde6523285163d3faaad;p=mesa.git

diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index 8c526675c40..04e0da3e13c 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -20,41 +20,65 @@
 
 sid_tables_h = custom_target(
   'sid_tables_h',
-  input : ['sid_tables.py', 'sid.h', 'gfx9d.h'],
+  input : ['sid_tables.py', 'sid.h', '../registers/amdgfxregs.json', '../registers/pkt3.json',
+           '../registers/gfx10.json', '../registers/gfx10-rsrc.json'],
   output : 'sid_tables.h',
-  command : [prog_python2, '@INPUT@'],
+  command : [prog_python, '@INPUT@'],
   capture : true,
 )
 
+amdgfxregs_h = custom_target(
+  'amdgfxregs_h',
+  input : ['../registers/makeregheader.py', '../registers/amdgfxregs.json', '../registers/pkt3.json',
+           '../registers/gfx10.json', '../registers/gfx10-rsrc.json'],
+  output : 'amdgfxregs.h',
+  command : [prog_python, '@INPUT@', '--sort', 'address', '--guard', 'AMDGFXREGS_H'],
+  capture : true,
+)
+
+gfx10_format_table_c = custom_target(
+  'gfx10_format_table.c',
+  input : files(
+    'gfx10_format_table.py',
+    '../../util/format/u_format.csv', '../registers/gfx10-rsrc.json'
+  ),
+  output : 'gfx10_format_table.c',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
+  depend_files : ['../registers/regdb.py']
+)
+
 amd_common_files = files(
   'ac_binary.c',
   'ac_binary.h',
   'ac_exp_param.h',
-  'ac_llvm_build.c',
-  'ac_llvm_build.h',
-  'ac_llvm_helper.cpp',
-  'ac_llvm_util.c',
-  'ac_llvm_util.h',
-  'ac_shader_abi.h',
-  'ac_shader_info.c',
-  'ac_shader_info.h',
-  'ac_nir_to_llvm.c',
-  'ac_nir_to_llvm.h',
+  'ac_shader_args.c',
+  'ac_shader_args.h',
+  'ac_shader_util.c',
+  'ac_shader_util.h',
   'ac_gpu_info.c',
   'ac_gpu_info.h',
+  'ac_rtld.c',
+  'ac_rtld.h',
   'ac_surface.c',
   'ac_surface.h',
   'ac_debug.c',
   'ac_debug.h',
+  'ac_shadowed_regs.c',
+  'ac_shadowed_regs.h',
 )
 
 libamd_common = static_library(
   'amd_common',
-  [amd_common_files, sid_tables_h, nir_opcodes_h],
-  include_directories : [inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi,
-                         inc_amd],
-  dependencies : [dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu,
-                  dep_valgrind],
-  c_args : [c_vis_args],
-  cpp_args : [cpp_vis_args],
+  [amd_common_files, sid_tables_h, amdgfxregs_h, gfx10_format_table_c],
+  include_directories : [
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_mapi, inc_amd,
+  ],
+  dependencies : [
+    dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
+    idep_nir_headers,
+  ],
+  gnu_symbol_visibility : 'hidden',
 )
+
+idep_amdgfxregs_h = declare_dependency(sources : [amdgfxregs_h])