spirv: Replace unreachable with vtn_fail

[mesa.git] / src / meson.build

diff --git a/src/meson.build b/src/meson.build
index 9232cc4ab183d625ddc3629958bf4b88420f20d0..043a81b9e905775d50279ce2a224ee0ad4948f99 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,6 +25,7 @@ inc_mapi = include_directories('mapi')
 inc_src = include_directories('.')
 inc_gallium = include_directories('gallium/include')
 inc_gallium_aux = include_directories('gallium/auxiliary')
+inc_amd_common = include_directories('amd/common')
 
 libglsl_util = static_library(
   'glsl_util',
@@ -45,7 +46,6 @@ sha1_h = custom_target(
 
 subdir('gtest')
 subdir('util')
-subdir('mapi/glapi/gen')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')
@@ -69,7 +69,9 @@ endif
 if with_egl
   subdir('egl')
 endif
-subdir('gallium')
+if with_gallium
+  subdir('gallium')
+endif
 
 # This must be after at least mesa, glx, and gallium, since libgl will be
 # defined in one of those subdirs depending on the glx provider.