fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/isa: Rework meson dependency for libir3decode

Browse source 
Any component that links against libir3decode 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:21:35 +01:00 • committed by Marge Bot
parent 505ec13f87
commit f396899983
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/ir3/meson.build
View file

@ -138,8 +138,8 @@ libfreedreno_ir3 = static_library(
include_directories : [inc_freedreno, inc_include, inc_src],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
link_with: [libir3decode, libir3encode, libfreedreno_common],
dependencies : [idep_nir_headers, dep_dl, idep_mesautil],
link_with: [libir3encode, libfreedreno_common],
dependencies : [idep_libir3decode, idep_nir_headers, dep_dl, idep_mesautil],
build_by_default : false,
)
@ -148,8 +148,8 @@ test('ir3_disasm',
'ir3_disasm',
'tests/disasm.c',
link_args : [ld_args_build_id],
link_with: [libfreedreno_ir3, libir3decode],
dependencies: [idep_mesautil, idep_nir],
link_with: [libfreedreno_ir3],
dependencies: [idep_libir3decode, idep_mesautil, idep_nir],
include_directories: [inc_freedreno, inc_include, inc_src],
),
suite: ['freedreno'],

15
src/freedreno/isa/meson.build
View file

@ -47,7 +47,7 @@ decode_files = [
'isa.h',
]
libir3decode = static_library(
_libir3decode = static_library(
'ir3decode',
decode_files,
dependencies: [idep_mesautil, idep_isaspec_decode],
@ -58,10 +58,21 @@ libir3decode = static_library(
gnu_symbol_visibility: 'hidden',
)
idep_libir3decode = declare_dependency(
include_directories : [
include_directories('.'),
inc_include,
inc_src
],
link_with : _libir3decode,
dependencies: [idep_isaspec_decode],
sources : [ir3_isa],
)
ir3disasm = executable(
'ir3-disasm',
['ir3-disasm.c'],
link_with: libir3decode,
dependencies: [idep_libir3decode],
build_by_default: with_tools.contains('freedreno'),
include_directories: [
inc_src,