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

rusticl/mem: move Buffer and Image specific fields into the subtypes

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27376>
This commit is contained in:
Karol Herbst
2024-01-31 02:13:54 +01:00
committed by Marge Bot
parent cf73ac8096
commit b834d41d4b
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/rusticl/api/memory.rs
+12 -7
View File
@@ -235,7 +235,11 @@ impl CLInfo<cl_mem_info> for cl_mem {
// TODO debugging feature
CL_MEM_MAP_COUNT => cl_prop::<cl_uint>(0),
CL_MEM_HOST_PTR => cl_prop::<*mut c_void>(mem.host_ptr),
CL_MEM_OFFSET => cl_prop::<usize>(mem.offset),
CL_MEM_OFFSET => cl_prop::<usize>(if mem.is_buffer() {
Buffer::ref_from_raw(*self)?.offset
} else {
0
}),
CL_MEM_PROPERTIES => cl_prop::<&Vec<cl_mem_properties>>(&mem.props),
CL_MEM_REFERENCE_COUNT => cl_prop::<cl_uint>(if mem.is_buffer() {
Buffer::refcnt(*self)?
@@ -544,7 +548,7 @@ fn validate_image_desc(
Ok((desc, parent))
}
fn validate_image_bounds(i: &MemBase, origin: CLVec<usize>, region: CLVec<usize>) -> CLResult<()> {
fn validate_image_bounds(i: &Image, origin: CLVec<usize>, region: CLVec<usize>) -> CLResult<()> {
let dims = i.image_desc.dims_with_array();
let bound = region + origin;
if bound > i.image_desc.size() {
@@ -626,7 +630,8 @@ fn validate_buffer(
// image descriptor except for mem_object must match the image descriptor information
// associated with mem_object.
CL_MEM_OBJECT_IMAGE2D => {
if desc.image_type != mem.mem_type || !desc_eq_no_buffer(desc, &mem.image_desc) {
let image = Image::ref_from_raw(mem_object).unwrap();
if desc.image_type != mem.mem_type || !desc_eq_no_buffer(desc, &image.image_desc) {
return Err(err);
}
@@ -639,13 +644,13 @@ fn validate_buffer(
//
// The image channel data type specified in image_format must match the image channel
// data type associated with mem_object.
if format.image_channel_data_type != mem.image_format.image_channel_data_type {
if format.image_channel_data_type != image.image_format.image_channel_data_type {
return Err(CL_INVALID_IMAGE_FORMAT_DESCRIPTOR);
}
// The image channel order specified in image_format must be compatible with the image
// channel order associated with mem_object. Compatible image channel orders are:
if format.image_channel_order != mem.image_format.image_channel_order {
if format.image_channel_order != image.image_format.image_channel_order {
// in image_format | in mem_object:
// CL_sBGRA | CL_BGRA
// CL_BGRA | CL_sBGRA
@@ -658,7 +663,7 @@ fn validate_buffer(
// CL_DEPTH | CL_R
match (
format.image_channel_order,
mem.image_format.image_channel_order,
image.image_format.image_channel_order,
) {
(CL_sBGRA, CL_BGRA)
| (CL_BGRA, CL_sBGRA)
@@ -705,7 +710,7 @@ fn validate_buffer(
#[cl_info_entrypoint(cl_get_image_info)]
impl CLInfo<cl_image_info> for cl_mem {
fn query(&self, q: cl_image_info, _: &[u8]) -> CLResult<Vec<MaybeUninit<u8>>> {
let mem = MemBase::ref_from_raw(*self)?;
let mem = Image::ref_from_raw(*self)?;
Ok(match *q {
CL_IMAGE_ARRAY_SIZE => cl_prop::<usize>(mem.image_desc.image_array_size),
CL_IMAGE_BUFFER => cl_prop::<cl_mem>(unsafe { mem.image_desc.anon_1.buffer }),
src/gallium/frontends/rusticl/core/memory.rs
+24 -27
View File
@@ -168,12 +168,7 @@ pub struct MemBase {
pub mem_type: cl_mem_object_type,
pub flags: cl_mem_flags,
pub size: usize,
pub offset: usize,
pub host_ptr: *mut c_void,
pub image_format: cl_image_format,
pub pipe_format: pipe_format,
pub image_desc: cl_image_desc,
pub image_elem_size: u8,
pub props: Vec<cl_mem_properties>,
pub cbs: Mutex<Vec<MemCB>>,
pub gl_obj: Option<GLObject>,
@@ -183,10 +178,15 @@ pub struct MemBase {
pub struct Buffer {
base: MemBase,
pub offset: usize,
}
pub struct Image {
base: MemBase,
pub image_format: cl_image_format,
pub pipe_format: pipe_format,
pub image_desc: cl_image_desc,
pub image_elem_size: u8,
}
impl Deref for Buffer {
@@ -385,18 +385,14 @@ impl MemBase {
mem_type: CL_MEM_OBJECT_BUFFER,
flags: flags,
size: size,
offset: 0,
host_ptr: host_ptr,
image_format: cl_image_format::default(),
pipe_format: pipe_format::PIPE_FORMAT_NONE,
image_desc: cl_image_desc::default(),
image_elem_size: 0,
props: props,
gl_obj: None,
cbs: Mutex::new(Vec::new()),
res: Some(buffer),
maps: Mappings::new(),
},
offset: 0,
}))
}
@@ -420,18 +416,14 @@ impl MemBase {
mem_type: CL_MEM_OBJECT_BUFFER,
flags: flags,
size: size,
offset: offset,
host_ptr: host_ptr,
image_format: cl_image_format::default(),
pipe_format: pipe_format::PIPE_FORMAT_NONE,
image_desc: cl_image_desc::default(),
image_elem_size: 0,
props: Vec::new(),
gl_obj: None,
cbs: Mutex::new(Vec::new()),
res: None,
maps: Mappings::new(),
},
offset: offset,
})
}
@@ -507,18 +499,17 @@ impl MemBase {
mem_type: mem_type,
flags: flags,
size: image_desc.pixels() * image_format.pixel_size().unwrap() as usize,
offset: 0,
host_ptr: host_ptr,
image_format: *image_format,
pipe_format: pipe_format,
image_desc: api_image_desc,
image_elem_size: image_elem_size,
props: props,
gl_obj: None,
cbs: Mutex::new(Vec::new()),
res: texture,
maps: Mappings::new(),
},
image_format: *image_format,
pipe_format: pipe_format,
image_desc: api_image_desc,
image_elem_size: image_elem_size,
}))
}
@@ -629,12 +620,7 @@ impl MemBase {
mem_type: mem_type,
flags: flags,
size: gl_mem_props.size(),
offset: gl_mem_props.offset as usize,
host_ptr: ptr::null_mut(),
image_format: image_format,
pipe_format: pipe_format,
image_desc: desc,
image_elem_size: gl_mem_props.pixel_size,
props: Vec::new(),
gl_obj: Some(gl_obj),
cbs: Mutex::new(Vec::new()),
@@ -642,9 +628,20 @@ impl MemBase {
maps: Mappings::new(),
};
Ok(if rusticl_type == RusticlTypes::Buffer {
Arc::new(Buffer { base: base }).into_cl()
Arc::new(Buffer {
base: base,
offset: gl_mem_props.offset as usize,
})
.into_cl()
} else {
Arc::new(Image { base: base }).into_cl()
Arc::new(Image {
base: base,
image_format: image_format,
pipe_format: pipe_format,
image_desc: desc,
image_elem_size: gl_mem_props.pixel_size,
})
.into_cl()
})
}