Revert "Revert "i965: Switch to scalar TCS by default.""

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e15cca5ea4a3c9dde9a73e437a30de90cb9b8e1..6ce57916031e05acc26504c5b3bc5371c24dfb6f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,15 @@
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
+# include only conditionally ?
+SUBDIRS += compiler
+
+if HAVE_INTEL_DRIVERS
+SUBDIRS += intel
+endif
+
 if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
 endif
 
 SUBDIRS += loader
@@ -31,18 +38,30 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
+## 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
 endif
 
+## Optionally required by EGL
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-egl
+endif
+
 if HAVE_EGL
 SUBDIRS += egl
 endif
 
+## Requires the i965 compiler (part of mesa) and wayland-drm
+if HAVE_INTEL_VULKAN
+SUBDIRS += intel/vulkan
+endif
+
 if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
@@ -62,7 +81,6 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libglsl_util.la
 
 libglsl_util_la_SOURCES = \
-       glsl/shader_enums.c \
        mesa/main/imports.c \
        mesa/program/prog_hash_table.c \
        mesa/program/symbol_table.c \