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

rusticl/mem: move fill methods into concrete types

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27376>
This commit is contained in:
Karol Herbst 2024-01-29 19:54:20 +01:00 • committed by Marge Bot
parent 58c042f439
commit 5a1089b811
2 changed files with 80 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1969,7 +1969,7 @@ fn enqueue_fill_image(
evs,
event,
false,
Box::new(move |q, ctx| i.fill_image(q, ctx, &fill_color, &origin, &region)),
Box::new(move |q, ctx| i.fill(q, ctx, &fill_color, &origin, &region)),
)
//• CL_INVALID_IMAGE_SIZE if image dimensions (image width, height, specified or compute row and/or slice pitch) for image are not supported by device associated with queue.

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

@ -962,78 +962,6 @@ impl MemBase {
Ok(())
}
pub fn fill(
&self,
q: &Arc<Queue>,
ctx: &PipeContext,
pattern: &[u8],
mut offset: usize,
size: usize,
) -> CLResult<()> {
assert!(self.is_buffer());
let b = self.to_parent(&mut offset);
let res = b.get_res()?.get(&q.device).unwrap();
ctx.clear_buffer(
res,
pattern,
offset.try_into().map_err(|_| CL_OUT_OF_HOST_MEMORY)?,
size.try_into().map_err(|_| CL_OUT_OF_HOST_MEMORY)?,
);
Ok(())
}
pub fn fill_image(
&self,
q: &Arc<Queue>,
ctx: &PipeContext,
pattern: &[u32],
origin: &CLVec<usize>,
region: &CLVec<usize>,
) -> CLResult<()> {
assert!(!self.is_buffer());
let res = self.get_res()?.get(&q.device).unwrap();
// make sure we allocate multiples of 4 bytes so drivers don't read out of bounds or
// unaligned.
// TODO: use div_ceil once it's available
let pixel_size = align(self.pixel_size().unwrap() as usize, size_of::<u32>());
let mut new_pattern: Vec<u32> = vec![0; pixel_size / size_of::<u32>()];
// we don't support CL_DEPTH for now
assert!(pattern.len() == 4);
// SAFETY: pointers have to be valid for read/writes of exactly one pixel of their
// respective format.
// `new_pattern` has the correct size due to the `size` above.
// `pattern` is validated through the CL API and allows undefined behavior if not followed
// by CL API rules. It's expected to be a 4 component array of 32 bit values, except for
// CL_DEPTH where it's just one value.
unsafe {
util_format_pack_rgba(
self.pipe_format,
new_pattern.as_mut_ptr().cast(),
pattern.as_ptr().cast(),
1,
);
}
// If image is created from a buffer, use clear_image_buffer instead
// for each row
if self.is_parent_buffer() {
let strides = (
self.image_desc.row_pitch()? as usize,
self.image_desc.slice_pitch(),
);
ctx.clear_image_buffer(res, &new_pattern, origin, region, strides, pixel_size);
} else {
let bx = create_pipe_box(*origin, *region, self.mem_type)?;
ctx.clear_texture(res, &new_pattern, &bx);
}
Ok(())
}
pub fn write_from_user_rect(
&self,
src: *const c_void,
@ -1456,6 +1384,85 @@ impl Drop for MemBase {
}
}
impl Buffer {
fn apply_offset(&self, offset: usize) -> CLResult<usize> {
self.offset.checked_add(offset).ok_or(CL_OUT_OF_HOST_MEMORY)
}
pub fn fill(
&self,
q: &Queue,
ctx: &PipeContext,
pattern: &[u8],
offset: usize,
size: usize,
) -> CLResult<()> {
let offset = self.apply_offset(offset)?;
let res = self.get_res_of_dev(q.device)?;
ctx.clear_buffer(
res,
pattern,
offset.try_into().map_err(|_| CL_OUT_OF_HOST_MEMORY)?,
size.try_into().map_err(|_| CL_OUT_OF_HOST_MEMORY)?,
);
Ok(())
}
}
impl Image {
pub fn fill(
&self,
q: &Queue,
ctx: &PipeContext,
pattern: &[u32],
origin: &CLVec<usize>,
region: &CLVec<usize>,
) -> CLResult<()> {
let res = self.get_res_of_dev(q.device)?;
// make sure we allocate multiples of 4 bytes so drivers don't read out of bounds or
// unaligned.
// TODO: use div_ceil once it's available
let pixel_size = align(
self.image_format.pixel_size().unwrap().into(),
size_of::<u32>(),
);
let mut new_pattern: Vec<u32> = vec![0; pixel_size / size_of::<u32>()];
// we don't support CL_DEPTH for now
assert!(pattern.len() == 4);
// SAFETY: pointers have to be valid for read/writes of exactly one pixel of their
// respective format.
// `new_pattern` has the correct size due to the `size` above.
// `pattern` is validated through the CL API and allows undefined behavior if not followed
// by CL API rules. It's expected to be a 4 component array of 32 bit values, except for
// CL_DEPTH where it's just one value.
unsafe {
util_format_pack_rgba(
self.pipe_format,
new_pattern.as_mut_ptr().cast(),
pattern.as_ptr().cast(),
1,
);
}
// If image is created from a buffer, use clear_image_buffer instead
if self.is_parent_buffer() {
let strides = (
self.image_desc.row_pitch()? as usize,
self.image_desc.slice_pitch(),
);
ctx.clear_image_buffer(res, &new_pattern, origin, region, strides, pixel_size);
} else {
let bx = create_pipe_box(*origin, *region, self.mem_type)?;
ctx.clear_texture(res, &new_pattern, &bx);
}
Ok(())
}
}
pub struct Sampler {
pub base: CLObjectBase<CL_INVALID_SAMPLER>,
pub context: Arc<Context>,