From 085070a2c8c91c14e5a9f46988989faf19b0a125 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 31 Oct 2017 15:12:20 -0700 Subject: [PATCH] meson: drop gallium-media argument This argument is the wrong approach for handling gallium media state trackers, since it doesn't allow for an auto option. Instead we'll use tristates, which do allow for auto. This option has never been wired to anything anyway. Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- meson.build | 17 ----------------- meson_options.txt | 6 ------ 2 files changed, 23 deletions(-) diff --git a/meson.build b/meson.build index ddc4a44eb6f..0f515ad10b8 100644 --- a/meson.build +++ b/meson.build @@ -361,23 +361,6 @@ if with_dri or with_gallium endif endif -with_gallium_xvmc = false -with_gallium_vdpau = false -with_gallium_omx = false # this is bellagio -with_gallium_va = false -with_gallium_media = false -dep_va = [] -_drivers = get_option('gallium-media') -if _drivers != '' - _split = _drivers.split(',') - with_gallium_xvmc = _split.contains('xvmc') - with_gallium_vdpau = _split.contains('vdpau') - with_gallium_omx = _split.contains('omx') - with_gallium_va = _split.contains('va') - with_gallium_media = (with_gallium_xvmc or with_gallium_vdpau or - with_gallium_omx or with_gallium_va) -endif - gl_pkgconfig_c_flags = [] if with_platform_x11 if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') diff --git a/meson_options.txt b/meson_options.txt index bcd63cc374f..4d56c2404f6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,12 +49,6 @@ option( value : 'auto', description : 'comma separated list of gallium drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' ) -option( - 'gallium-media', - type : 'string', - value : '', - description : 'comma separated list of gallium media APIs to build (omx,va,vdpau,xvmc).' -) option( 'gallium-extra-hud', type : 'boolean', -- 2.30.2