mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-06 17:30:20 +01:00
meson: add missing dependency
Now that renderonly.h includes util/simple_mtx.h, which itself includes
valgrind.h, dep_valgrind is required by any module that includes
renderonly.h.
In file included from ../src/gallium/auxiliary/renderonly/renderonly.h:33,
from ../src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c:39:
../src/util/simple_mtx.h:34:12: fatal error: valgrind.h: No such file or directory
34 | # include <valgrind.h>
| ^~~~~~~~~~~~
compilation terminated.
dep_valgrind is part of idep_mesautil, which should be used instead of
copying the list of deps for each util header included (which would
have to be updated every time a util header changes its own includes),
so let's add idep_mesautil everywhere that includes renderonly.h.
Fixes: ad4d7ca833 ("kmsro: Fix renderonly_scanout BO aliasing")
Tested-by: Asahi Lina <lina@asahilina.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20530>
(cherry picked from commit aab4a260db)
This commit is contained in:
parent
eab2bbe291
commit
32e567d411
8 changed files with 14 additions and 8 deletions
|
|
@ -1849,7 +1849,7 @@
|
|||
"description": "meson: add missing dependency",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "ad4d7ca8332488be8a75aff001f00306a9f6402e"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ libasahi = static_library(
|
|||
include_directories : [inc_gallium_aux, inc_gallium, inc_include, inc_src],
|
||||
c_args : [c_msvc_compat_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [idep_nir, idep_agx_pack],
|
||||
dependencies : [idep_nir, idep_mesautil, idep_agx_pack],
|
||||
)
|
||||
|
||||
driver_asahi = declare_dependency(
|
||||
|
|
|
|||
|
|
@ -94,7 +94,10 @@ libv3d = static_library(
|
|||
c_args : [v3d_args],
|
||||
cpp_args : [v3d_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
|
||||
dependencies : [
|
||||
dep_v3dv3, dep_libdrm, dep_valgrind,
|
||||
idep_nir_headers, idep_mesautil,
|
||||
],
|
||||
link_with: [per_version_libs],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,10 @@ libvc4 = static_library(
|
|||
link_with: libvc4_neon,
|
||||
c_args : [vc4_c_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_simpenrose, dep_libdrm, dep_valgrind, idep_nir_headers],
|
||||
dependencies : [
|
||||
dep_simpenrose, dep_libdrm, dep_valgrind,
|
||||
idep_nir_headers, idep_mesautil,
|
||||
],
|
||||
build_by_default : false,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -26,5 +26,5 @@ libasahiwinsys = static_library(
|
|||
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies: dep_libdrm,
|
||||
dependencies: [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ libkmsrowinsys = static_library(
|
|||
],
|
||||
c_args : [kmsro_c_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies: dep_libdrm,
|
||||
dependencies: [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_kmsro = declare_dependency(
|
||||
|
|
|
|||
|
|
@ -26,5 +26,5 @@ libpanfrostwinsys = static_library(
|
|||
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies: dep_libdrm,
|
||||
dependencies: [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ libpanfrost_lib = static_library(
|
|||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
|
||||
c_args : [no_override_init_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies: [dep_libdrm, idep_nir],
|
||||
dependencies: [dep_libdrm, idep_nir, idep_mesautil],
|
||||
build_by_default : false,
|
||||
link_with: [libpanfrost_pixel_format, libpanfrost_per_arch],
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue