Both this and the va state tracker seem to just install a
libgallium*.so file, but don't actually install the megadriver-esque
links for the hardware-specific driver (e.g. radeonsi_drv_video.so and
libvdpau_radeonsi*).
When I copy the VA driver over my old auto-tools one, I get a libva
initialization error:
libva error: /usr/local/lib/dri/radeonsi_drv_video.so has no function
__vaDriverInit_0_32
So the state trackers seem to be building, but there's still work to
do.
--Aaron
On Wed, 2017-11-01 at 15:49 -0700, Dylan Baker wrote:
> ---
> meson.build | 40 ++++++++++++-
> meson_options.txt | 13 +++++
> src/gallium/meson.build | 7 ++-
> src/gallium/state_trackers/vdpau/meson.build | 32 ++++++++++
> src/gallium/targets/vdpau/meson.build | 87
> ++++++++++++++++++++++++++++
> 5 files changed, 177 insertions(+), 2 deletions(-)
> create mode 100644 src/gallium/state_trackers/vdpau/meson.build
> create mode 100644 src/gallium/targets/vdpau/meson.build
>
> diff --git a/meson.build b/meson.build
> index f5b2102fb0e..d269047308c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -296,6 +296,43 @@ if with_dri or with_gallium
> endif
> endif
>
> +dep_vdpau = []
> +_vdpau = get_option('gallium-vdpau')
> +if _vdpau == 'auto'
> + if not ['linux', 'bsd'].contains(host_machine.system())
> + with_gallium_vdpau = false
> + elif not with_platform_x11
> + with_gallium_vdpau = false
> + elif not (with_gallium_r300 or with_gallium_r600 or
> with_gallium_radeonsi or
> + with_gallium_nouveau)
> + with_gallium_vdpau = false
> + else
> + dep_vdpau = dependency('vdpau', version : '>= 1.1', required :
> false)
> + with_gallium_vdpau = dep_vdpau.found()
> + endif
> +elif _vdpau == 'true'
> + if not ['linux', 'bsd'].contains(host_machine.system())
> + error('VDPAU state tracker can only be build on unix-like
> OSes.')
> + elif not with_platform_x11
> + error('VDPAU state tracker requires X11 support.')
> + with_gallium_vdpau = false
> + elif not (with_gallium_r300 or with_gallium_r600 or
> with_gallium_radeonsi or
> + with_gallium_nouveau)
> + error('VDPAU state tracker requires at least one of the
> following gallium drivers: r300, r600, radeonsi, nouveau.')
> + endif
> + dep_vdpau = dependency('vdpau', version : '>= 1.1')
> +else
> + with_gallium_vdpau = false
> +endif
> +
> +if with_gallium_vdpau
> + pre_args += '-DHAVE_ST_VDPAU'
> +endif
> +vdpau_drivers_path = get_option('vdpau-libs-path')
> +if vdpau_drivers_path == ''
> + vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau')
> +endif
> +
> gl_pkgconfig_c_flags = []
> if with_platform_x11
> if with_any_vk or (with_glx == 'dri' and with_dri_platform ==
> 'drm')
> @@ -802,7 +839,8 @@ if with_platform_x11
> dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
> dep_xxf86vm = dependency('xxf86vm', required : false)
> endif
> - if with_any_vk or (with_glx == 'dri' and with_dri_platform ==
> 'drm')
> + if (with_any_vk or (with_glx == 'dri' and with_dri_platform ==
> 'drm') or
> + with_gallium_vdpau)
> dep_xcb = dependency('xcb')
> dep_x11_xcb = dependency('x11-xcb')
> dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
> diff --git a/meson_options.txt b/meson_options.txt
> index dabaad48505..6cb27301bb1 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -49,6 +49,19 @@ option(
> value :
> 'pl111,radeonsi,nouveau,freedreno,swrast,vc4,etnaviv,imx,r300,r600,sv
> ga,virgl',
> description : 'comma separated list of gallium drivers to build.'
> )
> +option(
> + 'gallium-vdpau',
> + type : 'combo',
> + value : 'auto',
> + choices : ['auto', 'true', 'false'],
> + description : 'enable gallium vdpau state tracker.',
> +)
> +option(
> + 'vdpau-libs-path',
> + type : 'string',
> + value : '',
> + description : 'path to put vdpau libraries. defaults to
> $libdir/vdpau.'
> +)
> option(
> 'vulkan-drivers',
> type : 'string',
> diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> index b9f9624c364..89c74ee23a6 100644
> --- a/src/gallium/meson.build
> +++ b/src/gallium/meson.build
> @@ -95,6 +95,9 @@ subdir('state_trackers/dri')
> if with_osmesa == 'gallium'
> subdir('state_trackers/osmesa')
> endif
> +if with_gallium_vdpau
> + subdir('state_trackers/vdpau')
> +endif
> # TODO: SWR
> # TODO: virgl
> # TODO: winsys/sw/xlib
> @@ -105,10 +108,12 @@ endif
> if with_osmesa == 'gallium'
> subdir('targets/osmesa')
> endif
> +if with_gallium_vdpau
> + subdir('targets/vdpau')
> +endif
> # TODO: xlib-glx
> # TODO: OMX
> # TODO: VA
> -# TODO: vdpau
> # TODO: xa
> # TODO: xvmc
> # TODO: nine
> diff --git a/src/gallium/state_trackers/vdpau/meson.build
> b/src/gallium/state_trackers/vdpau/meson.build
> new file mode 100644
> index 00000000000..9678b79ef6c
> --- /dev/null
> +++ b/src/gallium/state_trackers/vdpau/meson.build
> @@ -0,0 +1,32 @@
> +# Copyright © 2017 Intel Corproration
> +
> +# 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.
> +
> +libvdpau_st = static_library(
> + 'vdpau_st',
> + files(
> + 'bitmap.c', 'decode.c', 'device.c', 'ftab.c', 'htab.c',
> 'mixer.c',
> + 'output.c', 'preemption.c', 'presentation.c', 'query.c',
> 'surface.c',
> + ),
> + c_args : [c_vis_args, '-DVER_MAJOR=1', '-DVER_MINOR=0'],
> + include_directories : [
> + inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux,
> + ],
> + dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_xcb_dri2],
> +)
> diff --git a/src/gallium/targets/vdpau/meson.build
> b/src/gallium/targets/vdpau/meson.build
> new file mode 100644
> index 00000000000..746104c5c0a
> --- /dev/null
> +++ b/src/gallium/targets/vdpau/meson.build
> @@ -0,0 +1,87 @@
> +# 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)
> +
> +vdpau_deps = []
> +vdpau_c_args = []
> +vdpau_link_args = []
> +vdpau_link_with = []
> +vdpau_link_depends = []
> +
> +if with_llvm
> + vdpau_deps += dep_llvm
> +endif
> +if with_ld_version_script
> + vdpau_link_args += ['-Wl,--version-script',
> join_paths(meson.current_source_dir(), 'vdpau.sym')]
> + vdpau_link_depends += files('vdpau.sym')
> +endif
> +if with_ld_dynamic_list
> + vdpau_link_args += ['-Wl,--dynamic-list',
> join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')]
> + vdpau_link_depends += files('../dri-vdpau.dyn')
> +endif
> +
> +if with_gallium_r300
> + vdpau_c_args += '-DGALLIUM_R300'
> + vdpau_link_with += libr300
> +endif
> +if with_gallium_r600
> + vdpau_c_args += '-DGALLIUM_R600'
> + vdpau_link_with += libr600
> + vdpau_deps += dep_elf
> +endif
> +if with_gallium_radeonsi
> + vdpau_c_args += '-DGALLIUM_RADEONSI'
> + vdpau_link_with += [
> + libradeonsi, libamdgpuwinsys, libradeon, libamd_common, libnir
> + ]
> + vdpau_deps += dep_libdrm_amdgpu
> +endif
> +if with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi
> + vdpau_link_with += libradeonwinsys
> + vdpau_deps += dep_libdrm_radeon
> +endif
> +if with_gallium_nouveau
> + vdpau_c_args += '-DGALLIUM_NOUVEAU'
> + vdpau_link_with += [libnouveau, libnouveauwinsys]
> + vdpau_deps += dep_libdrm_nouveau
> +endif
> +
> +libvdpau_gallium = shared_library(
> + 'vdpau_gallium',
> + 'target.c',
> + c_args : [c_vis_args, vdpau_c_args],
> + cpp_args : cpp_vis_args,
> + link_args : [vdpau_link_args, ld_args_gc_sections],
> + include_directories : [
> + inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
> + ],
> + link_with : [
> + libvdpau_st, libgalliumvlwinsys, libgalliumvl, libgallium,
> libmesa_util,
> + libpipe_loader_static, libws_null, libwsw, vdpau_link_with,
> + ],
> + dependencies : [dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm,
> vdpau_deps],
> + link_depends : vdpau_link_depends,
> + version : '1.0',
> + install : true,
> + install_dir : vdpau_drivers_path,
> +)
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
