etnaviv: isa: Rework meson dependency for libetnaviv_decode

Any component that links against libetnaviv_decode should not need to
take care if the generated isa files exists.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28176>
This commit is contained in:
Christian Gmeiner 2024-03-18 09:24:29 +01:00 committed by Marge Bot
parent f396899983
commit 1196b82815
3 changed files with 16 additions and 6 deletions

View file

@ -24,7 +24,7 @@ decode_files = [
'isa.h',
]
libetnaviv_decode = static_library(
_libetnaviv_decode = static_library(
'etnaviv_decode',
decode_files,
dependencies: [idep_mesautil, idep_isaspec_decode],
@ -35,10 +35,21 @@ libetnaviv_decode = static_library(
gnu_symbol_visibility: 'hidden',
)
idep_libetnaviv_decode = declare_dependency(
include_directories : [
include_directories('.'),
inc_include,
inc_src
],
link_with : _libetnaviv_decode,
dependencies: [idep_isaspec_decode],
sources : [etnaviv_isa],
)
disasm = executable(
'etnaviv-disasm',
['disasm.c'],
link_with: libetnaviv_decode,
dependencies: idep_libetnaviv_decode,
build_by_default: with_tools.contains('etnaviv'),
include_directories: [
inc_src,

View file

@ -7,8 +7,7 @@ test(
'etnaviv_isa_disasm',
executable(
'etnaviv_disasm', 'disasm.cpp',
link_with: [libetnaviv_decode],
include_directories: [inc_etnaviv, inc_src],
dependencies : [idep_gtest],
dependencies : [idep_gtest, idep_libetnaviv_decode],
)
)

View file

@ -117,8 +117,8 @@ libetnaviv = static_library(
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
],
link_with: [libetnaviv_drm, libetnaviv_decode],
dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
link_with: [libetnaviv_drm],
dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil, idep_libetnaviv_decode],
)
etnaviv_compiler = executable(