From e05415a82e63bd96473171bf816175b3b190645c Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 6 Jun 2024 16:09:00 +0100 Subject: format: Generate endian-independent format aliases Instead of having a hardcoded list of endian-independent format aliases in the header, generate them from the format definitions. Signed-off-by: Daniel Stone Part-of: --- src/panfrost/lib/genxml/meson.build | 2 +- src/panfrost/lib/meson.build | 10 ++++++---- src/panfrost/midgard/meson.build | 3 ++- src/panfrost/shared/meson.build | 2 +- src/panfrost/util/meson.build | 2 +- src/panfrost/vulkan/meson.build | 1 + 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src/panfrost') diff --git a/src/panfrost/lib/genxml/meson.build b/src/panfrost/lib/genxml/meson.build index 5845786c0cf..1243a138ba5 100644 --- a/src/panfrost/lib/genxml/meson.build +++ b/src/panfrost/lib/genxml/meson.build @@ -25,7 +25,7 @@ foreach ver : ['4', '5', '6', '7', '9', '10'] 'pandecode-arch-v' + ver, ['decode.c', 'decode_jm.c', 'decode_csf.c', pan_packers], include_directories : [inc_include, inc_src, inc_panfrost], - dependencies : [dep_libdrm, idep_pan_packers, idep_nir], + dependencies : [dep_libdrm, idep_pan_packers, idep_nir, idep_mesautil], c_args : [no_override_init_args, '-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', build_by_default : false, diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 719ef0e4e76..04c8f22dd14 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -8,6 +8,8 @@ subdir('kmod') pixel_format_versions = ['5', '6', '7', '9', '10'] libpanfrost_pixel_format = [] +deps_for_libpanfrost = [dep_libdrm, idep_pan_packers, idep_mesautil] + foreach ver : pixel_format_versions libpanfrost_pixel_format += static_library( 'pan-format-v' + ver, @@ -17,7 +19,7 @@ foreach ver : pixel_format_versions ], c_args : ['-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', - dependencies : [idep_pan_packers, dep_libdrm, dep_valgrind], + dependencies : [deps_for_libpanfrost, dep_valgrind], ) endforeach @@ -36,7 +38,7 @@ foreach ver : ['4', '5', '6', '7', '9', '10'] 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], + dependencies : [deps_for_libpanfrost, idep_nir], ) endforeach @@ -47,7 +49,7 @@ foreach ver : ['7'] 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], + dependencies : [deps_for_libpanfrost, idep_nir], ) endforeach @@ -82,7 +84,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_panfrost_hw, inc_panfrost], - dependencies: [dep_libdrm, libpankmod_dep, idep_nir, idep_pan_packers], + dependencies: [deps_for_libpanfrost, libpankmod_dep, idep_nir], ) if with_tests diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build index ce5d0af52a4..d060754674a 100644 --- a/src/panfrost/midgard/meson.build +++ b/src/panfrost/midgard/meson.build @@ -60,7 +60,8 @@ libpanfrost_midgard = static_library( inc_panfrost_hw, ], dependencies: [ - idep_nir + idep_nir, + idep_mesautil, ], link_with: [libpanfrost_util, libpanfrost_midgard_disasm], c_args : [no_override_init_args], diff --git a/src/panfrost/shared/meson.build b/src/panfrost/shared/meson.build index 432a3630f91..ba3eb86e65c 100644 --- a/src/panfrost/shared/meson.build +++ b/src/panfrost/shared/meson.build @@ -31,7 +31,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_panfrost], - dependencies: [idep_gtest], + dependencies: [idep_gtest, idep_mesautil], link_with : [libpanfrost_shared], ), suite : ['panfrost'], diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build index 2df515cdd45..e4b87f0527d 100644 --- a/src/panfrost/util/meson.build +++ b/src/panfrost/util/meson.build @@ -23,7 +23,7 @@ libpanfrost_util = static_library( 'panfrost_util', [libpanfrost_util_files], include_directories : [inc_include, inc_src, inc_panfrost_hw], - dependencies: [idep_nir], + dependencies: [idep_nir, idep_mesautil], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', build_by_default : false, diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 8395bf66485..f747648538b 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -118,6 +118,7 @@ foreach arch : [6, 7, 9, 10] idep_vulkan_util_headers, idep_vulkan_runtime_headers, idep_vulkan_wsi_headers, + idep_mesautil, dep_libdrm, dep_valgrind, ], -- cgit v1.2.3