diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/intel/vulkan/.gitignore | 1 | ||||
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 14 | ||||
| -rw-r--r-- | src/intel/vulkan/intel_icd.json (renamed from src/intel/vulkan/intel_icd.json.in) | 2 |
4 files changed, 2 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 7e63bfa..d215b63 100644 --- a/configure.ac +++ b/configure.ac @@ -1667,13 +1667,6 @@ AC_ARG_WITH([vulkan-icddir], [VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d']) AC_SUBST([VULKAN_ICD_INSTALL_DIR]) -AC_ARG_ENABLE([vulkan-icd-full-driver-path], - [AS_HELP_STRING([--disable-vulkan-icd-full-driver-path], - [create Vulkan ICD files with just a .so name and no path])], - [vulkan_icd_driver_path="$enableval"], - [vulkan_icd_driver_path="yes"]) -AM_CONDITIONAL(VULKAN_ICD_DRIVER_PATH, test "x$vulkan_icd_driver_path" = xyes) - if test -n "$with_vulkan_drivers"; then VULKAN_DRIVERS=`IFS=', '; echo $with_vulkan_drivers` for driver in $VULKAN_DRIVERS; do diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore index a099ff6..bde5cd8 100644 --- a/src/intel/vulkan/.gitignore +++ b/src/intel/vulkan/.gitignore @@ -3,4 +3,3 @@ /anv_entrypoints.h /anv_timestamp.h /dev_icd.json -/intel_icd.json diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 5d2b3a5..6e17188 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -147,12 +147,11 @@ anv_timestamp.h: $(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) dev_icd.json intel_icd.json +CLEANFILES = $(BUILT_SOURCES) dev_icd.json EXTRA_DIST = \ $(top_srcdir)/include/vulkan/vk_icd.h \ anv_entrypoints_gen.py \ dev_icd.json.in \ - intel_icd.json.in \ intel_icd.json libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) @@ -177,17 +176,6 @@ dev_icd.json : dev_icd.json.in -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ < $(srcdir)/dev_icd.json.in > $@ -if VULKAN_ICD_DRIVER_PATH -ICD_DRIVER_PATH="${libdir}/libvulkan_intel.so" -else -ICD_DRIVER_PATH="libvulkan_intel.so" -endif - -intel_icd.json : intel_icd.json.in - $(AM_V_GEN) $(SED) \ - -e "s#@ICD_DRIVER_PATH@#${ICD_DRIVER_PATH}#" \ - < $(srcdir)/intel_icd.json.in > $@ - # Libvulkan with dummy gem. Used for unit tests. libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json index 4f50866..277c14e 100644 --- a/src/intel/vulkan/intel_icd.json.in +++ b/src/intel/vulkan/intel_icd.json @@ -1,7 +1,7 @@ { "file_format_version": "1.0.0", "ICD": { - "library_path": "@ICD_DRIVER_PATH@", + "library_path": "libvulkan_intel.so", "abi_versions": "1.0.3" } } |