fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rusticl/mem: fix Mem::copy_rect

Browse source 
The old code was kinda bogus as we mapped at (0, 0, 0), but then didn't
take the origin into account when specifiying the size of the access.

Just offset properly instead.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22449>
This commit is contained in:
Karol Herbst 2023-04-12 18:40:50 +02:00 • committed by Marge Bot
parent 3e118e8910
commit 68df8cc79d
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -699,8 +699,6 @@ impl Mem {
let tx_dst;
let mut src_pitch = [0, 0, 0];
let mut dst_pitch = [0, 0, 0];
let mut new_src_origin = &CLVec::default();
let mut new_dst_origin = &CLVec::default();
let bpp = if !self.is_buffer() {
self.pixel_size().unwrap() as usize
@ -719,9 +717,8 @@ impl Mem {
src_pitch[2] = region[0] * region[1] * bpp;
}
// We should use original origin vector if it's not an image
new_src_origin = &src_origin;
tx_src = src.tx(q, ctx, 0, *region * src_pitch, RWFlags::RD)?;
let (offset, size) = CLVec::calc_offset_size(src_origin, region, src_pitch);
tx_src = src.tx(q, ctx, offset, size, RWFlags::RD)?;
} else {
tx_src = src.tx_image(
q,
@ -748,9 +745,8 @@ impl Mem {
dst_pitch[2] = region[0] * region[1] * bpp;
}
// We should use original origin vector if it's not an image
new_dst_origin = &dst_origin;
tx_dst = dst.tx(q, ctx, 0, *region * dst_pitch, RWFlags::WR)?;
let (offset, size) = CLVec::calc_offset_size(dst_origin, region, dst_pitch);
tx_dst = dst.tx(q, ctx, offset, size, RWFlags::WR)?;
} else {
tx_dst = dst.tx_image(
q,
@ -774,10 +770,10 @@ impl Mem {
tx_src.ptr(),
tx_dst.ptr(),
region,
new_src_origin,
&CLVec::default(),
src_pitch[1],
src_pitch[2],
new_dst_origin,
&CLVec::default(),
dst_pitch[1],
dst_pitch[2],
bpp as u8,