diff options
| author | Chirantan Ekbote <chirantan@chromium.org> | 2020-05-15 20:06:58 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-25 19:14:07 +0000 |
| commit | e7d1221c9d5a4e23b6142ef466892ccf38cfde9c (patch) | |
| tree | 62345d17a52b48aac24c125fab25ef33cccf2a1e /gpu_display | |
| parent | be5824412cec9e55fdfb523c80e33393e1054140 (diff) | |
| download | crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar.gz crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar.bz2 crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar.lz crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar.xz crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.tar.zst crosvm-e7d1221c9d5a4e23b6142ef466892ccf38cfde9c.zip | |
Make VolatileSlice ABI-compatible with iovec
Change VolatileSlice so that it is ABI-compatible with iovec. This allows us to directly pass in a VolatileSlice for a C function that expects an iovec without having to create temporaries that convert from one to the other. Also change all the parameters from u64 to usize. It's not possible to address more memory than fits into a usize so having u64 here didn't really provide much benefit and led to a lot of tedious casting back and forth all over the place. BUG=none TEST=unit tests Cq-Depend: chromium:2206621 Change-Id: I258f9123c603d9a4c6c5e2d4d10eb4aedf74466d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2203998 Tested-by: Chirantan Ekbote <chirantan@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Diffstat (limited to 'gpu_display')
| -rw-r--r-- | gpu_display/examples/simple_open.rs | 2 | ||||
| -rw-r--r-- | gpu_display/src/gpu_display_stub.rs | 4 | ||||
| -rw-r--r-- | gpu_display/src/gpu_display_wl.rs | 5 | ||||
| -rw-r--r-- | gpu_display/src/lib.rs | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/gpu_display/examples/simple_open.rs b/gpu_display/examples/simple_open.rs index bb7b1a2..f1b5721 100644 --- a/gpu_display/examples/simple_open.rs +++ b/gpu_display/examples/simple_open.rs @@ -13,7 +13,7 @@ fn main() { row[x] = b | (g << 8); } mem.as_volatile_slice() - .offset((1280 * 4 * y) as u64) + .offset(1280 * 4 * y) .unwrap() .copy_from(&row); } diff --git a/gpu_display/src/gpu_display_stub.rs b/gpu_display/src/gpu_display_stub.rs index 605e009..3089f1f 100644 --- a/gpu_display/src/gpu_display_stub.rs +++ b/gpu_display/src/gpu_display_stub.rs @@ -18,7 +18,6 @@ struct Buffer { width: u32, height: u32, bytes_per_pixel: u32, - bytes_total: u64, bytes: Vec<u8>, } @@ -28,7 +27,7 @@ impl Drop for Buffer { impl Buffer { fn as_volatile_slice(&mut self) -> VolatileSlice { - unsafe { VolatileSlice::new(self.bytes.as_mut_ptr(), self.bytes_total) } + VolatileSlice::new(self.bytes.as_mut_slice()) } fn stride(&self) -> usize { @@ -66,7 +65,6 @@ impl Surface { width: self.width, height: self.height, bytes_per_pixel, - bytes_total, bytes: vec![0; bytes_total as usize], }); } diff --git a/gpu_display/src/gpu_display_wl.rs b/gpu_display/src/gpu_display_wl.rs index b96b8ef..9a3a969 100644 --- a/gpu_display/src/gpu_display_wl.rs +++ b/gpu_display/src/gpu_display_wl.rs @@ -255,10 +255,7 @@ impl DisplayT for DisplayWl { let buffer_index = (surface.buffer_index.get() + 1) % BUFFER_COUNT; let framebuffer = surface .buffer_mem - .get_slice( - (buffer_index * surface.buffer_size) as u64, - surface.buffer_size as u64, - ) + .get_slice(buffer_index * surface.buffer_size, surface.buffer_size) .ok()?; Some(GpuDisplayFramebuffer::new( framebuffer, diff --git a/gpu_display/src/lib.rs b/gpu_display/src/lib.rs index dccf1c7..5b1cf94 100644 --- a/gpu_display/src/lib.rs +++ b/gpu_display/src/lib.rs @@ -107,7 +107,7 @@ impl<'a> GpuDisplayFramebuffer<'a> { .checked_add(width_bytes)?; let slice = self .framebuffer - .sub_slice(byte_offset as u64, count as u64) + .sub_slice(byte_offset as usize, count as usize) .unwrap(); Some(GpuDisplayFramebuffer { slice, ..*self }) |