nv50/ir: check for origin insn in findOriginForTestWithZero

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f1fe5157b0ac4164856a49a86ec6caaef0a0c264..25b9253fc395dc4e8ca7c650104b07e0142be018 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,16 @@ endif
 # include only conditionally ?
 SUBDIRS += compiler
 
+## Optionally required by GBM, EGL and Vulkan
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-drm
+endif
+
+if HAVE_VULKAN_COMMON
+SUBDIRS += vulkan
+endif
+EXTRA_DIST += vulkan/registry/vk.xml
+
 if HAVE_AMD_DRIVERS
 SUBDIRS += amd
 endif
@@ -93,11 +103,6 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
-## Optionally required by GBM and EGL
-if HAVE_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-drm
-endif
-
 ## Optionally required by EGL (aka PLATFORM_GBM)
 if HAVE_GBM
 SUBDIRS += gbm
@@ -116,11 +121,6 @@ if HAVE_INTEL_DRIVERS
 SUBDIRS += intel/tools
 endif
 
-if HAVE_VULKAN_COMMON
-SUBDIRS += vulkan/wsi
-EXTRA_DIST += vulkan/registry/vk.xml
-endif
-
 ## Requires the i965 compiler (part of mesa) and wayland-drm
 if HAVE_INTEL_VULKAN
 SUBDIRS += intel/vulkan