fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rusticl: use MemCB

Browse source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25669>
This commit is contained in:
LingMan 2023-10-11 23:55:31 +02:00 • committed by Marge Bot
parent c5c4cc4137
commit 07ca0df72e
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/frontends/rusticl/api/memory.rs
View file

@ -8,7 +8,6 @@ use crate::core::context::Context;
use crate::core::device::*;
use crate::core::format::*;
use crate::core::memory::*;
use crate::*;
use mesa_rust_util::properties::Properties;
use mesa_rust_util::ptr::*;
@ -355,15 +354,11 @@ fn set_mem_object_destructor_callback(
) -> CLResult<()> {
let m = memobj.get_ref()?;
// CL_INVALID_VALUE if pfn_notify is NULL.
if pfn_notify.is_none() {
return Err(CL_INVALID_VALUE);
}
// SAFETY: The requirements on `MemCB::new` match the requirements
// imposed by the OpenCL specification. It is the caller's duty to uphold them.
let cb = unsafe { MemCB::new(pfn_notify, user_data)? };
m.cbs
.lock()
.unwrap()
.push(cl_closure!(|m| pfn_notify(m, user_data)));
m.cbs.lock().unwrap().push(cb);
Ok(())
}

3
src/gallium/frontends/rusticl/api/types.rs
View file

@ -49,10 +49,13 @@ macro_rules! cl_callback {
/// [`clSetContextDestructorCallback`] in the OpenCL specification.
/// - EventCB: `func` must be soundly callable as documented on
/// [`clSetEventCallback`] in the OpenCL specification.
/// - MemCB: `func` must be soundly callable as documented on
/// [`clSetMemObjectDestructorCallback`] in the OpenCL specification.
///
/// [`clCreateContext`]: https://registry.khronos.org/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clCreateContext
/// [`clSetContextDestructorCallback`]: https://registry.khronos.org/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clSetContextDestructorCallback
/// [`clSetEventCallback`]: https://registry.khronos.org/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clSetEventCallback
/// [`clSetMemObjectDestructorCallback`]: https://registry.khronos.org/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clSetMemObjectDestructorCallback
pub unsafe fn new(func: Option<$fn_alias>, data: *mut c_void) -> CLResult<Self> {
let Some(func) = func else {
return Err(CL_INVALID_VALUE);

4
src/gallium/frontends/rusticl/core/memory.rs
View file

@ -116,7 +116,7 @@ pub struct Mem {
pub image_desc: cl_image_desc,
pub image_elem_size: u8,
pub props: Vec<cl_mem_properties>,
pub cbs: Mutex<Vec<Box<dyn Fn(cl_mem)>>>,
pub cbs: Mutex<Vec<MemCB>>,
res: Option<HashMap<&'static Device, Arc<PipeResource>>>,
maps: Mutex<Mappings>,
}
@ -1240,7 +1240,7 @@ impl Drop for Mem {
.unwrap()
.iter()
.rev()
.for_each(|cb| cb(cl));
.for_each(|cb| unsafe { (cb.func)(cl, cb.data) });
for (d, tx) in self.maps.get_mut().unwrap().tx.drain() {
d.helper_ctx().unmap(tx.tx);