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 <dylanx.c.ba...@intel.com> --- meson.build | 17 ----------------- meson_options.txt | 6 ------ 2 files changed, 23 deletions(-) diff --git a/meson.build b/meson.build index adb4578dea0..f5b2102fb0e 100644 --- a/meson.build +++ b/meson.build @@ -296,23 +296,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 4c7d459f140..dabaad48505 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,12 +49,6 @@ option( value : 'pl111,radeonsi,nouveau,freedreno,swrast,vc4,etnaviv,imx,r300,r600,svga,virgl', description : 'comma separated list of gallium drivers to build.' ) -option( - 'gallium-media', - type : 'string', - value : '', - description : 'comma separated list of gallium media APIs to build (omx,va,vdpau,xvmc).' -) option( 'vulkan-drivers', type : 'string', -- 2.14.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev