26 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 25b48c65009..02b83717755 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
 if HAVE_VULKAN
 SUBDIRS += intel
-SUBDIRS += isl
 SUBDIRS += vulkan
 endif
 
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 0a6f411c7ba..520602dd290 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -19,4 +19,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = genxml
+SUBDIRS = genxml isl
diff --git a/src/isl/.gitignore b/src/intel/isl/.gitignore
index e9cfd67b94e..e9cfd67b94e 100644
--- a/src/isl/.gitignore
+++ b/src/intel/isl/.gitignore
diff --git a/src/isl/Makefile.am b/src/intel/isl/Makefile.am
index 72f5460554f..72f5460554f 100644
--- a/src/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
diff --git a/src/isl/README b/src/intel/isl/README
index 1ab4313fcc5..1ab4313fcc5 100644
--- a/src/isl/README
+++ b/src/intel/isl/README
diff --git a/src/isl/isl.c b/src/intel/isl/isl.c
index 27928fd0850..27928fd0850 100644
--- a/src/isl/isl.c
+++ b/src/intel/isl/isl.c
diff --git a/src/isl/isl.h b/src/intel/isl/isl.h
index 3e0ff935948..3e0ff935948 100644
--- a/src/isl/isl.h
+++ b/src/intel/isl/isl.h
diff --git a/src/isl/isl_format.c b/src/intel/isl/isl_format.c
index 0fe6e9b83ab..0fe6e9b83ab 100644
--- a/src/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
diff --git a/src/isl/isl_format_layout.csv b/src/intel/isl/isl_format_layout.csv
index af2786ae630..af2786ae630 100644
--- a/src/isl/isl_format_layout.csv
+++ b/src/intel/isl/isl_format_layout.csv
diff --git a/src/isl/isl_format_layout_gen.bash b/src/intel/isl/isl_format_layout_gen.bash
index db883827376..db883827376 100755
--- a/src/isl/isl_format_layout_gen.bash
+++ b/src/intel/isl/isl_format_layout_gen.bash
diff --git a/src/isl/isl_gen4.c b/src/intel/isl/isl_gen4.c
index 52aa5655bb2..52aa5655bb2 100644
--- a/src/isl/isl_gen4.c
+++ b/src/intel/isl/isl_gen4.c
diff --git a/src/isl/isl_gen4.h b/src/intel/isl/isl_gen4.h
index 06cd70b9206..06cd70b9206 100644
--- a/src/isl/isl_gen4.h
+++ b/src/intel/isl/isl_gen4.h
diff --git a/src/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c
index 24c393925ed..24c393925ed 100644
--- a/src/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gen6.c
diff --git a/src/isl/isl_gen6.h b/src/intel/isl/isl_gen6.h
index 0779c674940..0779c674940 100644
--- a/src/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gen6.h
diff --git a/src/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
index 7064e852e65..7064e852e65 100644
--- a/src/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
diff --git a/src/isl/isl_gen7.h b/src/intel/isl/isl_gen7.h
index 2a95b68a9bd..2a95b68a9bd 100644
--- a/src/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gen7.h
diff --git a/src/isl/isl_gen8.c b/src/intel/isl/isl_gen8.c
index a46427aacc8..a46427aacc8 100644
--- a/src/isl/isl_gen8.c
+++ b/src/intel/isl/isl_gen8.c
diff --git a/src/isl/isl_gen8.h b/src/intel/isl/isl_gen8.h
index 2017ea8ddc1..2017ea8ddc1 100644
--- a/src/isl/isl_gen8.h
+++ b/src/intel/isl/isl_gen8.h
diff --git a/src/isl/isl_gen9.c b/src/intel/isl/isl_gen9.c
index aa290aa1c35..aa290aa1c35 100644
--- a/src/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gen9.c
diff --git a/src/isl/isl_gen9.h b/src/intel/isl/isl_gen9.h
index 64ed0aa44ef..64ed0aa44ef 100644
--- a/src/isl/isl_gen9.h
+++ b/src/intel/isl/isl_gen9.h
diff --git a/src/isl/isl_image.c b/src/intel/isl/isl_image.c
index 773160432b9..773160432b9 100644
--- a/src/isl/isl_image.c
+++ b/src/intel/isl/isl_image.c
diff --git a/src/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index b399e0f8116..b399e0f8116 100644
--- a/src/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
diff --git a/src/isl/tests/.gitignore b/src/intel/isl/tests/.gitignore
index ba70ecfbee4..ba70ecfbee4 100644
--- a/src/isl/tests/.gitignore
+++ b/src/intel/isl/tests/.gitignore
diff --git a/src/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
index cda8583daeb..cda8583daeb 100644
--- a/src/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 50d972e6c7e..0605dc437d7 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -62,7 +62,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/intel/ \
-	-I$(top_srcdir)/src/isl/ \
 	-I$(top_builddir)/src \
 	-I$(top_builddir)/src/compiler \
 	-I$(top_builddir)/src/compiler/nir \
@@ -165,7 +164,7 @@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 libvulkan_intel_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
-	$(top_builddir)/src/isl/libisl.la \
+	$(top_builddir)/src/intel/isl/libisl.la \
 	$(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
 	../mesa/libmesa.la \
 	../mesa/drivers/dri/common/libdri_test_stubs.la \
diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index 06b961495c2..ba86333525e 100644
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -62,7 +62,7 @@ typedef uint32_t xcb_window_t;
 #include "anv_entrypoints.h"
 #include "anv_gen_macros.h"
 #include "brw_context.h"
-#include "isl.h"
+#include "isl/isl.h"
 
 #ifdef __cplusplus
 extern "C" {