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

rusticl/queue: fix error code for invalid sampler kernel arg

Browse source 
Fixes: 5795ee0e08 ("rusticl: translate spirv to nir and first steps to kernel arg handling")
(cherry picked from commit c0f0baeaca)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38432>
This commit is contained in:
Karol Herbst 2025-11-08 14:29:47 +01:00 • committed by Dylan Baker
parent efd2f1d61c
commit 3bb77d6906
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1534,7 +1534,7 @@
"description": "rusticl/queue: fix error code for invalid sampler kernel arg",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "5795ee0e08355ea2445ec9d4b2235a3a35ceda83",
"notes": null

11
src/gallium/frontends/rusticl/api/kernel.rs
View file

@ -416,13 +416,18 @@ fn set_kernel_arg(
return Err(CL_INVALID_ARG_VALUE);
}
}
// If the argument is of type sampler_t, the arg_value entry must be a pointer to the
// sampler object.
KernelArgType::Constant(_) | KernelArgType::Sampler => {
KernelArgType::Constant(_) => {
if arg_value.is_null() {
return Err(CL_INVALID_ARG_VALUE);
}
}
KernelArgType::Sampler => {
// CL_INVALID_SAMPLER for an argument declared to be of type sampler_t when the
// specified arg_value is not a valid sampler object.
if arg_value.is_null() {
return Err(CL_INVALID_SAMPLER);
}
}
_ => {}
};