diff options
| author | Jan Palus <jpalus@fastmail.com> | 2022-12-01 18:32:53 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-12-14 20:47:02 +0000 |
| commit | a9b3fee4b037ff43ce957b0bddc5ed3b0a7d7952 (patch) | |
| tree | d126836b725c57ddaabf2295b0d13a7ca03c7bcf | |
| parent | 63e1ccd5989fdc0abcdd743250e39c650ea5ee56 (diff) | |
| download | mesa-a9b3fee4b037ff43ce957b0bddc5ed3b0a7d7952.tar.gz | |
vdpau: allow building vdpau st with virgl only
Fixes: 6b5aecb1955 ("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 8560ce28c22f82895dd95c185b59dcaaab249c6a)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
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 |