Move the intel vulkan driver to src/intel/vulkan

56 files changed, 5 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 604ea3728b..b4e2539e66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2521,6 +2521,8 @@ AC_CONFIG_FILES([Makefile
 		src/intel/Makefile
 		src/intel/genxml/Makefile
 		src/intel/isl/Makefile
+		src/intel/vulkan/Makefile
+		src/intel/vulkan/tests/Makefile
 		src/loader/Makefile
 		src/mapi/Makefile
 		src/mapi/es1api/glesv1_cm.pc
@@ -2542,8 +2544,6 @@ AC_CONFIG_FILES([Makefile
 		src/mesa/drivers/osmesa/osmesa.pc
 		src/mesa/drivers/x11/Makefile
 		src/mesa/main/tests/Makefile
-		src/vulkan/Makefile
-		src/vulkan/tests/Makefile
 		src/util/Makefile
 		src/util/tests/hash_table/Makefile])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 02b8371775..73686a93b3 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 520602dd29..d5bd0b3b5d 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 40afc2e398..40afc2e398 100644
--- a/src/vulkan/.gitignore
+++ b/src/intel/vulkan/.gitignore
diff --git a/src/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 0605dc437d..2144e5a691 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 a7ae975656..a7ae975656 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 d24dd06d7e..d24dd06d7e 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 b060828cf6..b060828cf6 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 7a77336602..7a77336602 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 a8835f7417..a8835f7417 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 b7fa28be78..b7fa28be78 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 1e4cfcb175..1e4cfcb175 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 7798a7bbde..7798a7bbde 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 0a7be35332..0a7be35332 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 3204fefb28..3204fefb28 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 ef2ecd55a9..ef2ecd55a9 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 0a412a3f8c..0a412a3f8c 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 d95d9afe8c..d95d9afe8c 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 82944ea1a9..82944ea1a9 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 d33e9e6d8b..d33e9e6d8b 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 07ebcbc06b..07ebcbc06b 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 739ae09582..739ae09582 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 ea5020c5f2..ea5020c5f2 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 a7ea3eb0e2..a7ea3eb0e2 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 e71a8ffb1f..e71a8ffb1f 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 c58a93878e..c58a93878e 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 53cd3d7379..53cd3d7379 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 d07e9fec6c..d07e9fec6c 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 a7feefb540..a7feefb540 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 c89bb2a2ee..c89bb2a2ee 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 ba86333525..ba86333525 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 e45b519c0f..e45b519c0f 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 22fd01c949..22fd01c949 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 c5911a3635..c5911a3635 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 6e9ff9b844..6e9ff9b844 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 6f25eaf43e..6f25eaf43e 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 843a6b6250..843a6b6250 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 8492036528..8492036528 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 23327ec072..23327ec072 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 7c054fa56d..7c054fa56d 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 77bdb75260..77bdb75260 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 b741612c89..b741612c89 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 f0411562fb..f0411562fb 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 04cfff5444..04cfff5444 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 5498d1d68c..5498d1d68c 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 4c2e0bc6e0..4c2e0bc6e0 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 696e2be7c3..696e2be7c3 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 67f798ab66..67f798ab66 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 d9b363a976..d9b363a976 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 5d05405568..5d05405568 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 883013d86c..883013d86c 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 86d1a76151..86d1a76151 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 878ec19a59..878ec19a59 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 2f4eb47fe4..2f4eb47fe4 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 4b248c2ee6..4b248c2ee6 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 0e56431303..0e56431303 100644
--- a/src/vulkan/tests/state_pool_test_helper.h
+++ b/src/intel/vulkan/tests/state_pool_test_helper.h