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

Switch to libloading

Browse source
This commit is contained in:
Friz64 2020-03-14 01:10:03 +01:00
parent 39a6a8552a
commit 7789163507
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ash/Cargo.toml
View file

@ -11,7 +11,7 @@ documentation = "https://docs.rs/ash"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
shared_library = "0.1.9" libloading = "0.5.2"
[features] [features]
default = [] default = []

17
ash/src/entry.rs
View file

@ -2,13 +2,13 @@ use crate::instance::Instance;
use crate::prelude::*; use crate::prelude::*;
use crate::vk; use crate::vk;
use crate::RawPtr; use crate::RawPtr;
use shared_library::dynamic_library::DynamicLibrary; use libloading::Library;
use std::error::Error; use std::error::Error;
use std::fmt; use std::fmt;
use std::io;
use std::mem; use std::mem;
use std::os::raw::c_char; use std::os::raw::c_char;
use std::os::raw::c_void; use std::os::raw::c_void;
use std::path::Path;
use std::ptr; use std::ptr;
use std::sync::Arc; use std::sync::Arc;
@ -28,7 +28,7 @@ const LIB_PATH: &str = "libvulkan.so";
const LIB_PATH: &str = "libvulkan.dylib"; const LIB_PATH: &str = "libvulkan.dylib";
/// Function loader /// Function loader
pub type Entry = EntryCustom<Arc<DynamicLibrary>>; pub type Entry = EntryCustom<Arc<Library>>;
/// Function loader /// Function loader
#[derive(Clone)] #[derive(Clone)]
@ -40,9 +40,9 @@ pub struct EntryCustom<L> {
lib: L, lib: L,
} }
#[derive(Clone, Debug)] #[derive(Debug)]
pub enum LoadingError { pub enum LoadingError {
LibraryLoadError(String), LibraryLoadError(io::Error),
} }
impl fmt::Display for LoadingError { impl fmt::Display for LoadingError {
@ -206,7 +206,7 @@ impl<L> EntryV1_2 for EntryCustom<L> {
} }
} }
impl EntryCustom<Arc<DynamicLibrary>> { impl EntryCustom<Arc<Library>> {
/// ```rust,no_run /// ```rust,no_run
/// use ash::{vk, Entry, version::EntryV1_0}; /// use ash::{vk, Entry, version::EntryV1_0};
/// # fn main() -> Result<(), Box<std::error::Error>> { /// # fn main() -> Result<(), Box<std::error::Error>> {
@ -225,13 +225,14 @@ impl EntryCustom<Arc<DynamicLibrary>> {
pub fn new() -> Result<Entry, LoadingError> { pub fn new() -> Result<Entry, LoadingError> {
Self::new_custom( Self::new_custom(
|| { || {
DynamicLibrary::open(Some(&Path::new(LIB_PATH))) Library::new(&LIB_PATH)
.map_err(LoadingError::LibraryLoadError) .map_err(LoadingError::LibraryLoadError)
.map(Arc::new) .map(Arc::new)
}, },
|vk_lib, name| unsafe { |vk_lib, name| unsafe {
vk_lib vk_lib
.symbol(&*name.to_string_lossy()) .get(name.to_bytes_with_nul())
.map(|symbol| *symbol)
.unwrap_or(ptr::null_mut()) .unwrap_or(ptr::null_mut())
}, },
) )