From d2229304dc3db575c1888f72a8c02b4380a464da Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Mon, 5 Jun 2023 04:22:34 +0800 Subject: [PATCH] panfrost/meson: remove redundant gallium include from meson files Signed-off-by: Yonggang Luo Reviewed-by: Erik Faye-Lund Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/compiler/meson.build | 6 +++--- src/panfrost/compiler/valhall/meson.build | 4 ++-- src/panfrost/lib/meson.build | 16 ++++++++-------- src/panfrost/meson.build | 4 ---- src/panfrost/midgard/meson.build | 8 -------- src/panfrost/perf/meson.build | 4 ---- src/panfrost/shared/meson.build | 4 ++-- src/panfrost/tools/meson.build | 4 ++-- src/panfrost/util/meson.build | 2 +- src/panfrost/vulkan/meson.build | 4 ---- 10 files changed, 18 insertions(+), 38 deletions(-) diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build index d7c82706d46..8d493c2cdef 100644 --- a/src/panfrost/compiler/meson.build +++ b/src/panfrost/compiler/meson.build @@ -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], ), diff --git a/src/panfrost/compiler/valhall/meson.build b/src/panfrost/compiler/valhall/meson.build index 7712b6ab1d6..38eeecf63be 100644 --- a/src/panfrost/compiler/valhall/meson.build +++ b/src/panfrost/compiler/valhall/meson.build @@ -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], ), diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 5d68dcbfb1f..3a7318cd51b 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -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'], diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index aa393d44fe5..dc657e6f7d4 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -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, diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build index 73dd2b0873e..1cb34bc8bbf 100644 --- a/src/panfrost/midgard/meson.build +++ b/src/panfrost/midgard/meson.build @@ -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, diff --git a/src/panfrost/perf/meson.build b/src/panfrost/perf/meson.build index 86b21ef25bb..d18a0142c5b 100644 --- a/src/panfrost/perf/meson.build +++ b/src/panfrost/perf/meson.build @@ -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, diff --git a/src/panfrost/shared/meson.build b/src/panfrost/shared/meson.build index d33161fd945..eb333ba3008 100644 --- a/src/panfrost/shared/meson.build +++ b/src/panfrost/shared/meson.build @@ -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], ), diff --git a/src/panfrost/tools/meson.build b/src/panfrost/tools/meson.build index 7cb892ba584..cf9caa78837 100644 --- a/src/panfrost/tools/meson.build +++ b/src/panfrost/tools/meson.build @@ -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 diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build index 74e920ba78e..557af34bbfe 100644 --- a/src/panfrost/util/meson.build +++ b/src/panfrost/util/meson.build @@ -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', diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index c7d3406c113..b8aef3ace3f 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -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],