From 53429509833a8f1a227d977778069df93a4edd44 Mon Sep 17 00:00:00 2001 From: Maksim Sisov Date: Tue, 8 Jan 2019 11:24:34 +0200 Subject: crosvm: use updated minigbm APIs. This change makes the crosvm use updated minigbm APIs after https://crrev.com/c/1162170 and https://crrev.com/c/1170773 Change-Id: Ia568d3ae53659ded6afc19073e124a1dc2cf0b13 Reviewed-on: https://chromium-review.googlesource.com/1400583 Commit-Ready: Maksim Sisov Tested-by: Maksim Sisov Reviewed-by: Zach Reizner --- gpu_buffer/src/lib.rs | 10 +++++----- gpu_buffer/src/raw.rs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gpu_buffer/src') diff --git a/gpu_buffer/src/lib.rs b/gpu_buffer/src/lib.rs index 49f346d..be8fb72 100644 --- a/gpu_buffer/src/lib.rs +++ b/gpu_buffer/src/lib.rs @@ -441,31 +441,31 @@ impl Buffer { /// Format modifier flags for the buffer. pub fn format_modifier(&self) -> u64 { // This is always safe to call with a valid gbm_bo pointer. - unsafe { gbm_bo_get_format_modifier(self.0) } + unsafe { gbm_bo_get_modifier(self.0) } } /// Number of planes present in this buffer. pub fn num_planes(&self) -> usize { // This is always safe to call with a valid gbm_bo pointer. - unsafe { gbm_bo_get_num_planes(self.0) } + unsafe { gbm_bo_get_plane_count(self.0) } } /// Handle as u64 for the given plane. pub fn plane_handle(&self, plane: usize) -> u64 { // This is always safe to call with a valid gbm_bo pointer. - unsafe { gbm_bo_get_plane_handle(self.0, plane).u64 } + unsafe { gbm_bo_get_handle_for_plane(self.0, plane).u64 } } /// Offset in bytes for the given plane. pub fn plane_offset(&self, plane: usize) -> u32 { // This is always safe to call with a valid gbm_bo pointer. - unsafe { gbm_bo_get_plane_offset(self.0, plane) } + unsafe { gbm_bo_get_offset(self.0, plane) } } /// Length in bytes of one row for the given plane. pub fn plane_stride(&self, plane: usize) -> u32 { // This is always safe to call with a valid gbm_bo pointer. - unsafe { gbm_bo_get_plane_stride(self.0, plane) } + unsafe { gbm_bo_get_stride_for_plane(self.0, plane) } } /// Exports a new dmabuf/prime file descriptor for the given plane. diff --git a/gpu_buffer/src/raw.rs b/gpu_buffer/src/raw.rs index 7fc5a9f..b4255ca 100644 --- a/gpu_buffer/src/raw.rs +++ b/gpu_buffer/src/raw.rs @@ -182,16 +182,16 @@ extern "C" { pub fn gbm_bo_get_stride(bo: *mut gbm_bo) -> u32; pub fn gbm_bo_get_stride_or_tiling(bo: *mut gbm_bo) -> u32; pub fn gbm_bo_get_format(bo: *mut gbm_bo) -> u32; - pub fn gbm_bo_get_format_modifier(bo: *mut gbm_bo) -> u64; + pub fn gbm_bo_get_modifier(bo: *mut gbm_bo) -> u64; pub fn gbm_bo_get_device(bo: *mut gbm_bo) -> *mut gbm_device; pub fn gbm_bo_get_handle(bo: *mut gbm_bo) -> gbm_bo_handle; pub fn gbm_bo_get_fd(bo: *mut gbm_bo) -> c_int; - pub fn gbm_bo_get_num_planes(bo: *mut gbm_bo) -> usize; - pub fn gbm_bo_get_plane_handle(bo: *mut gbm_bo, plane: usize) -> gbm_bo_handle; + pub fn gbm_bo_get_plane_count(bo: *mut gbm_bo) -> usize; + pub fn gbm_bo_get_handle_for_plane(bo: *mut gbm_bo, plane: usize) -> gbm_bo_handle; pub fn gbm_bo_get_plane_fd(bo: *mut gbm_bo, plane: usize) -> c_int; - pub fn gbm_bo_get_plane_offset(bo: *mut gbm_bo, plane: usize) -> u32; + pub fn gbm_bo_get_offset(bo: *mut gbm_bo, plane: usize) -> u32; pub fn gbm_bo_get_plane_size(bo: *mut gbm_bo, plane: usize) -> u32; - pub fn gbm_bo_get_plane_stride(bo: *mut gbm_bo, plane: usize) -> u32; + pub fn gbm_bo_get_stride_for_plane(bo: *mut gbm_bo, plane: usize) -> u32; pub fn gbm_bo_get_plane_format_modifier(bo: *mut gbm_bo, plane: usize) -> u64; // Did not generate cleanly by bindgen. Redone manually by zachr. pub fn gbm_bo_set_user_data( -- cgit 1.4.1