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

rusticl: use DeleteContextCB

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 21:35:23 +02:00 • committed by Marge Bot
parent f34ff1daa5
commit 250f6e9b2e
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
use crate::api::icd::*;
use crate::api::types::*;
use crate::api::util::*;
use crate::cl_closure;
use crate::core::context::*;
use crate::core::device::get_devs_for_type;
use crate::core::platform::*;
@ -132,14 +131,10 @@ fn set_context_destructor_callback(
) -> CLResult<()> {
let c = context.get_ref()?;
// CL_INVALID_VALUE if pfn_notify is NULL.
if pfn_notify.is_none() {
return Err(CL_INVALID_VALUE);
}
// SAFETY: The requirements on `DeleteContextCB::new` match the requirements
// imposed by the OpenCL specification. It is the caller's duty to uphold them.
let cb = unsafe { DeleteContextCB::new(pfn_notify, user_data)? };
c.dtors
.lock()
.unwrap()
.push(cl_closure!(|c| pfn_notify(c, user_data)));
c.dtors.lock().unwrap().push(cb);
Ok(())
}

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

@ -45,8 +45,11 @@ macro_rules! cl_callback {
/// - Passing `data` as the last parameter to `func` must not cause unsoundness.
/// - CreateContextCB: `func` must be soundly callable as documented on
/// [`clCreateContext`] in the OpenCL specification.
/// - DeleteContextCB: `func` must be soundly callable as documented on
/// [`clSetContextDestructorCallback`] 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
pub unsafe fn new(func: Option<$fn_alias>, data: *mut c_void) -> CLResult<Self> {
let Some(func) = func else {
return Err(CL_INVALID_VALUE);

5
src/gallium/frontends/rusticl/core/context.rs
View file

@ -1,4 +1,5 @@
use crate::api::icd::*;
use crate::api::types::DeleteContextCB;
use crate::core::device::*;
use crate::core::format::*;
use crate::core::memory::*;
@ -22,7 +23,7 @@ pub struct Context {
pub base: CLObjectBase<CL_INVALID_CONTEXT>,
pub devs: Vec<&'static Device>,
pub properties: Properties<cl_context_properties>,
pub dtors: Mutex<Vec<Box<dyn Fn(cl_context)>>>,
pub dtors: Mutex<Vec<DeleteContextCB>>,
pub svm_ptrs: Mutex<BTreeMap<*const c_void, Layout>>,
}
@ -208,6 +209,6 @@ impl Drop for Context {
.unwrap()
.iter()
.rev()
.for_each(|cb| cb(cl));
.for_each(|cb| unsafe { (cb.func)(cl, cb.data) });
}
}