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

rusticl: Implement spec for cl_khr_image2d_from_buffer

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20378>
This commit is contained in:
Antonio Gomes 2023-01-06 23:54:04 -03:00 • committed by Marge Bot
parent 010c18c443
commit 06daa03c5c
3 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ impl CLInfo<cl_device_info> for cl_device_id {
}
CL_DEVICE_IMAGE_MAX_ARRAY_SIZE => cl_prop::<usize>(dev.image_array_size()),
CL_DEVICE_IMAGE_MAX_BUFFER_SIZE => cl_prop::<usize>(dev.image_buffer_size()),
CL_DEVICE_IMAGE_PITCH_ALIGNMENT => cl_prop::<cl_uint>(0),
CL_DEVICE_IMAGE_PITCH_ALIGNMENT => cl_prop::<cl_uint>(dev.image_pitch_alignment()),
CL_DEVICE_IMAGE_SUPPORT => cl_prop::<bool>(dev.image_supported()),
CL_DEVICE_IMAGE2D_MAX_HEIGHT => cl_prop::<usize>(dev.image_2d_size()),
CL_DEVICE_IMAGE2D_MAX_WIDTH => cl_prop::<usize>(dev.image_2d_size()),

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

@ -452,7 +452,10 @@ fn validate_image_desc(
let p = p.get_arc()?;
if !match desc.image_type {
CL_MEM_OBJECT_IMAGE1D_BUFFER => p.is_buffer(),
CL_MEM_OBJECT_IMAGE2D => true,
CL_MEM_OBJECT_IMAGE2D => {
(p.is_buffer() && devs.iter().any(|d| d.image2d_from_buffer_supported()))
|| p.mem_type == CL_MEM_OBJECT_IMAGE2D
}
_ => false,
} {
return Err(CL_INVALID_OPERATION);
@ -478,12 +481,29 @@ fn validate_image_desc(
// host_ptr is not NULL and image_slice_pitch = 0, image_slice_pitch is calculated as
// image_row_pitch × image_height for a 2D image array or 3D image and image_row_pitch for a 1D
// image array. If image_slice_pitch is not 0, it must be a multiple of the image_row_pitch.
let has_buf_parent = parent.as_ref().map_or(false, |p| p.is_buffer());
if host_ptr.is_null() {
if desc.image_row_pitch != 0 || desc.image_slice_pitch != 0 {
if (desc.image_row_pitch != 0 || desc.image_slice_pitch != 0) && !has_buf_parent {
return Err(err);
}
desc.image_row_pitch = desc.image_width * elem_size;
desc.image_slice_pitch = desc.image_row_pitch * desc.image_height;
if desc.image_row_pitch == 0 {
desc.image_row_pitch = desc.image_width * elem_size;
}
if desc.image_slice_pitch == 0 {
desc.image_slice_pitch = desc.image_row_pitch * desc.image_height;
}
if has_buf_parent {
let pitch_alignment = devs
.iter()
.map(|d| d.image_pitch_alignment())
.max()
.unwrap() as usize;
if desc.image_row_pitch % (pitch_alignment * elem_size) != 0 {
return Err(err);
}
}
} else {
if desc.image_row_pitch == 0 {
desc.image_row_pitch = desc.image_width * elem_size;

16
src/gallium/frontends/rusticl/core/device.rs
View file

@ -500,6 +500,10 @@ impl Device {
if self.image_supported() {
add_ext(1, 0, 0, "", "__opencl_c_images");
if self.image2d_from_buffer_supported() {
add_ext(1, 0, 0, "cl_khr_image2d_from_buffer", "");
}
if self.image_read_write_supported() {
add_ext(1, 0, 0, "", "__opencl_c_read_write_images");
}
@ -610,8 +614,14 @@ impl Device {
.param(pipe_cap::PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS) as usize
}
pub fn image_pitch_alignment(&self) -> cl_uint {
self.screen
.param(pipe_cap::PIPE_CAP_LINEAR_IMAGE_PITCH_ALIGNMENT) as u32
}
pub fn image_base_address_alignment(&self) -> cl_uint {
0
self.screen
.param(pipe_cap::PIPE_CAP_LINEAR_IMAGE_BASE_ADDRESS_ALIGNMENT) as u32
}
pub fn image_buffer_size(&self) -> usize {
@ -623,6 +633,10 @@ impl Device {
self.shader_param(pipe_shader_cap::PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS) as cl_uint
}
pub fn image2d_from_buffer_supported(&self) -> bool {
self.image_pitch_alignment() != 0 && self.image_base_address_alignment() != 0
}
pub fn image_supported(&self) -> bool {
// TODO check CL_DEVICE_IMAGE_SUPPORT reqs
self.shader_param(pipe_shader_cap::PIPE_SHADER_CAP_MAX_SHADER_IMAGES) != 0 &&