From 5a785d51a6d68ec676cea6220f75bad95a3221dc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 30 Oct 2017 15:49:37 -0700 Subject: [PATCH] meson: build gallium va state tracker Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- meson.build | 41 ++++++++++++- meson_options.txt | 13 ++++ src/gallium/meson.build | 7 ++- src/gallium/state_trackers/va/meson.build | 39 ++++++++++++ src/gallium/targets/va/meson.build | 72 +++++++++++++++++++++++ 5 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/gallium/state_trackers/va/meson.build create mode 100644 src/gallium/targets/va/meson.build diff --git a/meson.build b/meson.build index 8f0ec75d80b..e7a199faccd 100644 --- a/meson.build +++ b/meson.build @@ -500,6 +500,44 @@ if with_gallium_omx ) endif +dep_va = [] +_va = get_option('gallium-va') +if _va == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_va = false + elif not with_platform_x11 + with_gallium_va = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + with_gallium_va = false + else + dep_va = dependency('libva', version : '>= 0.38.0', required : false) + with_gallium_va = dep_va.found() + endif +elif _va == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('VA state tracker can only be built on unix-like OSes.') + elif not (with_platform_x11 or with_platform_drm) + error('VA state tracker requires X11 or drm or wayland platform support.') + with_gallium_va = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + error('VA state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + endif + dep_va = dependency('libva', version : '>= 0.38.0') + with_gallium_va = true +else + with_gallium_va = false +endif +if with_gallium_va + dep_va = declare_dependency( + compile_args : dep_va.get_pkgconfig_variable('cflags').split() + ) +endif + +va_drivers_path = get_option('va-libs-path') +if va_drivers_path == '' + va_drivers_path = join_paths(get_option('libdir'), 'dri') +endif + gl_pkgconfig_c_flags = [] if with_platform_x11 if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') @@ -1030,7 +1068,8 @@ if with_platform_x11 dep_xxf86vm = dependency('xxf86vm', required : false) endif if with_any_vk or with_glx == 'dri' or - (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx) + (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx or + with_gallium_xa) dep_xcb = dependency('xcb') dep_x11_xcb = dependency('x11-xcb') endif diff --git a/meson_options.txt b/meson_options.txt index 51cf4ed6a5e..8dc9bb161ba 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -94,6 +94,19 @@ option( value : '', description : 'path to put omx libraries. defaults to omx-bellagio pkg-config pluginsdir.' ) +option( + 'gallium-va', + type : 'combo', + value : 'auto', + choices : ['auto', 'true', 'false'], + description : 'enable gallium va state tracker.', +) +option( + 'va-libs-path', + type : 'string', + value : '', + description : 'path to put va libraries. defaults to $libdir/dri.' +) option( 'vulkan-drivers', type : 'string', diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 990663f6de3..41c29127923 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -128,6 +128,9 @@ endif if with_gallium_omx subdir('state_trackers/omx_bellagio') endif +if with_gallium_va + subdir('state_trackers/va') +endif # TODO: SWR # TODO: clover if with_dri @@ -152,7 +155,9 @@ endif if with_gallium_omx subdir('targets/omx-bellagio') endif -# TODO: VA +if with_gallium_va + subdir('targets/va') +endif # TODO: xa # TODO: nine # TODO: tests diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build new file mode 100644 index 00000000000..56e68e9e28d --- /dev/null +++ b/src/gallium/state_trackers/va/meson.build @@ -0,0 +1,39 @@ +# Copyright © 2017 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +libva_version = ['2', '3', '0'] + +libva_st = static_library( + 'va_st', + files( + 'buffer.c', 'config.c', 'context.c', 'display.c', 'image.c', 'picture.c', + 'picture_mpeg12.c', 'picture_mpeg4.c', 'picture_h264.c', 'picture_hevc.c', + 'picture_vc1.c', 'picture_mjpeg.c', 'postproc.c', 'subpicture.c', + 'surface.c', + ), + c_args : [ + c_vis_args, + '-DVA_DRIVER_INIT_FUNC=__vaDriverInit_@0@_@1@'.format( + libva_version[0], libva_version[1] + ), + ], + include_directories : [inc_common], + dependencies : [dep_va, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], +) diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build new file mode 100644 index 00000000000..0ea0cd1c05a --- /dev/null +++ b/src/gallium/targets/va/meson.build @@ -0,0 +1,72 @@ +# Copyright © 2017 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# TODO: support non-static targets +# Static targets are always enabled in autotools (unless you modify +# configure.ac) + +va_deps = [] +va_link_args = [] +va_link_depends = [] +va_drivers = [] + +if with_ld_version_script + va_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'va.sym')] + va_link_depends += files('va.sym') +endif +if with_platform_x11 + va_deps += [dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3] +endif + +libva_gallium = shared_library( + 'gallium_drv_video', + 'target.c', + c_args : c_vis_args, + cpp_args : cpp_vis_args, + link_args : [va_link_args, ld_args_gc_sections], + include_directories : [ + inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + ], + link_with : [ + libva_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util, + libpipe_loader_static, libws_null, libwsw, + ], + dependencies : [ + dep_libdrm, dep_thread, va_deps, driver_r600, driver_radeonsi, driver_nouveau, + ], + link_depends : va_link_depends, + install : true, + install_dir : va_drivers_path, +) + +foreach d : [[with_gallium_r600, 'r600'], + [with_gallium_radeonsi, 'radeonsi'], + [with_gallium_nouveau, 'nouveau']] + if d[0] + va_drivers += '@0@_drv_video.so'.format(d[1]) + endif +endforeach + +meson.add_install_script( + join_paths(meson.source_root(), 'bin/install_megadrivers.py'), + libva_gallium.full_path(), + va_drivers_path, + va_drivers, +) -- 2.30.2