diff options
| author | Robert Nagy <robert@cvs.openbsd.org> | 2023-05-01 06:46:27 +0000 |
|---|---|---|
| committer | Robert Nagy <robert@cvs.openbsd.org> | 2023-05-01 06:46:27 +0000 |
| commit | b6fb6c37ff0e39007f5fa5f4bc6a89435a2041d0 (patch) | |
| tree | 6ba3a01089cd08ac2f11c510b6f14572828f2820 | |
| parent | 0a96e17e53cac53e930ccb87d4b046594b482d24 (diff) | |
search for the vulkan drivers in the system library path instead of
loading them with a full path to utilitze the ld.so cache so that we
can pre-load these libraries for mesa before calling unveil(2)
ok jsg@
| -rw-r--r-- | lib/mesa/generated/Makefile | 6 | ||||
| -rw-r--r-- | lib/mesa/generated/src/amd/vulkan/radeon_icd.json | 2 | ||||
| -rw-r--r-- | lib/mesa/generated/src/intel/vulkan/intel_icd.json | 2 | ||||
| -rw-r--r-- | lib/mesa/generated/src/intel/vulkan_hasvk/intel_hasvk_icd.json | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/mesa/generated/Makefile b/lib/mesa/generated/Makefile index 33be2b614..d1cc84644 100644 --- a/lib/mesa/generated/Makefile +++ b/lib/mesa/generated/Makefile @@ -363,17 +363,17 @@ all: ${PYTHON} ${MESA_SRC}/src/vulkan/util/vk_icd_gen.py \ --api-version 1.3 \ --xml ${MESA_SRC}/src/vulkan/registry/vk.xml \ - --lib-path ${X11BASE}/lib/libvulkan_radeon.so \ + --lib-path libvulkan_radeon.so \ --out src/amd/vulkan/radeon_icd.json ${PYTHON} ${MESA_SRC}/src/vulkan/util/vk_icd_gen.py \ --api-version 1.3 \ --xml ${MESA_SRC}/src/vulkan/registry/vk.xml \ - --lib-path ${X11BASE}/lib/libvulkan_intel.so \ + --lib-path libvulkan_intel.so \ --out src/intel/vulkan/intel_icd.json ${PYTHON} ${MESA_SRC}/src/vulkan/util/vk_icd_gen.py \ --api-version 1.3 \ --xml ${MESA_SRC}/src/vulkan/registry/vk.xml \ - --lib-path ${X11BASE}/lib/libvulkan_intel_hasvk.so \ + --lib-path libvulkan_intel_hasvk.so \ --out src/intel/vulkan_hasvk/intel_hasvk_icd.json ${PYTHON} ${MESA_SRC}/src/vulkan/util/vk_entrypoints_gen.py \ --xml ${MESA_SRC}/src/vulkan/registry/vk.xml \ diff --git a/lib/mesa/generated/src/amd/vulkan/radeon_icd.json b/lib/mesa/generated/src/amd/vulkan/radeon_icd.json index 22aba9cf1..07e086e9d 100644 --- a/lib/mesa/generated/src/amd/vulkan/radeon_icd.json +++ b/lib/mesa/generated/src/amd/vulkan/radeon_icd.json @@ -1,7 +1,7 @@ { "ICD": { "api_version": "1.3.230", - "library_path": "/usr/X11R6/lib/libvulkan_radeon.so" + "library_path": "libvulkan_radeon.so" }, "file_format_version": "1.0.0" }
\ No newline at end of file diff --git a/lib/mesa/generated/src/intel/vulkan/intel_icd.json b/lib/mesa/generated/src/intel/vulkan/intel_icd.json index 28f9cc7b1..6685d83f8 100644 --- a/lib/mesa/generated/src/intel/vulkan/intel_icd.json +++ b/lib/mesa/generated/src/intel/vulkan/intel_icd.json @@ -1,7 +1,7 @@ { "ICD": { "api_version": "1.3.230", - "library_path": "/usr/X11R6/lib/libvulkan_intel.so" + "library_path": "libvulkan_intel.so" }, "file_format_version": "1.0.0" }
\ No newline at end of file diff --git a/lib/mesa/generated/src/intel/vulkan_hasvk/intel_hasvk_icd.json b/lib/mesa/generated/src/intel/vulkan_hasvk/intel_hasvk_icd.json index 6064a3cc0..46e8b1569 100644 --- a/lib/mesa/generated/src/intel/vulkan_hasvk/intel_hasvk_icd.json +++ b/lib/mesa/generated/src/intel/vulkan_hasvk/intel_hasvk_icd.json @@ -1,7 +1,7 @@ { "ICD": { "api_version": "1.3.230", - "library_path": "/usr/X11R6/lib/libvulkan_intel_hasvk.so" + "library_path": "libvulkan_intel_hasvk.so" }, "file_format_version": "1.0.0" }
\ No newline at end of file |