ash: Update libloading from 0.6 to 0.7 (#374)
This new version marks `Library::new` as unsafe, because loading a library invokes the libraries' entrypoint which may or may not have certain preconditions and perform unsafe/undefined operations, just like any other native function loaded through `libloading`.
This commit is contained in:
parent
e8b369db7d
commit
7523d0be0f
2 changed files with 12 additions and 4 deletions
|
@ -11,7 +11,7 @@ documentation = "https://docs.rs/ash"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
libloading = { version = "0.6.1", optional = true }
|
libloading = { version = "0.7", optional = true }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["libloading"]
|
default = ["libloading"]
|
||||||
|
|
|
@ -42,6 +42,10 @@ impl Error for LoadingError {
|
||||||
impl EntryCustom<Arc<Library>> {
|
impl EntryCustom<Arc<Library>> {
|
||||||
/// Load default Vulkan library for the current platform
|
/// Load default Vulkan library for the current platform
|
||||||
///
|
///
|
||||||
|
/// # Safety
|
||||||
|
/// `dlopen`ing native libraries is inherently unsafe. The safety guidelines
|
||||||
|
/// for [`Library::new`] and [`Library::get`] apply here.
|
||||||
|
///
|
||||||
/// ```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>> {
|
||||||
|
@ -57,15 +61,19 @@ impl EntryCustom<Arc<Library>> {
|
||||||
/// let instance = unsafe { entry.create_instance(&create_info, None)? };
|
/// let instance = unsafe { entry.create_instance(&create_info, None)? };
|
||||||
/// # Ok(()) }
|
/// # Ok(()) }
|
||||||
/// ```
|
/// ```
|
||||||
pub fn new() -> Result<Entry, LoadingError> {
|
pub unsafe fn new() -> Result<Entry, LoadingError> {
|
||||||
Self::with_library(&LIB_PATH)
|
Self::with_library(&LIB_PATH)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Load Vulkan library at `path`
|
/// Load Vulkan library at `path`
|
||||||
pub fn with_library<P: AsRef<OsStr>>(path: &P) -> Result<Entry, LoadingError> {
|
///
|
||||||
|
/// # Safety
|
||||||
|
/// `dlopen`ing native libraries is inherently unsafe. The safety guidelines
|
||||||
|
/// for [`Library::new`] and [`Library::get`] apply here.
|
||||||
|
pub unsafe fn with_library(path: &impl AsRef<OsStr>) -> Result<Entry, LoadingError> {
|
||||||
let lib = Library::new(path).map_err(LoadingError).map(Arc::new)?;
|
let lib = Library::new(path).map_err(LoadingError).map(Arc::new)?;
|
||||||
|
|
||||||
Ok(Self::new_custom(lib, |vk_lib, name| unsafe {
|
Ok(Self::new_custom(lib, |vk_lib, name| {
|
||||||
vk_lib
|
vk_lib
|
||||||
.get(name.to_bytes_with_nul())
|
.get(name.to_bytes_with_nul())
|
||||||
.map(|symbol| *symbol)
|
.map(|symbol| *symbol)
|
||||||
|
|
Loading…
Add table
Reference in a new issue