fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rusticl/icd: Make it work in case Rustc shuffles struct around

Browse source 
Nothing guarentees fields are in order or anything like that. So do proper offset math

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21242>
This commit is contained in:
Karol Herbst 2023-02-10 17:01:37 +01:00 • committed by Marge Bot
parent f6c5cd33b0
commit cb611b207d
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gallium/frontends/rusticl/api/icd.rs
View file

@ -290,26 +290,25 @@ pub trait ReferenceCountedAPIPointer<T, const ERR: i32> {
#[macro_export]
macro_rules! impl_cl_type_trait {
($cl: ident, $t: ty, $err: ident) => {
($cl: ident, $t: path, $err: ident) => {
impl $crate::api::icd::ReferenceCountedAPIPointer<$t, $err> for $cl {
fn get_ptr(&self) -> CLResult<*const $t> {
type Base = $crate::api::icd::CLObjectBase<$err>;
Base::check_ptr(self.cast())?;
// Now that we've verified the object, it should be safe to
// dereference it. As one more double check, make sure that
// the CLObjectBase is at the start of the object
let obj_ptr: *const $t = self.cast();
unsafe {
let base_ptr = ::std::ptr::addr_of!((*obj_ptr).base);
assert!((obj_ptr as usize) == (base_ptr as usize));
}
Ok(obj_ptr)
let offset = ::mesa_rust_util::offset_of!($t, base);
let mut obj_ptr: *const u8 = self.cast();
// SAFETY: We offset the pointer back from the ICD specified base type to our
// internal type.
unsafe { obj_ptr = obj_ptr.sub(offset) }
Ok(obj_ptr.cast())
}
fn from_ptr(ptr: *const $t) -> Self {
ptr as Self
let offset = ::mesa_rust_util::offset_of!($t, base);
// SAFETY: The resulting pointer is safe as we simply offset into the ICD specified
// base type.
unsafe { (ptr as *const u8).add(offset) as Self }
}
}