OSDN Git Service

minigbm: Remove deprecated methods.
authorMaksim Sisov <msisov@igalia.com>
Wed, 6 Mar 2019 11:04:12 +0000 (13:04 +0200)
committerCommit Bot <commit-bot@chromium.org>
Tue, 21 Jan 2020 20:43:25 +0000 (20:43 +0000)
We have been running an effort to align minigbm apis with
the upstream libgbm.

The clients of minigbm are fixed, and the deprecated methods can be
removed now.

Change-Id: I09043ef5728af36298e3331c6694fde656b0d7e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1505613
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
gbm.c
gbm.h

diff --git a/gbm.c b/gbm.c
index f23a867..4b62bbf 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -419,26 +419,3 @@ PUBLIC void *gbm_bo_map2(struct gbm_bo *bo, uint32_t x, uint32_t y, uint32_t wid
        offset += rect.x * drv_bytes_per_pixel_from_format(bo->gbm_format, plane);
        return (void *)((uint8_t *)addr + offset);
 }
-
-/*
- * The following functions are deprecated. They can be removed * once crbug.com/946907 is fixed.
- */
-PUBLIC size_t gbm_bo_get_num_planes(struct gbm_bo *bo)
-{
-       return gbm_bo_get_plane_count(bo);
-}
-
-PUBLIC union gbm_bo_handle gbm_bo_get_plane_handle(struct gbm_bo *bo, size_t plane)
-{
-       return gbm_bo_get_handle_for_plane(bo, plane);
-}
-
-PUBLIC uint32_t gbm_bo_get_plane_offset(struct gbm_bo *bo, size_t plane)
-{
-       return gbm_bo_get_offset(bo, plane);
-}
-
-PUBLIC uint32_t gbm_bo_get_plane_stride(struct gbm_bo *bo, size_t plane)
-{
-       return gbm_bo_get_stride_for_plane(bo, plane);
-}
diff --git a/gbm.h b/gbm.h
index e341c40..4993b5c 100644 (file)
--- a/gbm.h
+++ b/gbm.h
@@ -470,21 +470,6 @@ gbm_bo_map2(struct gbm_bo *bo,
           uint32_t x, uint32_t y, uint32_t width, uint32_t height,
           uint32_t flags, uint32_t *stride, void **map_data, int plane);
 
-/*
- * The following functions are deprecated. They can be removed * once crbug.com/946907 is fixed.
- */
-size_t
-gbm_bo_get_num_planes(struct gbm_bo *bo);
-
-union gbm_bo_handle
-gbm_bo_get_plane_handle(struct gbm_bo *bo, size_t plane);
-
-uint32_t
-gbm_bo_get_plane_offset(struct gbm_bo *bo, size_t plane);
-
-uint32_t
-gbm_bo_get_plane_stride(struct gbm_bo *bo, size_t plane);
-
 #ifdef __cplusplus
 }
 #endif