55 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 02b83717755..73686a93b3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
 if HAVE_VULKAN
 SUBDIRS += intel
-SUBDIRS += vulkan
 endif
 
 AM_CPPFLAGS = \
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 520602dd290..d5bd0b3b5df 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 isl
+SUBDIRS = genxml isl vulkan
diff --git a/src/vulkan/.gitignore b/src/intel/vulkan/.gitignore
index 40afc2e3989..40afc2e3989 100644
--- a/src/vulkan/.gitignore
+++ b/src/intel/vulkan/.gitignore
diff --git a/src/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 0605dc437d7..2144e5a691a 100644
--- a/src/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -166,8 +166,8 @@ CLEANFILES = $(BUILT_SOURCES)
 libvulkan_intel_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
 	$(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 \
+	$(top_builddir)/src/mesa/libmesa.la \
+	$(top_builddir)/src/mesa/drivers/dri/common/libdri_test_stubs.la \
 	-lpthread -ldl -lstdc++ \
         $(PER_GEN_LIBS)
 
diff --git a/src/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index a7ae975656b..a7ae975656b 100644
--- a/src/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
diff --git a/src/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c
index d24dd06d7eb..d24dd06d7eb 100644
--- a/src/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
diff --git a/src/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index b060828cf61..b060828cf61 100644
--- a/src/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
diff --git a/src/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index 7a77336602a..7a77336602a 100644
--- a/src/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
diff --git a/src/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index a8835f74179..a8835f74179 100644
--- a/src/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
diff --git a/src/vulkan/anv_dump.c b/src/intel/vulkan/anv_dump.c
index b7fa28be787..b7fa28be787 100644
--- a/src/vulkan/anv_dump.c
+++ b/src/intel/vulkan/anv_dump.c
diff --git a/src/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index 1e4cfcb1755..1e4cfcb1755 100644
--- a/src/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
diff --git a/src/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 7798a7bbde3..7798a7bbde3 100644
--- a/src/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
diff --git a/src/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index 0a7be353327..0a7be353327 100644
--- a/src/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
diff --git a/src/vulkan/anv_gem_stubs.c b/src/intel/vulkan/anv_gem_stubs.c
index 3204fefb28e..3204fefb28e 100644
--- a/src/vulkan/anv_gem_stubs.c
+++ b/src/intel/vulkan/anv_gem_stubs.c
diff --git a/src/vulkan/anv_gen_macros.h b/src/intel/vulkan/anv_gen_macros.h
index ef2ecd55a9b..ef2ecd55a9b 100644
--- a/src/vulkan/anv_gen_macros.h
+++ b/src/intel/vulkan/anv_gen_macros.h
diff --git a/src/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 0a412a3f8c6..0a412a3f8c6 100644
--- a/src/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
diff --git a/src/vulkan/anv_intel.c b/src/intel/vulkan/anv_intel.c
index d95d9afe8cf..d95d9afe8cf 100644
--- a/src/vulkan/anv_intel.c
+++ b/src/intel/vulkan/anv_intel.c
diff --git a/src/vulkan/anv_meta.c b/src/intel/vulkan/anv_meta.c
index 82944ea1a92..82944ea1a92 100644
--- a/src/vulkan/anv_meta.c
+++ b/src/intel/vulkan/anv_meta.c
diff --git a/src/vulkan/anv_meta.h b/src/intel/vulkan/anv_meta.h
index d33e9e6d8ba..d33e9e6d8ba 100644
--- a/src/vulkan/anv_meta.h
+++ b/src/intel/vulkan/anv_meta.h
diff --git a/src/vulkan/anv_meta_blit.c b/src/intel/vulkan/anv_meta_blit.c
index 07ebcbc06b1..07ebcbc06b1 100644
--- a/src/vulkan/anv_meta_blit.c
+++ b/src/intel/vulkan/anv_meta_blit.c
diff --git a/src/vulkan/anv_meta_clear.c b/src/intel/vulkan/anv_meta_clear.c
index 739ae09582c..739ae09582c 100644
--- a/src/vulkan/anv_meta_clear.c
+++ b/src/intel/vulkan/anv_meta_clear.c
diff --git a/src/vulkan/anv_meta_resolve.c b/src/intel/vulkan/anv_meta_resolve.c
index ea5020c5f24..ea5020c5f24 100644
--- a/src/vulkan/anv_meta_resolve.c
+++ b/src/intel/vulkan/anv_meta_resolve.c
diff --git a/src/vulkan/anv_nir.h b/src/intel/vulkan/anv_nir.h
index a7ea3eb0e28..a7ea3eb0e28 100644
--- a/src/vulkan/anv_nir.h
+++ b/src/intel/vulkan/anv_nir.h
diff --git a/src/vulkan/anv_nir_apply_dynamic_offsets.c b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c
index e71a8ffb1f4..e71a8ffb1f4 100644
--- a/src/vulkan/anv_nir_apply_dynamic_offsets.c
+++ b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c
diff --git a/src/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
index c58a93878ee..c58a93878ee 100644
--- a/src/vulkan/anv_nir_apply_pipeline_layout.c
+++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
diff --git a/src/vulkan/anv_nir_lower_push_constants.c b/src/intel/vulkan/anv_nir_lower_push_constants.c
index 53cd3d73793..53cd3d73793 100644
--- a/src/vulkan/anv_nir_lower_push_constants.c
+++ b/src/intel/vulkan/anv_nir_lower_push_constants.c
diff --git a/src/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c
index d07e9fec6cc..d07e9fec6cc 100644
--- a/src/vulkan/anv_pass.c
+++ b/src/intel/vulkan/anv_pass.c
diff --git a/src/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index a7feefb540e..a7feefb540e 100644
--- a/src/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
diff --git a/src/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c
index c89bb2a2ee1..c89bb2a2ee1 100644
--- a/src/vulkan/anv_pipeline_cache.c
+++ b/src/intel/vulkan/anv_pipeline_cache.c
diff --git a/src/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index ba86333525e..ba86333525e 100644
--- a/src/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
diff --git a/src/vulkan/anv_query.c b/src/intel/vulkan/anv_query.c
index e45b519c0f3..e45b519c0f3 100644
--- a/src/vulkan/anv_query.c
+++ b/src/intel/vulkan/anv_query.c
diff --git a/src/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c
index 22fd01c9495..22fd01c9495 100644
--- a/src/vulkan/anv_util.c
+++ b/src/intel/vulkan/anv_util.c
diff --git a/src/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index c5911a3635b..c5911a3635b 100644
--- a/src/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
diff --git a/src/vulkan/anv_wsi.h b/src/intel/vulkan/anv_wsi.h
index 6e9ff9b8447..6e9ff9b8447 100644
--- a/src/vulkan/anv_wsi.h
+++ b/src/intel/vulkan/anv_wsi.h
diff --git a/src/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c
index 6f25eaf43ea..6f25eaf43ea 100644
--- a/src/vulkan/anv_wsi_wayland.c
+++ b/src/intel/vulkan/anv_wsi_wayland.c
diff --git a/src/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c
index 843a6b62504..843a6b62504 100644
--- a/src/vulkan/anv_wsi_x11.c
+++ b/src/intel/vulkan/anv_wsi_x11.c
diff --git a/src/vulkan/dev_icd.json.in b/src/intel/vulkan/dev_icd.json.in
index 84920365289..84920365289 100644
--- a/src/vulkan/dev_icd.json.in
+++ b/src/intel/vulkan/dev_icd.json.in
diff --git a/src/vulkan/gen7_cmd_buffer.c b/src/intel/vulkan/gen7_cmd_buffer.c
index 23327ec0724..23327ec0724 100644
--- a/src/vulkan/gen7_cmd_buffer.c
+++ b/src/intel/vulkan/gen7_cmd_buffer.c
diff --git a/src/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c
index 7c054fa56d5..7c054fa56d5 100644
--- a/src/vulkan/gen7_pipeline.c
+++ b/src/intel/vulkan/gen7_pipeline.c
diff --git a/src/vulkan/gen7_state.c b/src/intel/vulkan/gen7_state.c
index 77bdb75260c..77bdb75260c 100644
--- a/src/vulkan/gen7_state.c
+++ b/src/intel/vulkan/gen7_state.c
diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gen8_cmd_buffer.c
index b741612c891..b741612c891 100644
--- a/src/vulkan/gen8_cmd_buffer.c
+++ b/src/intel/vulkan/gen8_cmd_buffer.c
diff --git a/src/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c
index f0411562fba..f0411562fba 100644
--- a/src/vulkan/gen8_pipeline.c
+++ b/src/intel/vulkan/gen8_pipeline.c
diff --git a/src/vulkan/gen8_state.c b/src/intel/vulkan/gen8_state.c
index 04cfff5444d..04cfff5444d 100644
--- a/src/vulkan/gen8_state.c
+++ b/src/intel/vulkan/gen8_state.c
diff --git a/src/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 5498d1d68c6..5498d1d68c6 100644
--- a/src/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
diff --git a/src/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 4c2e0bc6e0d..4c2e0bc6e0d 100644
--- a/src/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
diff --git a/src/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h
index 696e2be7c3f..696e2be7c3f 100644
--- a/src/vulkan/genX_pipeline_util.h
+++ b/src/intel/vulkan/genX_pipeline_util.h
diff --git a/src/vulkan/genX_state_util.h b/src/intel/vulkan/genX_state_util.h
index 67f798ab66e..67f798ab66e 100644
--- a/src/vulkan/genX_state_util.h
+++ b/src/intel/vulkan/genX_state_util.h
diff --git a/src/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in
index d9b363a9762..d9b363a9762 100644
--- a/src/vulkan/intel_icd.json.in
+++ b/src/intel/vulkan/intel_icd.json.in
diff --git a/src/vulkan/tests/.gitignore b/src/intel/vulkan/tests/.gitignore
index 5d054055685..5d054055685 100644
--- a/src/vulkan/tests/.gitignore
+++ b/src/intel/vulkan/tests/.gitignore
diff --git a/src/vulkan/tests/Makefile.am b/src/intel/vulkan/tests/Makefile.am
index 883013d86c6..883013d86c6 100644
--- a/src/vulkan/tests/Makefile.am
+++ b/src/intel/vulkan/tests/Makefile.am
diff --git a/src/vulkan/tests/block_pool_no_free.c b/src/intel/vulkan/tests/block_pool_no_free.c
index 86d1a76151f..86d1a76151f 100644
--- a/src/vulkan/tests/block_pool_no_free.c
+++ b/src/intel/vulkan/tests/block_pool_no_free.c
diff --git a/src/vulkan/tests/state_pool.c b/src/intel/vulkan/tests/state_pool.c
index 878ec19a595..878ec19a595 100644
--- a/src/vulkan/tests/state_pool.c
+++ b/src/intel/vulkan/tests/state_pool.c
diff --git a/src/vulkan/tests/state_pool_free_list_only.c b/src/intel/vulkan/tests/state_pool_free_list_only.c
index 2f4eb47fe45..2f4eb47fe45 100644
--- a/src/vulkan/tests/state_pool_free_list_only.c
+++ b/src/intel/vulkan/tests/state_pool_free_list_only.c
diff --git a/src/vulkan/tests/state_pool_no_free.c b/src/intel/vulkan/tests/state_pool_no_free.c
index 4b248c2ee66..4b248c2ee66 100644
--- a/src/vulkan/tests/state_pool_no_free.c
+++ b/src/intel/vulkan/tests/state_pool_no_free.c
diff --git a/src/vulkan/tests/state_pool_test_helper.h b/src/intel/vulkan/tests/state_pool_test_helper.h
index 0e56431303f..0e56431303f 100644
--- a/src/vulkan/tests/state_pool_test_helper.h
+++ b/src/intel/vulkan/tests/state_pool_test_helper.h