configure: Do not enable both OpenCL-VAAPI interop modes simultaneously
authorMark Thompson <sw@jkqxz.net>
Tue, 26 Mar 2019 23:39:19 +0000 (23:39 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 27 Mar 2019 22:29:23 +0000 (22:29 +0000)
Beignet offers a far more flexiable and complete interface, so choose it
by default if available.

configure

index 331393f..c94f516 100755 (executable)
--- 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