build/vulkan: fix winsys detection based on the previously set variables
authorMatthew Waters <matthew@centricular.com>
Tue, 6 Sep 2016 10:00:07 +0000 (20:00 +1000)
committerMatthew Waters <matthew@centricular.com>
Tue, 6 Sep 2016 14:15:02 +0000 (00:15 +1000)
The X11/Wayland winsys checks weren't being used to enable the vulkan element.
Use them.

configure.ac

index a1f8c1e..86ca314 100644 (file)
@@ -2998,14 +2998,15 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
 dnl *** Vulkan ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_VULKAN, true)
 AG_GST_CHECK_FEATURE(VULKAN, [Vulkan elements], vulkan, [
-  HAVE_VULKAN=no
   AC_CHECK_HEADER(vulkan/vulkan.h, [
     AC_CHECK_LIB(vulkan, vkCreateDevice, [
       VULKAN_LIBS="-lvulkan"
       AC_SUBST(VULKAN_LIBS)
-      dnl TODO check platform support (x11, win32, wayland, android, etc)
-      if test "x$HAVE_XCB" = "xyes"; then
-        HAVE_VULKAN=yes
+      if test "x$GST_VULKAN_HAVE_WINDOW_XCB" = "x1"; then
+        HAVE_VULKAN="yes"
+      fi
+      if test "x$GST_VULKAN_HAVE_WINDOW_WAYLAND" = "x1"; then
+        HAVE_VULKAN="yes"
       fi
     ], [])
   ], [])