diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-18 10:37:59 -0800 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-18 10:37:59 -0800 |
commit | 9851c8285f7bf70a6cb4bede2ee94110c14acc19 (patch) | |
tree | a14cdf60da6797d1f92ac937c8ecb594622d5072 /src | |
parent | 47b8b08612d44a43e43c3f6e95fe509ee3348723 (diff) | |
download | external_mesa3d-9851c8285f7bf70a6cb4bede2ee94110c14acc19.zip external_mesa3d-9851c8285f7bf70a6cb4bede2ee94110c14acc19.tar.gz external_mesa3d-9851c8285f7bf70a6cb4bede2ee94110c14acc19.tar.bz2 |
Move the intel vulkan driver to src/intel/vulkan
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/intel/Makefile.am | 2 | ||||
-rw-r--r-- | src/intel/vulkan/.gitignore (renamed from src/vulkan/.gitignore) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/Makefile.am (renamed from src/vulkan/Makefile.am) | 4 | ||||
-rw-r--r-- | src/intel/vulkan/anv_allocator.c (renamed from src/vulkan/anv_allocator.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_batch_chain.c (renamed from src/vulkan/anv_batch_chain.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_cmd_buffer.c (renamed from src/vulkan/anv_cmd_buffer.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_descriptor_set.c (renamed from src/vulkan/anv_descriptor_set.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_device.c (renamed from src/vulkan/anv_device.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_dump.c (renamed from src/vulkan/anv_dump.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_entrypoints_gen.py (renamed from src/vulkan/anv_entrypoints_gen.py) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_formats.c (renamed from src/vulkan/anv_formats.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_gem.c (renamed from src/vulkan/anv_gem.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_gem_stubs.c (renamed from src/vulkan/anv_gem_stubs.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_gen_macros.h (renamed from src/vulkan/anv_gen_macros.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_image.c (renamed from src/vulkan/anv_image.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_intel.c (renamed from src/vulkan/anv_intel.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_meta.c (renamed from src/vulkan/anv_meta.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_meta.h (renamed from src/vulkan/anv_meta.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_meta_blit.c (renamed from src/vulkan/anv_meta_blit.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_meta_clear.c (renamed from src/vulkan/anv_meta_clear.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_meta_resolve.c (renamed from src/vulkan/anv_meta_resolve.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_nir.h (renamed from src/vulkan/anv_nir.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_nir_apply_dynamic_offsets.c (renamed from src/vulkan/anv_nir_apply_dynamic_offsets.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_nir_apply_pipeline_layout.c (renamed from src/vulkan/anv_nir_apply_pipeline_layout.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_nir_lower_push_constants.c (renamed from src/vulkan/anv_nir_lower_push_constants.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_pass.c (renamed from src/vulkan/anv_pass.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_pipeline.c (renamed from src/vulkan/anv_pipeline.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_pipeline_cache.c (renamed from src/vulkan/anv_pipeline_cache.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_private.h (renamed from src/vulkan/anv_private.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_query.c (renamed from src/vulkan/anv_query.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_util.c (renamed from src/vulkan/anv_util.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_wsi.c (renamed from src/vulkan/anv_wsi.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_wsi.h (renamed from src/vulkan/anv_wsi.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_wsi_wayland.c (renamed from src/vulkan/anv_wsi_wayland.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/anv_wsi_x11.c (renamed from src/vulkan/anv_wsi_x11.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/dev_icd.json.in (renamed from src/vulkan/dev_icd.json.in) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen7_cmd_buffer.c (renamed from src/vulkan/gen7_cmd_buffer.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen7_pipeline.c (renamed from src/vulkan/gen7_pipeline.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen7_state.c (renamed from src/vulkan/gen7_state.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen8_cmd_buffer.c (renamed from src/vulkan/gen8_cmd_buffer.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen8_pipeline.c (renamed from src/vulkan/gen8_pipeline.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/gen8_state.c (renamed from src/vulkan/gen8_state.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c (renamed from src/vulkan/genX_cmd_buffer.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/genX_pipeline.c (renamed from src/vulkan/genX_pipeline.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/genX_pipeline_util.h (renamed from src/vulkan/genX_pipeline_util.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/genX_state_util.h (renamed from src/vulkan/genX_state_util.h) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/intel_icd.json.in (renamed from src/vulkan/intel_icd.json.in) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/.gitignore (renamed from src/vulkan/tests/.gitignore) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/Makefile.am (renamed from src/vulkan/tests/Makefile.am) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/block_pool_no_free.c (renamed from src/vulkan/tests/block_pool_no_free.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/state_pool.c (renamed from src/vulkan/tests/state_pool.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/state_pool_free_list_only.c (renamed from src/vulkan/tests/state_pool_free_list_only.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/state_pool_no_free.c (renamed from src/vulkan/tests/state_pool_no_free.c) | 0 | ||||
-rw-r--r-- | src/intel/vulkan/tests/state_pool_test_helper.h (renamed from src/vulkan/tests/state_pool_test_helper.h) | 0 |
55 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 02b8371..73686a9 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 520602d..d5bd0b3 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 40afc2e..40afc2e 100644 --- a/src/vulkan/.gitignore +++ b/src/intel/vulkan/.gitignore diff --git a/src/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 0605dc4..2144e5a 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 a7ae975..a7ae975 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 d24dd06..d24dd06 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 b060828..b060828 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 7a77336..7a77336 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 a8835f7..a8835f7 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 b7fa28b..b7fa28b 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 1e4cfcb..1e4cfcb 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 7798a7b..7798a7b 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 0a7be35..0a7be35 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 3204fef..3204fef 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 ef2ecd5..ef2ecd5 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 0a412a3..0a412a3 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 d95d9af..d95d9af 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 82944ea..82944ea 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 d33e9e6..d33e9e6 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 07ebcbc..07ebcbc 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 739ae09..739ae09 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 ea5020c..ea5020c 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 a7ea3eb..a7ea3eb 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 e71a8ff..e71a8ff 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 c58a938..c58a938 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 53cd3d7..53cd3d7 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 d07e9fe..d07e9fe 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 a7feefb..a7feefb 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 c89bb2a..c89bb2a 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 ba86333..ba86333 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 e45b519..e45b519 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 22fd01c..22fd01c 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 c5911a3..c5911a3 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 6e9ff9b..6e9ff9b 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 6f25eaf..6f25eaf 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 843a6b6..843a6b6 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 8492036..8492036 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 23327ec..23327ec 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 7c054fa..7c054fa 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 77bdb75..77bdb75 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 b741612..b741612 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 f041156..f041156 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 04cfff5..04cfff5 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 5498d1d..5498d1d 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 4c2e0bc..4c2e0bc 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 696e2be..696e2be 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 67f798a..67f798a 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 d9b363a..d9b363a 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 5d05405..5d05405 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 883013d..883013d 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 86d1a76..86d1a76 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 878ec19..878ec19 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 2f4eb47..2f4eb47 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 4b248c2..4b248c2 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 0e56431..0e56431 100644 --- a/src/vulkan/tests/state_pool_test_helper.h +++ b/src/intel/vulkan/tests/state_pool_test_helper.h |