meson: use gnu_symbol_visibility argument

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

diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build
index 9fd80a2e3e536d7149d4f6c7dfbbe8d3193cb275..64e6cb0789afd1ec37bda777fc1f8d476bf018cf 100644 (file)
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -37,8 +37,6 @@ files_libv3d = files(
   'v3d_screen.h',
   'v3d_simulator.c',
   'v3d_simulator_wrapper.cpp',
-  'v3d_tiling.c',
-  'v3d_tiling.h',
   'v3d_uniforms.c',
 )
 
@@ -52,6 +50,16 @@ files_per_version = files(
   'v3dx_state.c',
 )
 
+v3d_driinfo_h = custom_target(
+  'v3d_driinfo.h',
+  input : files(
+    '../../../util/merge_driinfo.py',
+    '../../auxiliary/pipe-loader/driinfo_gallium.h', 'driinfo_v3d.h'
+  ),
+  output : 'v3d_driinfo.h',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
+)
 v3d_args = ['-DV3D_BUILD_NEON']
 
 dep_v3dv3 = dependency('v3dv3', required: false)
@@ -65,33 +73,56 @@ per_version_libs = []
 foreach ver : v3d_versions
   per_version_libs += static_library(
     'v3d-v' + ver,
-    [files_per_version, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
+    [files_per_version, v3d_xml_pack],
     include_directories : [
       inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
-      inc_gallium_drivers, inc_drm_uapi,
+      inc_gallium_drivers,
     ],
-    c_args : [c_vis_args, v3d_args, '-DV3D_VERSION=' + ver],
-    cpp_args : [cpp_vis_args],
-    dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind],
+    c_args : [v3d_args, '-DV3D_VERSION=' + ver],
+    gnu_symbol_visibility : 'hidden',
+    dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
 )
 
 endforeach
 
+v3d_neon_c_args = []
+if host_machine.cpu_family() == 'arm'
+    v3d_neon_c_args = '-mfpu=neon'
+endif
+
+libv3d_neon = static_library(
+  'v3d_neon',
+  'v3d_tiling.c',
+  include_directories : [
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
+    inc_gallium_drivers,
+  ],
+  c_args : [v3d_args, v3d_neon_c_args],
+  gnu_symbol_visibility : 'hidden',
+  dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
+)
+
 libv3d = static_library(
   'v3d',
-  [files_libv3d, v3d_xml_pack],
+  [
+    files_libv3d,
+    v3d_xml_pack,
+    v3d_driinfo_h
+  ],
   include_directories : [
     inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
-    inc_gallium_drivers, inc_drm_uapi,
+    inc_gallium_drivers,
   ],
-  c_args : [c_vis_args, v3d_args],
-  cpp_args : [cpp_vis_args, v3d_args],
+  c_args : [v3d_args],
+  cpp_args : [v3d_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
-  link_with: per_version_libs,
+  link_with: [per_version_libs, libv3d_neon],
 )
 
 driver_v3d = declare_dependency(
   compile_args : '-DGALLIUM_V3D',
   link_with : [libv3d, libv3dwinsys, libbroadcom_cle, libbroadcom_v3d],
+  sources : v3d_driinfo_h,
   dependencies : idep_nir,
 )