iris: Unreference some more things on state module teardown

[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 38021515eda67a732ec88c29612e6976082a5794..4f517ada9cd12b395a34da78173cb130d61f566f 100644 (file)
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -52,10 +52,11 @@ files_per_version = files(
   'v3dx_state.c',
 )
 
-v3dv3_c_args = []
-dep_v3dv3 = dependency('v3dv3')
+v3d_args = ['-DV3D_BUILD_NEON']
+
+dep_v3dv3 = dependency('v3dv3', required: false)
 if dep_v3dv3.found()
-  v3dv3_c_args = '-DUSE_V3D_SIMULATOR'
+  v3d_args += '-DUSE_V3D_SIMULATOR'
 endif
 
 v3d_versions = ['33', '41']
@@ -67,9 +68,9 @@ foreach ver : v3d_versions
     [files_per_version, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_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, v3dv3_c_args, '-DV3D_VERSION=' + ver],
+    c_args : [c_vis_args, v3d_args, '-DV3D_VERSION=' + ver],
     cpp_args : [cpp_vis_args],
     dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind],
 )
@@ -81,10 +82,10 @@ libv3d = static_library(
   [files_libv3d, 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, v3dv3_c_args],
-  cpp_args : [cpp_vis_args, v3dv3_c_args],
+  c_args : [c_vis_args, v3d_args],
+  cpp_args : [cpp_vis_args, v3d_args],
   dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
   link_with: per_version_libs,
 )