OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/device: fix panic when disabling 3D image write support

Browse Source 
Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12985
Reviewed-by: @LingMan
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34649>
(cherry picked from commit 6f080ac5324b7cf1d394ea1a08a8002be74326f6)
This commit is contained in:
Karol Herbst
2025-04-22 13:42:57 +02:00
committed by Eric Engestrom
parent 6cf01adf6b
commit c1a358d8ca
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -254,7 +254,7 @@
"description": "rusticl/device: fix panic when disabling 3D image write support",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

13
src/gallium/frontends/rusticl/core/device.rs
View File

@@ -364,11 +364,14 @@ impl Device {
// if we can't advertize 3d image write ext, we have to disable them all
if !self.caps.has_3d_image_writes {
for f in &mut self.formats.values_mut() {
*f.get_mut(&CL_MEM_OBJECT_IMAGE3D).unwrap() &= !cl_mem_flags::from(
CL_MEM_WRITE_ONLY | CL_MEM_READ_WRITE | CL_MEM_KERNEL_READ_AND_WRITE,
);
}
self.formats
.values_mut()
.filter_map(|f| f.get_mut(&CL_MEM_OBJECT_IMAGE3D))
.for_each(|flags| {
*flags &= !cl_mem_flags::from(
CL_MEM_WRITE_ONLY | CL_MEM_READ_WRITE | CL_MEM_KERNEL_READ_AND_WRITE,
)
});
}
// we require formatted loads