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

ash/entry: Fix trivial_casts lint warning on Android/aarch64 (#612)

Browse source 
On certain platforms including Android and `aarch64` `c_char` is
unsigned, resulting in the same `u8` type as the byte-string here making
the cast redundant.

Just like any other code calling `get_instance_proc_addr`, use
`CStr::from_bytes_with_nul_unchecked` which abstracts away any
pointer-cast.
This commit is contained in:
Marijn Suijten 2022-04-15 20:12:06 +02:00 committed by GitHub
parent e5c4d11b03
commit b9d5b588fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ash/src/entry.rs
View file

@ -194,10 +194,12 @@ impl Entry {
unsafe { unsafe {
let mut api_version = 0; let mut api_version = 0;
let enumerate_instance_version: Option<vk::PFN_vkEnumerateInstanceVersion> = { let enumerate_instance_version: Option<vk::PFN_vkEnumerateInstanceVersion> = {
let name = b"vkEnumerateInstanceVersion\0".as_ptr() as *const _; let name = ::std::ffi::CStr::from_bytes_with_nul_unchecked(
b"vkEnumerateInstanceVersion\0",
);
mem::transmute((self.static_fn.get_instance_proc_addr)( mem::transmute((self.static_fn.get_instance_proc_addr)(
vk::Instance::null(), vk::Instance::null(),
name, name.as_ptr(),
)) ))
}; };
if let Some(enumerate_instance_version) = enumerate_instance_version { if let Some(enumerate_instance_version) = enumerate_instance_version {