Compare commits

...

2 Commits

Author SHA1 Message Date
Emil Velikov
e45c4586c2 Update version to 13.0.0-rc1
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-10-19 19:12:42 +01:00
Emil Velikov
2ced8eb136 Revert Use absolute path in intel_icd.json and related patches.
This commit effectively reverts the following commits:

This reverts commit 0b6837a643.
This reverts commit 05f36435ef.
This reverts commit a2ae67aa47.

While the feature introduced is convinient for development it is not as
useful for distributions. Furthermore it even breaks things as one
wishes to have both 32 and 64 bit package installed on the same system.

Keep the functionality in development branch(es) and drop it from
distribution packages to avoid confusion and misuse.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-10-19 19:10:30 +01:00
5 changed files with 3 additions and 23 deletions

View File

@@ -1 +1 @@
12.1.0-devel
13.0.0-rc1

View File

@@ -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

View File

@@ -3,4 +3,3 @@
/anv_entrypoints.h
/anv_timestamp.h
/dev_icd.json
/intel_icd.json

View File

@@ -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)

View File

@@ -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"
}
}