From 9851c8285f7bf70a6cb4bede2ee94110c14acc19 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 18 Feb 2016 10:37:59 -0800 Subject: [PATCH] Move the intel vulkan driver to src/intel/vulkan --- configure.ac | 4 ++-- src/Makefile.am | 1 - src/intel/Makefile.am | 2 +- src/{ => intel}/vulkan/.gitignore | 0 src/{ => intel}/vulkan/Makefile.am | 4 ++-- src/{ => intel}/vulkan/anv_allocator.c | 0 src/{ => intel}/vulkan/anv_batch_chain.c | 0 src/{ => intel}/vulkan/anv_cmd_buffer.c | 0 src/{ => intel}/vulkan/anv_descriptor_set.c | 0 src/{ => intel}/vulkan/anv_device.c | 0 src/{ => intel}/vulkan/anv_dump.c | 0 src/{ => intel}/vulkan/anv_entrypoints_gen.py | 0 src/{ => intel}/vulkan/anv_formats.c | 0 src/{ => intel}/vulkan/anv_gem.c | 0 src/{ => intel}/vulkan/anv_gem_stubs.c | 0 src/{ => intel}/vulkan/anv_gen_macros.h | 0 src/{ => intel}/vulkan/anv_image.c | 0 src/{ => intel}/vulkan/anv_intel.c | 0 src/{ => intel}/vulkan/anv_meta.c | 0 src/{ => intel}/vulkan/anv_meta.h | 0 src/{ => intel}/vulkan/anv_meta_blit.c | 0 src/{ => intel}/vulkan/anv_meta_clear.c | 0 src/{ => intel}/vulkan/anv_meta_resolve.c | 0 src/{ => intel}/vulkan/anv_nir.h | 0 src/{ => intel}/vulkan/anv_nir_apply_dynamic_offsets.c | 0 src/{ => intel}/vulkan/anv_nir_apply_pipeline_layout.c | 0 src/{ => intel}/vulkan/anv_nir_lower_push_constants.c | 0 src/{ => intel}/vulkan/anv_pass.c | 0 src/{ => intel}/vulkan/anv_pipeline.c | 0 src/{ => intel}/vulkan/anv_pipeline_cache.c | 0 src/{ => intel}/vulkan/anv_private.h | 0 src/{ => intel}/vulkan/anv_query.c | 0 src/{ => intel}/vulkan/anv_util.c | 0 src/{ => intel}/vulkan/anv_wsi.c | 0 src/{ => intel}/vulkan/anv_wsi.h | 0 src/{ => intel}/vulkan/anv_wsi_wayland.c | 0 src/{ => intel}/vulkan/anv_wsi_x11.c | 0 src/{ => intel}/vulkan/dev_icd.json.in | 0 src/{ => intel}/vulkan/gen7_cmd_buffer.c | 0 src/{ => intel}/vulkan/gen7_pipeline.c | 0 src/{ => intel}/vulkan/gen7_state.c | 0 src/{ => intel}/vulkan/gen8_cmd_buffer.c | 0 src/{ => intel}/vulkan/gen8_pipeline.c | 0 src/{ => intel}/vulkan/gen8_state.c | 0 src/{ => intel}/vulkan/genX_cmd_buffer.c | 0 src/{ => intel}/vulkan/genX_pipeline.c | 0 src/{ => intel}/vulkan/genX_pipeline_util.h | 0 src/{ => intel}/vulkan/genX_state_util.h | 0 src/{ => intel}/vulkan/intel_icd.json.in | 0 src/{ => intel}/vulkan/tests/.gitignore | 0 src/{ => intel}/vulkan/tests/Makefile.am | 0 src/{ => intel}/vulkan/tests/block_pool_no_free.c | 0 src/{ => intel}/vulkan/tests/state_pool.c | 0 src/{ => intel}/vulkan/tests/state_pool_free_list_only.c | 0 src/{ => intel}/vulkan/tests/state_pool_no_free.c | 0 src/{ => intel}/vulkan/tests/state_pool_test_helper.h | 0 56 files changed, 5 insertions(+), 6 deletions(-) rename src/{ => intel}/vulkan/.gitignore (100%) rename src/{ => intel}/vulkan/Makefile.am (98%) rename src/{ => intel}/vulkan/anv_allocator.c (100%) rename src/{ => intel}/vulkan/anv_batch_chain.c (100%) rename src/{ => intel}/vulkan/anv_cmd_buffer.c (100%) rename src/{ => intel}/vulkan/anv_descriptor_set.c (100%) rename src/{ => intel}/vulkan/anv_device.c (100%) rename src/{ => intel}/vulkan/anv_dump.c (100%) rename src/{ => intel}/vulkan/anv_entrypoints_gen.py (100%) rename src/{ => intel}/vulkan/anv_formats.c (100%) rename src/{ => intel}/vulkan/anv_gem.c (100%) rename src/{ => intel}/vulkan/anv_gem_stubs.c (100%) rename src/{ => intel}/vulkan/anv_gen_macros.h (100%) rename src/{ => intel}/vulkan/anv_image.c (100%) rename src/{ => intel}/vulkan/anv_intel.c (100%) rename src/{ => intel}/vulkan/anv_meta.c (100%) rename src/{ => intel}/vulkan/anv_meta.h (100%) rename src/{ => intel}/vulkan/anv_meta_blit.c (100%) rename src/{ => intel}/vulkan/anv_meta_clear.c (100%) rename src/{ => intel}/vulkan/anv_meta_resolve.c (100%) rename src/{ => intel}/vulkan/anv_nir.h (100%) rename src/{ => intel}/vulkan/anv_nir_apply_dynamic_offsets.c (100%) rename src/{ => intel}/vulkan/anv_nir_apply_pipeline_layout.c (100%) rename src/{ => intel}/vulkan/anv_nir_lower_push_constants.c (100%) rename src/{ => intel}/vulkan/anv_pass.c (100%) rename src/{ => intel}/vulkan/anv_pipeline.c (100%) rename src/{ => intel}/vulkan/anv_pipeline_cache.c (100%) rename src/{ => intel}/vulkan/anv_private.h (100%) rename src/{ => intel}/vulkan/anv_query.c (100%) rename src/{ => intel}/vulkan/anv_util.c (100%) rename src/{ => intel}/vulkan/anv_wsi.c (100%) rename src/{ => intel}/vulkan/anv_wsi.h (100%) rename src/{ => intel}/vulkan/anv_wsi_wayland.c (100%) rename src/{ => intel}/vulkan/anv_wsi_x11.c (100%) rename src/{ => intel}/vulkan/dev_icd.json.in (100%) rename src/{ => intel}/vulkan/gen7_cmd_buffer.c (100%) rename src/{ => intel}/vulkan/gen7_pipeline.c (100%) rename src/{ => intel}/vulkan/gen7_state.c (100%) rename src/{ => intel}/vulkan/gen8_cmd_buffer.c (100%) rename src/{ => intel}/vulkan/gen8_pipeline.c (100%) rename src/{ => intel}/vulkan/gen8_state.c (100%) rename src/{ => intel}/vulkan/genX_cmd_buffer.c (100%) rename src/{ => intel}/vulkan/genX_pipeline.c (100%) rename src/{ => intel}/vulkan/genX_pipeline_util.h (100%) rename src/{ => intel}/vulkan/genX_state_util.h (100%) rename src/{ => intel}/vulkan/intel_icd.json.in (100%) rename src/{ => intel}/vulkan/tests/.gitignore (100%) rename src/{ => intel}/vulkan/tests/Makefile.am (100%) rename src/{ => intel}/vulkan/tests/block_pool_no_free.c (100%) rename src/{ => intel}/vulkan/tests/state_pool.c (100%) rename src/{ => intel}/vulkan/tests/state_pool_free_list_only.c (100%) rename src/{ => intel}/vulkan/tests/state_pool_no_free.c (100%) rename src/{ => intel}/vulkan/tests/state_pool_test_helper.h (100%) diff --git a/configure.ac b/configure.ac index 604ea3728b4..b4e2539e66f 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 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 similarity index 100% rename from src/vulkan/.gitignore rename to src/intel/vulkan/.gitignore diff --git a/src/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am similarity index 98% rename from src/vulkan/Makefile.am rename to 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 similarity index 100% rename from src/vulkan/anv_allocator.c rename to src/intel/vulkan/anv_allocator.c diff --git a/src/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c similarity index 100% rename from src/vulkan/anv_batch_chain.c rename to src/intel/vulkan/anv_batch_chain.c diff --git a/src/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c similarity index 100% rename from src/vulkan/anv_cmd_buffer.c rename to src/intel/vulkan/anv_cmd_buffer.c diff --git a/src/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c similarity index 100% rename from src/vulkan/anv_descriptor_set.c rename to src/intel/vulkan/anv_descriptor_set.c diff --git a/src/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c similarity index 100% rename from src/vulkan/anv_device.c rename to src/intel/vulkan/anv_device.c diff --git a/src/vulkan/anv_dump.c b/src/intel/vulkan/anv_dump.c similarity index 100% rename from src/vulkan/anv_dump.c rename to src/intel/vulkan/anv_dump.c diff --git a/src/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py similarity index 100% rename from src/vulkan/anv_entrypoints_gen.py rename to src/intel/vulkan/anv_entrypoints_gen.py diff --git a/src/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c similarity index 100% rename from src/vulkan/anv_formats.c rename to src/intel/vulkan/anv_formats.c diff --git a/src/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c similarity index 100% rename from src/vulkan/anv_gem.c rename to src/intel/vulkan/anv_gem.c diff --git a/src/vulkan/anv_gem_stubs.c b/src/intel/vulkan/anv_gem_stubs.c similarity index 100% rename from src/vulkan/anv_gem_stubs.c rename to src/intel/vulkan/anv_gem_stubs.c diff --git a/src/vulkan/anv_gen_macros.h b/src/intel/vulkan/anv_gen_macros.h similarity index 100% rename from src/vulkan/anv_gen_macros.h rename to src/intel/vulkan/anv_gen_macros.h diff --git a/src/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c similarity index 100% rename from src/vulkan/anv_image.c rename to src/intel/vulkan/anv_image.c diff --git a/src/vulkan/anv_intel.c b/src/intel/vulkan/anv_intel.c similarity index 100% rename from src/vulkan/anv_intel.c rename to src/intel/vulkan/anv_intel.c diff --git a/src/vulkan/anv_meta.c b/src/intel/vulkan/anv_meta.c similarity index 100% rename from src/vulkan/anv_meta.c rename to src/intel/vulkan/anv_meta.c diff --git a/src/vulkan/anv_meta.h b/src/intel/vulkan/anv_meta.h similarity index 100% rename from src/vulkan/anv_meta.h rename to src/intel/vulkan/anv_meta.h diff --git a/src/vulkan/anv_meta_blit.c b/src/intel/vulkan/anv_meta_blit.c similarity index 100% rename from src/vulkan/anv_meta_blit.c rename to src/intel/vulkan/anv_meta_blit.c diff --git a/src/vulkan/anv_meta_clear.c b/src/intel/vulkan/anv_meta_clear.c similarity index 100% rename from src/vulkan/anv_meta_clear.c rename to src/intel/vulkan/anv_meta_clear.c diff --git a/src/vulkan/anv_meta_resolve.c b/src/intel/vulkan/anv_meta_resolve.c similarity index 100% rename from src/vulkan/anv_meta_resolve.c rename to src/intel/vulkan/anv_meta_resolve.c diff --git a/src/vulkan/anv_nir.h b/src/intel/vulkan/anv_nir.h similarity index 100% rename from src/vulkan/anv_nir.h rename to 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 similarity index 100% rename from src/vulkan/anv_nir_apply_dynamic_offsets.c rename to 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 similarity index 100% rename from src/vulkan/anv_nir_apply_pipeline_layout.c rename to 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 similarity index 100% rename from src/vulkan/anv_nir_lower_push_constants.c rename to src/intel/vulkan/anv_nir_lower_push_constants.c diff --git a/src/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c similarity index 100% rename from src/vulkan/anv_pass.c rename to src/intel/vulkan/anv_pass.c diff --git a/src/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c similarity index 100% rename from src/vulkan/anv_pipeline.c rename to src/intel/vulkan/anv_pipeline.c diff --git a/src/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c similarity index 100% rename from src/vulkan/anv_pipeline_cache.c rename to src/intel/vulkan/anv_pipeline_cache.c diff --git a/src/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h similarity index 100% rename from src/vulkan/anv_private.h rename to src/intel/vulkan/anv_private.h diff --git a/src/vulkan/anv_query.c b/src/intel/vulkan/anv_query.c similarity index 100% rename from src/vulkan/anv_query.c rename to src/intel/vulkan/anv_query.c diff --git a/src/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c similarity index 100% rename from src/vulkan/anv_util.c rename to src/intel/vulkan/anv_util.c diff --git a/src/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c similarity index 100% rename from src/vulkan/anv_wsi.c rename to src/intel/vulkan/anv_wsi.c diff --git a/src/vulkan/anv_wsi.h b/src/intel/vulkan/anv_wsi.h similarity index 100% rename from src/vulkan/anv_wsi.h rename to src/intel/vulkan/anv_wsi.h diff --git a/src/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c similarity index 100% rename from src/vulkan/anv_wsi_wayland.c rename to src/intel/vulkan/anv_wsi_wayland.c diff --git a/src/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c similarity index 100% rename from src/vulkan/anv_wsi_x11.c rename to src/intel/vulkan/anv_wsi_x11.c diff --git a/src/vulkan/dev_icd.json.in b/src/intel/vulkan/dev_icd.json.in similarity index 100% rename from src/vulkan/dev_icd.json.in rename to src/intel/vulkan/dev_icd.json.in diff --git a/src/vulkan/gen7_cmd_buffer.c b/src/intel/vulkan/gen7_cmd_buffer.c similarity index 100% rename from src/vulkan/gen7_cmd_buffer.c rename to src/intel/vulkan/gen7_cmd_buffer.c diff --git a/src/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c similarity index 100% rename from src/vulkan/gen7_pipeline.c rename to src/intel/vulkan/gen7_pipeline.c diff --git a/src/vulkan/gen7_state.c b/src/intel/vulkan/gen7_state.c similarity index 100% rename from src/vulkan/gen7_state.c rename to src/intel/vulkan/gen7_state.c diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gen8_cmd_buffer.c similarity index 100% rename from src/vulkan/gen8_cmd_buffer.c rename to src/intel/vulkan/gen8_cmd_buffer.c diff --git a/src/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c similarity index 100% rename from src/vulkan/gen8_pipeline.c rename to src/intel/vulkan/gen8_pipeline.c diff --git a/src/vulkan/gen8_state.c b/src/intel/vulkan/gen8_state.c similarity index 100% rename from src/vulkan/gen8_state.c rename to src/intel/vulkan/gen8_state.c diff --git a/src/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c similarity index 100% rename from src/vulkan/genX_cmd_buffer.c rename to src/intel/vulkan/genX_cmd_buffer.c diff --git a/src/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c similarity index 100% rename from src/vulkan/genX_pipeline.c rename to src/intel/vulkan/genX_pipeline.c diff --git a/src/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h similarity index 100% rename from src/vulkan/genX_pipeline_util.h rename to src/intel/vulkan/genX_pipeline_util.h diff --git a/src/vulkan/genX_state_util.h b/src/intel/vulkan/genX_state_util.h similarity index 100% rename from src/vulkan/genX_state_util.h rename to src/intel/vulkan/genX_state_util.h diff --git a/src/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in similarity index 100% rename from src/vulkan/intel_icd.json.in rename to src/intel/vulkan/intel_icd.json.in diff --git a/src/vulkan/tests/.gitignore b/src/intel/vulkan/tests/.gitignore similarity index 100% rename from src/vulkan/tests/.gitignore rename to src/intel/vulkan/tests/.gitignore diff --git a/src/vulkan/tests/Makefile.am b/src/intel/vulkan/tests/Makefile.am similarity index 100% rename from src/vulkan/tests/Makefile.am rename to 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 similarity index 100% rename from src/vulkan/tests/block_pool_no_free.c rename to 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 similarity index 100% rename from src/vulkan/tests/state_pool.c rename to 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 similarity index 100% rename from src/vulkan/tests/state_pool_free_list_only.c rename to 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 similarity index 100% rename from src/vulkan/tests/state_pool_no_free.c rename to 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 similarity index 100% rename from src/vulkan/tests/state_pool_test_helper.h rename to src/intel/vulkan/tests/state_pool_test_helper.h -- 2.30.2