[Mesa-dev] [PATCH v5 12/13] meson: build gallium va state tracker

Dylan Baker dylan at pnwbakers.com
Mon Nov 20 19:09:44 UTC 2017


v2: - set with_gallium_va when -Dgallium-va=true
    - Fix megadrivers install
    - only use cflags from pkg-config, don't add linker flags.
    - Don't get version from pkg-config, it's not tracking the same
      version information.
v4: - Fix variable double-assignment

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 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        | 89 +++++++++++++++++++++++++++++++
 5 files changed, 187 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 2fffd66861d..bda1642ad5e 100644
--- a/meson.build
+++ b/meson.build
@@ -487,6 +487,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')
@@ -994,7 +1032,8 @@ if with_platform_x11
     dep_xxf86vm = dependency('xxf86vm', required : false)
   endif
   if (with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') 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')
     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
diff --git a/meson_options.txt b/meson_options.txt
index 8ee216d5b8a..0a9f7a9e403 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -88,6 +88,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 c17dba51ff2..c379b600d87 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -108,6 +108,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 and with_gallium
@@ -128,7 +131,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_ at 0@_ at 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..d94f7ef7c80
--- /dev/null
+++ b/src/gallium/targets/va/meson.build
@@ -0,0 +1,89 @@
+# 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_c_args = []
+va_link_args = []
+va_link_with = []
+va_link_depends = []
+va_drivers = []
+
+if with_llvm
+  va_deps += dep_llvm
+endif
+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
+
+if with_gallium_r600
+  va_c_args += '-DGALLIUM_R600'
+  va_link_with += libr600
+  va_drivers += 'r600_drv_video.so'
+endif
+if with_gallium_radeonsi
+  va_c_args += '-DGALLIUM_RADEONSI'
+  va_link_with += libradeonsi
+  va_deps += dep_libdrm_amdgpu
+  va_drivers += 'radeonsi_drv_video.so'
+endif
+if with_gallium_r600 or with_gallium_radeonsi
+  va_link_with += libradeonwinsys
+  va_deps += [dep_elf, dep_libdrm_radeon]
+endif
+if with_gallium_nouveau
+  va_c_args += '-DGALLIUM_NOUVEAU'
+  va_link_with += [libnouveau, libnouveauwinsys]
+  va_deps += dep_libdrm_nouveau
+  va_drivers += 'nouveau_drv_video.so'
+endif
+
+libva_gallium = shared_library(
+  'gallium_drv_video',
+  'target.c',
+  c_args : [c_vis_args, va_c_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, va_link_with,
+  ],
+  dependencies : [dep_libdrm, va_deps],
+  link_depends : va_link_depends,
+  install : true,
+  install_dir : va_drivers_path,
+)
+
+meson.add_install_script(
+  join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
+  libva_gallium.full_path(),
+  va_drivers_path,
+  va_drivers,
+)
-- 
2.15.0



More information about the mesa-dev mailing list