AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/kernel: rework unsafe block inside clSetKernelArg

Browse Source 
No functional change

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35305>
This commit is contained in:
Karol Herbst
2025-06-03 09:16:59 +02:00
committed by Marge Bot
parent f663e3330c
commit 9e3f190e2e
1 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/rusticl/api/kernel.rs
+47 -47
View File
@@ -419,56 +419,56 @@ fn set_kernel_arg(
};
// let's create the arg now
let arg = unsafe {
match arg.kind {
KernelArgType::Constant(_) if !arg.dead => KernelArgValue::Constant(
slice::from_raw_parts(arg_value.cast(), arg_size).to_vec(),
),
KernelArgType::MemConstant | KernelArgType::MemGlobal => {
let ptr: *const cl_mem = arg_value.cast();
if ptr.is_null() || (*ptr).is_null() {
KernelArgValue::None
} else {
let buffer = Buffer::arc_from_raw(*ptr)?;
KernelArgValue::Buffer(Arc::downgrade(&buffer))
}
}
KernelArgType::MemLocal if !arg.dead => KernelArgValue::LocalMem(arg_size),
KernelArgType::Image | KernelArgType::RWImage | KernelArgType::Texture
if !arg.dead =>
{
let img: *const cl_mem = arg_value.cast();
let img = Image::arc_from_raw(*img)?;
// CL_INVALID_ARG_VALUE if the argument is an image declared with the read_only
// qualifier and arg_value refers to an image object created with cl_mem_flags
// of CL_MEM_WRITE_ONLY or if the image argument is declared with the write_only
// qualifier and arg_value refers to an image object created with cl_mem_flags
// of CL_MEM_READ_ONLY.
if arg.kind == KernelArgType::Texture && bit_check(img.flags, CL_MEM_WRITE_ONLY)
|| arg.kind == KernelArgType::Image
&& bit_check(img.flags, CL_MEM_READ_ONLY)
{
return Err(CL_INVALID_ARG_VALUE);
}
KernelArgValue::Image(Arc::downgrade(&img))
}
KernelArgType::Sampler if !arg.dead => {
let ptr: *const cl_sampler = arg_value.cast();
KernelArgValue::Sampler(Sampler::arc_from_raw(*ptr)?)
}
_ => {
debug_assert!(
arg.dead
|| matches!(
arg.kind,
KernelArgType::MemConstant | KernelArgType::MemGlobal
)
);
let arg = match arg.kind {
KernelArgType::Constant(_) if !arg.dead => KernelArgValue::Constant(
// SAFETY: for constant args arg_value points to raw data.
unsafe { slice::from_raw_parts(arg_value.cast(), arg_size) }.to_vec(),
),
KernelArgType::MemConstant | KernelArgType::MemGlobal => {
let ptr: *const cl_mem = arg_value.cast();
// SAFETY: for buffer args arg_value points to a cl_mem object or NULL.
if ptr.is_null() || unsafe { *ptr }.is_null() {
KernelArgValue::None
} else {
// SAFETY: as above
let buffer = Buffer::arc_from_raw(unsafe { *ptr })?;
KernelArgValue::Buffer(Arc::downgrade(&buffer))
}
}
KernelArgType::MemLocal if !arg.dead => KernelArgValue::LocalMem(arg_size),
KernelArgType::Image | KernelArgType::RWImage | KernelArgType::Texture if !arg.dead => {
let img: *const cl_mem = arg_value.cast();
// SAFETY: for image args arg_value pointers to a cl_mem object.
let img = Image::arc_from_raw(unsafe { *img })?;
// CL_INVALID_ARG_VALUE if the argument is an image declared with the read_only
// qualifier and arg_value refers to an image object created with cl_mem_flags
// of CL_MEM_WRITE_ONLY or if the image argument is declared with the write_only
// qualifier and arg_value refers to an image object created with cl_mem_flags
// of CL_MEM_READ_ONLY.
if arg.kind == KernelArgType::Texture && bit_check(img.flags, CL_MEM_WRITE_ONLY)
|| arg.kind == KernelArgType::Image && bit_check(img.flags, CL_MEM_READ_ONLY)
{
return Err(CL_INVALID_ARG_VALUE);
}
KernelArgValue::Image(Arc::downgrade(&img))
}
KernelArgType::Sampler if !arg.dead => {
let ptr: *const cl_sampler = arg_value.cast();
// SAFETY: for a sampler arg arg_value points to a cl_sampler object.
KernelArgValue::Sampler(Sampler::arc_from_raw(unsafe { *ptr })?)
}
_ => {
debug_assert!(
arg.dead
|| matches!(
arg.kind,
KernelArgType::MemConstant | KernelArgType::MemGlobal
)
);
KernelArgValue::None
}
};
k.set_kernel_arg(arg_index, arg)
} else {