OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Support d3d12 as a video-supporting driver

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16286>
This commit is contained in:
Sil Vilerino
2022-05-02 10:16:45 -07:00
committed by Marge Bot
parent 39cf51ba9d
commit 82e4fc654f
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@@ -646,9 +646,9 @@ elif not with_platform_x11
_vdpau = 'disabled' _vdpau = 'disabled'
endif endif
elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or 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' 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 else
_vdpau = 'disabled' _vdpau = 'disabled'
endif endif
@@ -825,9 +825,9 @@ if not system_has_kms_drm
else else
_va = 'disabled' _va = 'disabled'
endif 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' 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 else
_va = 'disabled' _va = 'disabled'
endif endif

5
src/gallium/targets/va/meson.build
View File

@@ -51,7 +51,7 @@ libva_gallium = shared_library(
link_whole : [libva_st], link_whole : [libva_st],
link_with : link_with_libva_gallium, link_with : link_with_libva_gallium,
dependencies : [ dependencies : [
dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau, dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau, driver_d3d12,
idep_mesautil, idep_mesautil,
], ],
link_depends : va_link_depends, link_depends : va_link_depends,
@@ -63,7 +63,8 @@ libva_gallium = shared_library(
foreach d : [[with_gallium_r600, 'r600'], foreach d : [[with_gallium_r600, 'r600'],
[with_gallium_radeonsi, 'radeonsi'], [with_gallium_radeonsi, 'radeonsi'],
[with_gallium_nouveau, 'nouveau']] [with_gallium_nouveau, 'nouveau'],
[with_gallium_d3d12, 'd3d12']]
if d[0] if d[0]
va_drivers += '@0@_drv_video.so'.format(d[1]) va_drivers += '@0@_drv_video.so'.format(d[1])
endif endif

5
src/gallium/targets/vdpau/meson.build
View File

@@ -56,7 +56,7 @@ libvdpau_gallium = shared_library(
link_with : link_with_libvdpau_gallium, link_with : link_with_libvdpau_gallium,
dependencies : [ dependencies : [
idep_mesautil, 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, link_depends : vdpau_link_depends,
soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR),
@@ -68,7 +68,8 @@ libvdpau_gallium = shared_library(
foreach d : [[with_gallium_r300, 'r300'], foreach d : [[with_gallium_r300, 'r300'],
[with_gallium_r600, 'r600'], [with_gallium_r600, 'r600'],
[with_gallium_radeonsi, 'radeonsi'], [with_gallium_radeonsi, 'radeonsi'],
[with_gallium_nouveau, 'nouveau']] [with_gallium_nouveau, 'nouveau'],
[with_gallium_d3d12, 'd3d12']]
if d[0] if d[0]
vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR) vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR)
endif endif