alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

entry_libloading: Provide Vulkan library loader from custom path (#319)

Browse source 
It is in some cases necessary to load a specific Vulkan dll/so with a
different name and/or from a different location.

Instead of copying this function to a downstream project (and making the
LoadingError constructor public to retain the same interface), split
Entry::new() such that downstream projects can easily specify and use an
alternate Vulkan implementation.
This commit is contained in:
MarijnS95 2020-08-03 11:19:42 +02:00 committed by GitHub
parent 31bd928c4b
commit c6d5d66142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ash/src/entry_libloading.rs
View file

@ -1,6 +1,7 @@
use crate::entry::EntryCustom;
use libloading::Library;
use std::error::Error;
use std::ffi::OsStr;
use std::fmt;
use std::ptr;
use std::sync::Arc;
@ -39,6 +40,8 @@ impl Error for LoadingError {
}
impl EntryCustom<Arc<Library>> {
/// Load default Vulkan library for the current platform
///
/// ```rust,no_run
/// use ash::{vk, Entry, version::EntryV1_0};
/// # fn main() -> Result<(), Box<std::error::Error>> {
@ -55,9 +58,12 @@ impl EntryCustom<Arc<Library>> {
/// # Ok(()) }
/// ```
pub fn new() -> Result<Entry, LoadingError> {
let lib = Library::new(&LIB_PATH)
.map_err(LoadingError)
.map(Arc::new)?;
Self::with_library(&LIB_PATH)
}
/// Load Vulkan library at `path`
pub fn with_library<P: AsRef<OsStr>>(path: &P) -> Result<Entry, LoadingError> {
let lib = Library::new(path).map_err(LoadingError).map(Arc::new)?;
Ok(Self::new_custom(lib, |vk_lib, name| unsafe {
vk_lib