From a06ab9849db7fdf8f5194412f0c5a15abd8ece9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Ondra=C4=8Dka?= Date: Wed, 4 Jan 2023 17:27:14 +0100 Subject: [PATCH] r300: drop VDPAU support There is no UVD and the mpeg2 shader-based decoding is broken and doesn't lead to CPU savings anyway. VDPAU output works, but there is no real benefit so just disable VDPAU altogether so we can clean the backend a bit and also open a way to potentially drop the mpeg2 deconding altogether from the fronted. Acked-by: Filip Gawin Part-of: --- meson.build | 3 +-- src/gallium/targets/vdpau/meson.build | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index cab995e..03fcc1a 100644 --- a/meson.build +++ b/meson.build @@ -526,7 +526,6 @@ endif _vdpau_drivers = [ with_gallium_d3d12_video, with_gallium_nouveau, - with_gallium_r300, with_gallium_r600, with_gallium_radeonsi, with_gallium_virgl, @@ -535,7 +534,7 @@ _vdpau_drivers = [ vdpau = get_option('gallium-vdpau') \ .require(system_has_kms_drm, error_message : 'VDPAU state tracker can only be build on unix-like OSes.') \ .require(with_platform_x11, error_message : 'VDPAU state tracker requires X11 support.') \ - .require(_vdpau_drivers.contains(true), error_message : 'VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video, virgl).') + .require(_vdpau_drivers.contains(true), error_message : 'VDPAU state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video, virgl).') dep_vdpau = dependency('vdpau', version : '>= 1.1', required : vdpau) if dep_vdpau.found() diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index b77dd6a..442784b 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_d3d12, driver_virgl, + driver_r600, driver_radeonsi, driver_nouveau, driver_d3d12, driver_virgl, ], link_depends : vdpau_link_depends, soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), @@ -65,8 +65,7 @@ libvdpau_gallium = shared_library( install_dir : vdpau_drivers_path, name_suffix : 'so', ) -foreach d : [[with_gallium_r300, 'r300'], - [with_gallium_r600, 'r600'], +foreach d : [[with_gallium_r600, 'r600'], [with_gallium_radeonsi, 'radeonsi'], [with_gallium_nouveau, 'nouveau'], [with_gallium_virgl, 'virtio_gpu'], -- 2.7.4