diff --git a/meson.build b/meson.build index 460fefaad5c..80115326664 100644 --- a/meson.build +++ b/meson.build @@ -646,9 +646,9 @@ elif not with_platform_x11 _vdpau = 'disabled' endif elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or - with_gallium_nouveau) + with_gallium_nouveau or with_gallium_d3d12) if _vdpau == 'enabled' - error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau.') + error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12.') else _vdpau = 'disabled' endif @@ -825,9 +825,9 @@ if not system_has_kms_drm else _va = 'disabled' endif -elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) +elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau or with_gallium_d3d12) if _va == 'enabled' - error('VA state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + error('VA state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau, d3d12.') else _va = 'disabled' endif diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 0465e87fe4c..249bafff6ab 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -51,7 +51,7 @@ libva_gallium = shared_library( link_whole : [libva_st], link_with : link_with_libva_gallium, dependencies : [ - dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau, + dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau, driver_d3d12, idep_mesautil, ], link_depends : va_link_depends, @@ -63,7 +63,8 @@ libva_gallium = shared_library( foreach d : [[with_gallium_r600, 'r600'], [with_gallium_radeonsi, 'radeonsi'], - [with_gallium_nouveau, 'nouveau']] + [with_gallium_nouveau, 'nouveau'], + [with_gallium_d3d12, 'd3d12']] if d[0] va_drivers += '@0@_drv_video.so'.format(d[1]) endif diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index d994b46198a..5fe457dfe81 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -56,7 +56,7 @@ libvdpau_gallium = shared_library( link_with : link_with_libvdpau_gallium, dependencies : [ idep_mesautil, - driver_r300, driver_r600, driver_radeonsi, driver_nouveau, + driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_d3d12, ], link_depends : vdpau_link_depends, soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), @@ -68,7 +68,8 @@ libvdpau_gallium = shared_library( foreach d : [[with_gallium_r300, 'r300'], [with_gallium_r600, 'r600'], [with_gallium_radeonsi, 'radeonsi'], - [with_gallium_nouveau, 'nouveau']] + [with_gallium_nouveau, 'nouveau'], + [with_gallium_d3d12, 'd3d12']] if d[0] vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR) endif