X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fmeson.build;h=1164a97fa9ac2a45d0fd1b0ac4653f9f738755ce;hb=c98e52f88a1b24b33b4e8b95f80cf5dbbe6d2d66;hp=97c7a4124446cb03b8696d4432d04e283b2713e0;hpb=2083a14179eb04d22feebc5751a1a145828d07cf;p=mesa.git

diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 97c7a412444..1164a97fa9a 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -21,40 +21,75 @@
 files_libradeonsi = files(
   'cik_sdma.c',
   'driinfo_radeonsi.h',
+  'gfx10_query.c',
+  'gfx10_shader_ngg.c',
   'si_blit.c',
+  'si_buffer.c',
+  'si_build_pm4.h',
   'si_clear.c',
   'si_compute.c',
+  'si_compute_prim_discard.c',
   'si_compute.h',
+  'si_compute_blit.c',
   'si_cp_dma.c',
   'si_debug.c',
   'si_descriptors.c',
-  'si_dma.c',
+  'si_dma_cs.c',
   'si_fence.c',
   'si_get.c',
-  'si_hw_context.c',
+  'si_gfx_cs.c',
+  'si_gpu_load.c',
+  'si_perfcounter.c',
   'si_pipe.c',
   'si_pipe.h',
   'si_pm4.c',
   'si_pm4.h',
-  'si_perfcounter.c',
   'si_public.h',
+  'si_query.c',
+  'si_query.h',
   'si_shader.c',
   'si_shader.h',
   'si_shader_internal.h',
+  'si_shader_llvm.c',
+  'si_shader_llvm_gs.c',
+  'si_shader_llvm_ps.c',
+  'si_shader_llvm_resources.c',
+  'si_shader_llvm_tess.c',
+  'si_shader_llvm_vs.c',
   'si_shader_nir.c',
-  'si_shader_tgsi_alu.c',
-  'si_shader_tgsi_mem.c',
-  'si_shader_tgsi_setup.c',
+  'si_shaderlib_tgsi.c',
   'si_state.c',
+  'si_state.h',
   'si_state_binning.c',
   'si_state_draw.c',
   'si_state_msaa.c',
   'si_state_shaders.c',
   'si_state_streamout.c',
   'si_state_viewport.c',
-  'si_state.h',
   'si_test_dma.c',
+  'si_test_dma_perf.c',
+  'si_texture.c',
   'si_uvd.c',
+  '../radeon/radeon_uvd.c',
+  '../radeon/radeon_uvd.h',
+  '../radeon/radeon_vcn_enc_1_2.c',
+  '../radeon/radeon_vcn_enc_2_0.c',
+  '../radeon/radeon_vcn_enc.c',
+  '../radeon/radeon_vcn_enc.h',
+  '../radeon/radeon_vcn_dec_jpeg.c',
+  '../radeon/radeon_vcn_dec.c',
+  '../radeon/radeon_vcn_dec.h',
+  '../radeon/radeon_uvd_enc_1_1.c',
+  '../radeon/radeon_uvd_enc.c',
+  '../radeon/radeon_uvd_enc.h',
+  '../radeon/radeon_vce_40_2_2.c',
+  '../radeon/radeon_vce_50.c',
+  '../radeon/radeon_vce_52.c',
+  '../radeon/radeon_vce.c',
+  '../radeon/radeon_vce.h',
+  '../radeon/radeon_video.c',
+  '../radeon/radeon_video.h',
+  '../radeon/radeon_winsys.h',
 )
 
 si_driinfo_h = custom_target(
@@ -64,7 +99,7 @@ si_driinfo_h = custom_target(
     '../../auxiliary/pipe-loader/driinfo_gallium.h', 'driinfo_radeonsi.h'
   ),
   output : 'si_driinfo.h',
-  command : [prog_python2, '@INPUT@'],
+  command : [prog_python, '@INPUT@'],
   capture : true,
 )
 
@@ -72,19 +107,19 @@ libradeonsi = static_library(
   'radeonsi',
   [files_libradeonsi, si_driinfo_h, sid_tables_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 : [c_vis_args],
-  cpp_args : [cpp_vis_args],
-  dependencies : [dep_llvm, idep_nir_headers],
+  c_args : ['-Wstrict-overflow=0'],
+  gnu_symbol_visibility : 'hidden',
+  dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h],
 )
 
 driver_radeonsi = declare_dependency(
   compile_args : '-DGALLIUM_RADEONSI',
   sources : si_driinfo_h,
   link_with : [
-    libradeonsi, libradeon, libradeonwinsys, libamdgpuwinsys, libamd_common,
+    libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm, libgalliumvl
   ],
   dependencies : idep_nir,
 )