diff options
Diffstat (limited to 'src/panfrost/lib/meson.build')
| -rw-r--r-- | src/panfrost/lib/meson.build | 93 |
1 files changed, 42 insertions, 51 deletions
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 021c8b98393..3a7318cd51b 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -19,20 +19,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -pan_packers = custom_target( - 'midgard_pack.h', - input : ['gen_pack.py', 'midgard.xml'], - output : 'midgard_pack.h', - command : [prog_python, '@INPUT@'], - capture : true, -) - -idep_pan_packers = declare_dependency( - sources : [pan_packers], - include_directories : include_directories('.'), -) +subdir('genxml') +subdir('kmod') -pixel_format_versions = ['6', '7'] +pixel_format_versions = ['5', '6', '7', '9'] libpanfrost_pixel_format = [] foreach ver : pixel_format_versions @@ -40,43 +30,41 @@ 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', - dependencies : [idep_pan_packers, dep_libdrm], + dependencies : [idep_pan_packers, dep_libdrm, dep_valgrind], ) endforeach libpanfrost_per_arch = [] -libpanfrost_decode_per_arch = [] -foreach ver : ['4', '5', '6', '7'] +foreach ver : ['4', '5', '6', '7', '9', '10'] libpanfrost_per_arch += static_library( 'pan-arch-v' + ver, [ 'pan_blend.c', 'pan_blitter.c', - 'pan_cs.c', - 'pan_indirect_dispatch.c', - 'pan_indirect_draw.c', + 'pan_desc.c', '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], ) +endforeach - libpanfrost_decode_per_arch += static_library( - 'pandecode-arch-v' + ver, - ['decode.c', pan_packers], - include_directories : [inc_include, inc_src, inc_panfrost], - dependencies : [dep_libdrm, idep_pan_packers, idep_nir], - c_args : [no_override_init_args, '-DPAN_ARCH=' + ver], +foreach ver : ['7'] + libpanfrost_per_arch += static_library( + 'pan-arch-indirect-v' + ver, + 'pan_indirect_dispatch.c', + include_directories : [inc_include, inc_src, inc_panfrost_hw], + c_args : ['-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', - build_by_default : false, + dependencies : [dep_libdrm, idep_pan_packers, idep_nir], ) endforeach @@ -85,12 +73,12 @@ libpanfrost_lib_files = files( 'pan_afbc.c', 'pan_attributes.c', - 'pan_bo.c', 'pan_blend.c', 'pan_clear.c', + 'pan_earlyzs.c', 'pan_samples.c', 'pan_tiler.c', - 'pan_texture.c', + 'pan_layout.c', 'pan_scratch.c', 'pan_props.c', 'pan_util.c', @@ -99,32 +87,18 @@ 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], + dependencies: [dep_libdrm, idep_nir, idep_mesautil], build_by_default : false, - link_with: [libpanfrost_pixel_format, libpanfrost_per_arch], -) - -libpanfrost_decode = static_library( - 'panfrost_decode', - [ - 'decode_common.c', - pan_packers - ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost], - dependencies : idep_mesautil, - c_args : [no_override_init_args], - gnu_symbol_visibility : 'hidden', - build_by_default : false, - link_with: [libpanfrost_decode_per_arch], + link_with: [libpanfrost_pixel_format, libpanfrost_per_arch, libpankmod_lib], ) 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], - dependencies: [dep_libdrm, idep_nir, idep_pan_packers], + include_directories: [inc_include, inc_src, inc_panfrost_hw, inc_panfrost], + dependencies: [dep_libdrm, libpankmod_dep, idep_nir, idep_pan_packers], ) if with_tests @@ -135,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'], @@ -148,9 +122,26 @@ 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'], ) + + test( + 'panfrost_tests', + executable( + 'panfrost_tests', + files( + 'tests/test-earlyzs.cpp', + 'tests/test-layout.cpp', + ), + 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, libpanfrost_dep], + ), + suite : ['panfrost'], + protocol : 'gtest', + ) endif |