From d0b174d7df886023b2ce64d229d3af4777c01587 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Tue, 26 Mar 2019 23:39:19 +0000 Subject: configure: Do not enable both OpenCL-VAAPI interop modes simultaneously Beignet offers a far more flexiable and complete interface, so choose it by default if available. --- configure | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 331393f8d5..c94f516224 100755 --- a/configure +++ b/configure @@ -6471,9 +6471,12 @@ if enabled_all opencl libdrm ; then fi if enabled_all opencl vaapi ; then - enabled opencl_drm_beignet && enable opencl_vaapi_beignet - check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && - enable opencl_vaapi_intel_media + if enabled opencl_drm_beignet ; then + enable opencl_vaapi_beignet + else + check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && + enable opencl_vaapi_intel_media + fi fi if enabled_all opencl dxva2 ; then -- cgit v1.2.3