util: Add helgrind support for simple_mtx

Annoyingly mtypes.h pulls in simple_mtx, which means we end up needing
to sprinkle a lot of idep_mesautil around.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3773
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7644>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
index c8a19f2bbfd..d2d063a8cc1 100644
--- a/src/mesa/drivers/dri/common/meson.build
+++ b/src/mesa/drivers/dri/common/meson.build
@@ -25,7 +25,7 @@ libdricommon = static_library(
   files('utils.c', 'utils.h', 'dri_util.c', 'dri_util.h'),
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util],
   gnu_symbol_visibility : 'hidden',
-  dependencies : dep_libdrm,
+  dependencies : [dep_libdrm, idep_mesautil],
   build_by_default : false,
 )
 
diff --git a/src/mesa/drivers/dri/i915/meson.build b/src/mesa/drivers/dri/i915/meson.build
index 7910278fd92..3e9c3ab4dde 100644
--- a/src/mesa/drivers/dri/i915/meson.build
+++ b/src/mesa/drivers/dri/i915/meson.build
@@ -90,5 +90,5 @@ libi915 = static_library(
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
-  dependencies : [dep_libdrm, dep_libdrm_intel],
+  dependencies : [dep_libdrm, dep_libdrm_intel, idep_mesautil],
 )
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 68459b1111a..f4bdb38ca15 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -142,7 +142,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '110']
       '-DGEN_VERSIONx10=@0@'.format(v),
     ],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [dep_libdrm, idep_nir_headers],
+    dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
   )
 endforeach
 
diff --git a/src/mesa/drivers/dri/nouveau/meson.build b/src/mesa/drivers/dri/nouveau/meson.build
index 3a7de03f6cf..e2c2ad9574d 100644
--- a/src/mesa/drivers/dri/nouveau/meson.build
+++ b/src/mesa/drivers/dri/nouveau/meson.build
@@ -84,5 +84,5 @@ libnouveau_vieux = static_library(
   files_nouveau_vieux,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   gnu_symbol_visibility : 'hidden',
-  dependencies : [dep_libdrm, dep_libdrm_nouveau],
+  dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil],
 )
diff --git a/src/mesa/drivers/dri/r200/meson.build b/src/mesa/drivers/dri/r200/meson.build
index aea7c1eded8..6dfad43cd6a 100644
--- a/src/mesa/drivers/dri/r200/meson.build
+++ b/src/mesa/drivers/dri/r200/meson.build
@@ -84,5 +84,5 @@ libr200 = static_library(
   ],
   c_args : ['-DRADEON_R200'],
   gnu_symbol_visibility : 'hidden',
-  dependencies : [dep_libdrm, dep_libdrm_radeon],
+  dependencies : [dep_libdrm, dep_libdrm_radeon, idep_mesautil],
 )
diff --git a/src/mesa/drivers/dri/radeon/meson.build b/src/mesa/drivers/dri/radeon/meson.build
index 5618dac42f7..13dcf149436 100644
--- a/src/mesa/drivers/dri/radeon/meson.build
+++ b/src/mesa/drivers/dri/radeon/meson.build
@@ -80,5 +80,5 @@ libr100 = static_library(
   ],
   c_args : ['-DRADEON_R100'],
   gnu_symbol_visibility : 'hidden',
-  dependencies : [dep_libdrm, dep_libdrm_radeon],
+  dependencies : [dep_libdrm, dep_libdrm_radeon, idep_mesautil],
 )