Module: Mesa Branch: main Commit: 8fa16452ba9257a2f246c159bfae59c351e412a6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fa16452ba9257a2f246c159bfae59c351e412a6
Author: Yonggang Luo <[email protected]> Date: Fri Dec 8 05:31:26 2023 +0800 broadcom/compiler: remove include of gallium headers from meson.build Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Alejandro Piñeiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26579> --- src/broadcom/cle/meson.build | 2 +- src/broadcom/compiler/meson.build | 2 +- src/broadcom/drm-shim/meson.build | 4 ++-- src/broadcom/meson.build | 4 ++-- src/broadcom/qpu/meson.build | 4 ++-- src/broadcom/simulator/meson.build | 4 ++-- src/broadcom/vulkan/meson.build | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build index 9fb786803e1..e74bd6a51ab 100644 --- a/src/broadcom/cle/meson.build +++ b/src/broadcom/cle/meson.build @@ -59,7 +59,7 @@ endif libbroadcom_cle = static_library( 'broadcom_cle', ['v3d_decoder.c', v3d_xml_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom], + include_directories : [inc_include, inc_src, inc_broadcom], c_args : [no_override_init_args, expat_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, dep_expat, dep_zlib], diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build index 4f696fd5aff..d5aafb3879e 100644 --- a/src/broadcom/compiler/meson.build +++ b/src/broadcom/compiler/meson.build @@ -47,7 +47,7 @@ libbroadcom_compiler_files = files( libbroadcom_compiler = static_library( 'broadcom_compiler', [libbroadcom_compiler_files, v3d_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom], + include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_broadcom], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers], diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build index a5636c8827a..212c0287aa8 100644 --- a/src/broadcom/drm-shim/meson.build +++ b/src/broadcom/drm-shim/meson.build @@ -21,7 +21,7 @@ libvc4_noop_drm_shim = shared_library( 'vc4_noop_drm_shim', 'vc4_noop.c', - include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories: [inc_include, inc_src], dependencies: dep_drm_shim, gnu_symbol_visibility : 'hidden', install : true, @@ -30,7 +30,7 @@ libvc4_noop_drm_shim = shared_library( libv3d_noop_drm_shim = shared_library( 'v3d_noop_drm_shim', 'v3d_noop.c', - include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories: [inc_include, inc_src], dependencies: dep_drm_shim, gnu_symbol_visibility : 'hidden', install : true, diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build index 30eb57e515f..aa03d34096f 100644 --- a/src/broadcom/meson.build +++ b/src/broadcom/meson.build @@ -43,7 +43,7 @@ foreach ver : v3d_versions files('clif/v3dx_dump.c'), v3d_xml_pack ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom], + include_directories : [inc_include, inc_src, inc_broadcom], c_args : [no_override_init_args, '-DV3D_VERSION=' + ver], gnu_symbol_visibility : 'hidden', dependencies: [dep_valgrind, dep_thread], @@ -74,7 +74,7 @@ libbroadcom_v3d = static_library( files('common/v3d_debug.c', 'common/v3d_device_info.c', 'clif/clif_dump.c', 'common/v3d_util.c'), v3d_xml_pack, ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom], + include_directories : [inc_include, inc_src, inc_broadcom], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', link_whole : v3d_libs + per_version_libs, diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build index cfb929cb859..fefc6a5cc56 100644 --- a/src/broadcom/qpu/meson.build +++ b/src/broadcom/qpu/meson.build @@ -27,7 +27,7 @@ libbroadcom_qpu_files = files( libbroadcom_qpu = static_library( 'broadcom_qpu', [libbroadcom_qpu_files, v3d_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom], + include_directories : [inc_include, inc_src, inc_broadcom], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind], @@ -42,7 +42,7 @@ test( 'qpu_disasm', 'tests/qpu_disasm.c', link_with: libbroadcom_qpu, dependencies : idep_mesautil, - include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux] + include_directories: [inc_include, inc_src] ), suite : ['broadcom'], ) diff --git a/src/broadcom/simulator/meson.build b/src/broadcom/simulator/meson.build index f5d832348bd..49b15288698 100644 --- a/src/broadcom/simulator/meson.build +++ b/src/broadcom/simulator/meson.build @@ -40,7 +40,7 @@ foreach ver : v3d_versions 'v3d-simulator-v' + ver, [files_per_version, v3d_xml_pack], include_directories : [ - inc_src, inc_include, inc_gallium_aux, inc_broadcom, + inc_src, inc_include, inc_broadcom, ], c_args : [v3d_args, '-DV3D_VERSION=' + ver], gnu_symbol_visibility: 'hidden', @@ -51,7 +51,7 @@ endforeach libbroadcom_simulator = static_library( 'broadcom_simulator', [libbroadcom_simulator_files], - include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux], + include_directories : [inc_src, inc_include], c_args : [v3d_args, no_override_init_args], cpp_args : [v3d_args], gnu_symbol_visibility : 'hidden', diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build index 3605e096599..74495831716 100644 --- a/src/broadcom/vulkan/meson.build +++ b/src/broadcom/vulkan/meson.build @@ -111,7 +111,7 @@ foreach ver : v3d_versions 'v3dv-v' + ver, [files_per_version, v3d_xml_pack, v3dv_entrypoints[0]], include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, + inc_src, inc_include, inc_broadcom, inc_util, ], c_args : [v3dv_flags, '-DV3D_VERSION=' + ver], @@ -124,7 +124,7 @@ libvulkan_broadcom = shared_library( 'vulkan_broadcom', [libv3dv_files, v3dv_entrypoints, sha1_h], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_util, + inc_include, inc_src, inc_broadcom, inc_util, ], link_with : [ libbroadcom_cle,
