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

panfrost/meson: remove redundant gallium include from meson files

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24439>
This commit is contained in:
Yonggang Luo 2023-06-05 04:22:34 +08:00 • committed by Marge Bot
parent 13ce0358b0
commit d2229304dc
10 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/panfrost/compiler/meson.build
View file

@ -136,7 +136,7 @@ bifrost_nir_algebraic_c = custom_target(
libpanfrost_bifrost_disasm = static_library(
'panfrost_bifrost_disasm',
['bifrost/disassemble.c', 'bi_print_common.c', bifrost_gen_disasm_c],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
include_directories : [inc_include, inc_src, inc_panfrost_hw],
dependencies: [idep_nir],
link_with: [libpanfrost_util],
c_args : [no_override_init_args],
@ -147,7 +147,7 @@ libpanfrost_bifrost_disasm = static_library(
libpanfrost_bifrost = static_library(
'panfrost_bifrost',
[libpanfrost_bifrost_files, bi_opcodes_c, bi_printer_c, bi_packer_c, bifrost_nir_algebraic_c, valhall_c],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw, inc_valhall],
include_directories : [inc_include, inc_src, inc_panfrost_hw, inc_valhall],
dependencies: [idep_nir, idep_bi_opcodes_h, idep_bi_builder_h, idep_valhall_enums_h],
link_with: [libpanfrost_util, libpanfrost_bifrost_disasm, libpanfrost_valhall_disasm],
c_args : [no_override_init_args],
@ -180,7 +180,7 @@ if with_tests
),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa, inc_valhall],
include_directories : [inc_include, inc_src, inc_valhall],
dependencies: [idep_gtest, idep_nir, idep_bi_opcodes_h, idep_bi_builder_h, idep_valhall_enums_h],
link_with : [libpanfrost_bifrost],
),

4
src/panfrost/compiler/valhall/meson.build
View file

@ -54,7 +54,7 @@ valhall_disasm_c = custom_target(
libpanfrost_valhall_disasm = static_library(
'panfrost_valhall_disasm',
valhall_disasm_c,
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
@ -68,7 +68,7 @@ if with_tests
files('test/test-disassembler.c'),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
dependencies: [idep_valhall_enums_h],
link_with : [libpanfrost_valhall_disasm],
),

16
src/panfrost/lib/meson.build
View file

@ -30,7 +30,7 @@ foreach ver : pixel_format_versions
'pan-format-v' + ver,
['pan_format.c', pan_packers],
include_directories : [
inc_src, inc_include, inc_gallium, inc_mesa, inc_panfrost_hw, inc_gallium_aux, inc_panfrost_hw
inc_src, inc_include, inc_panfrost_hw, inc_panfrost_hw
],
c_args : ['-DPAN_ARCH=' + ver],
gnu_symbol_visibility : 'hidden',
@ -50,7 +50,7 @@ foreach ver : ['4', '5', '6', '7', '9', '10']
'pan_shader.c',
'pan_texture.c',
],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
include_directories : [inc_include, inc_src, inc_panfrost_hw],
c_args : ['-DPAN_ARCH=' + ver],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, idep_pan_packers, idep_nir],
@ -61,7 +61,7 @@ foreach ver : ['7']
libpanfrost_per_arch += static_library(
'pan-arch-indirect-v' + ver,
'pan_indirect_dispatch.c',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
include_directories : [inc_include, inc_src, inc_panfrost_hw],
c_args : ['-DPAN_ARCH=' + ver],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, idep_pan_packers, idep_nir],
@ -87,7 +87,7 @@ libpanfrost_lib_files = files(
libpanfrost_lib = static_library(
'panfrost_lib',
[libpanfrost_lib_files, pan_packers],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
include_directories : [inc_include, inc_src, inc_panfrost_hw],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
dependencies: [dep_libdrm, idep_nir, idep_mesautil],
@ -97,7 +97,7 @@ libpanfrost_lib = static_library(
libpanfrost_dep = declare_dependency(
link_with: [libpanfrost_lib, libpanfrost_decode, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_pixel_format, libpanfrost_per_arch],
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw, inc_panfrost],
include_directories: [inc_include, inc_src, inc_panfrost_hw, inc_panfrost],
dependencies: [dep_libdrm, libpankmod_dep, idep_nir, idep_pan_packers],
)
@ -109,7 +109,7 @@ if with_tests
files('tests/test-blend.c'),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
dependencies: [libpanfrost_dep],
),
suite : ['panfrost'],
@ -122,7 +122,7 @@ if with_tests
files('tests/test-clear.c'),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
dependencies: [libpanfrost_dep],
),
suite : ['panfrost'],
@ -138,7 +138,7 @@ if with_tests
),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa, inc_panfrost, inc_gallium],
include_directories : [inc_include, inc_src, inc_panfrost],
dependencies: [idep_gtest, libpanfrost_dep],
),
suite : ['panfrost'],

4
src/panfrost/meson.build
View file

@ -49,10 +49,6 @@ bifrost_compiler = executable(
'bifrost_compiler',
[files_bifrost],
include_directories : [
inc_mapi,
inc_mesa,
inc_gallium,
inc_gallium_aux,
inc_include,
inc_src,
inc_panfrost,

8
src/panfrost/midgard/meson.build
View file

@ -59,10 +59,6 @@ libpanfrost_midgard_disasm = static_library(
'panfrost_midgard_disasm',
['disassemble.c', 'midgard_ops.c', 'midgard_print_constant.c'],
include_directories : [
inc_mapi,
inc_mesa,
inc_gallium,
inc_gallium_aux,
inc_include,
inc_src,
inc_panfrost_hw,
@ -76,10 +72,6 @@ libpanfrost_midgard = static_library(
'panfrost_midgard',
[libpanfrost_midgard_files, midgard_nir_algebraic_c],
include_directories : [
inc_mapi,
inc_mesa,
inc_gallium,
inc_gallium_aux,
inc_include,
inc_src,
inc_panfrost_hw,

4
src/panfrost/perf/meson.build
View file

@ -60,10 +60,6 @@ panfrost_quick = executable(
'panquick',
'quick.c',
include_directories : [
inc_mapi,
inc_mesa,
inc_gallium,
inc_gallium_aux,
inc_include,
inc_src,
inc_panfrost,

4
src/panfrost/shared/meson.build
View file

@ -30,7 +30,7 @@ libpanfrost_shared_files = files(
libpanfrost_shared = static_library(
'panfrost_shared',
[libpanfrost_shared_files],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
include_directories : [inc_include, inc_src],
dependencies : idep_mesautil,
c_args : [no_override_init_args, '-O3'],
gnu_symbol_visibility : 'hidden',
@ -47,7 +47,7 @@ if with_tests
),
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa, inc_panfrost, inc_gallium],
include_directories : [inc_include, inc_src, inc_panfrost],
dependencies: [idep_gtest],
link_with : [libpanfrost_shared],
),

4
src/panfrost/tools/meson.build
View file

@ -23,7 +23,7 @@ coredumpdec = executable(
files('panfrostdump.c'),
c_args : [c_msvc_compat_args, no_override_init_args, compile_args_panfrost],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
dependencies: [libpanfrost_dep],
build_by_default : true,
install: true
@ -34,7 +34,7 @@ panfrost_texfeatures = executable(
files('panfrost_texfeatures.c'),
c_args : [c_msvc_compat_args, no_override_init_args, compile_args_panfrost],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mesa],
include_directories : [inc_include, inc_src],
dependencies: [libpanfrost_dep],
build_by_default : true,
install: true

2
src/panfrost/util/meson.build
View file

@ -38,7 +38,7 @@ libpanfrost_util_files = files(
libpanfrost_util = static_library(
'panfrost_util',
[libpanfrost_util_files],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
include_directories : [inc_include, inc_src, inc_panfrost_hw],
dependencies: [idep_nir],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',

4
src/panfrost/vulkan/meson.build
View file

@ -75,8 +75,6 @@ foreach arch : ['6', '7']
include_directories : [
inc_include,
inc_src,
inc_gallium, # XXX: util/format/u_formats.h
inc_gallium_aux, # XXX: renderonly
inc_panfrost,
],
dependencies : [
@ -109,8 +107,6 @@ libvulkan_panfrost = shared_library(
include_directories : [
inc_include,
inc_src,
inc_gallium, # XXX: util/format/u_formats.h
inc_gallium_aux, # XXX: renderonly
inc_panfrost,
],
link_whole : [panvk_per_arch_libs],