diff --git a/.pick_status.json b/.pick_status.json index 6d3774583fe..7000b3ef7c3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/meson.build b/meson.build index ba15744859e..e32338b3f9a 100644 --- a/meson.build +++ b/meson.build @@ -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