fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 01:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vdpau: allow building vdpau st with virgl only

Browse source 
Fixes: 6b5aecb195 ("virgl: add support for hardware video acceleration")

Signed-off-by: Jan Palus <jpalus@fastmail.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20108>
(cherry picked from commit 8560ce28c2)
This commit is contained in:
Jan Palus 2022-12-01 18:32:53 +01:00 • committed by Eric Engestrom
parent 63e1ccd598
commit a9b3fee4b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -814,7 +814,7 @@
"description": "vdpau: allow building vdpau st with virgl only",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "6b5aecb19558200fd39fda46db08456ba7acc180"
},

4
meson.build
View file

@ -668,9 +668,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 or with_gallium_d3d12_video)
with_gallium_nouveau or with_gallium_d3d12_video or with_gallium_virgl)
if _vdpau == 'enabled'
error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video).')
error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video, virgl).')
else
_vdpau = 'disabled'
endif