minigbm: align minigbm functions names with upstream libgbm

This patch simply changes some methods' names in order to
align them with the upstream ones. It's needed because Chromium/Wayland
implementation is going to have a gbm implementation used by a GPU
split effort.

In order to avoid to have a per compile gn flags, we would like
to standartize the gbm APIs and be able to use the same binary without
recompilations.

In follow-up CLs, I will fix callers and finally remove the old APIs
namings in favor of new ones.

Change-Id: I850824e7194077c47baa761cddb2947959dff9c3
Reviewed-on: https://chromium-review.googlesource.com/1162170
Commit-Ready: Michael Spang <spang@chromium.org>
Tested-by: Michael Spang <spang@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>

diff --git a/gbm.c b/gbm.c
index c12c269..bab8b6b 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -265,7 +265,7 @@ PUBLIC uint32_t gbm_bo_get_height(struct gbm_bo *bo)
 
 PUBLIC uint32_t gbm_bo_get_stride(struct gbm_bo *bo)
 {
-       return gbm_bo_get_plane_stride(bo, 0);
+  return gbm_bo_get_stride_for_plane(bo, 0);
 }
 
 PUBLIC uint32_t gbm_bo_get_stride_or_tiling(struct gbm_bo *bo)
@@ -280,7 +280,12 @@ PUBLIC uint32_t gbm_bo_get_format(struct gbm_bo *bo)
 
 PUBLIC uint64_t gbm_bo_get_format_modifier(struct gbm_bo *bo)
 {
-       return gbm_bo_get_plane_format_modifier(bo, 0);
+       return gbm_bo_get_modifier(bo);
+}
+
+PUBLIC uint64_t gbm_bo_get_modifier(struct gbm_bo *bo)
+{
+    return gbm_bo_get_plane_format_modifier(bo, 0);
 }
 
 PUBLIC struct gbm_device *gbm_bo_get_device(struct gbm_bo *bo)
@@ -300,7 +305,12 @@ PUBLIC int gbm_bo_get_fd(struct gbm_bo *bo)
 
 PUBLIC size_t gbm_bo_get_num_planes(struct gbm_bo *bo)
 {
-       return drv_bo_get_num_planes(bo->bo);
+       return gbm_bo_get_plane_count(bo);
+}
+
+PUBLIC size_t gbm_bo_get_plane_count(struct gbm_bo *bo)
+{
+    return drv_bo_get_num_planes(bo->bo);
 }
 
 PUBLIC union gbm_bo_handle gbm_bo_get_plane_handle(struct gbm_bo *bo, size_t plane)
@@ -315,7 +325,12 @@ PUBLIC int gbm_bo_get_plane_fd(struct gbm_bo *bo, size_t plane)
 
 PUBLIC uint32_t gbm_bo_get_plane_offset(struct gbm_bo *bo, size_t plane)
 {
-       return drv_bo_get_plane_offset(bo->bo, plane);
+       return gbm_bo_get_offset(bo, plane);
+}
+
+PUBLIC uint32_t gbm_bo_get_offset(struct gbm_bo *bo, size_t plane)
+{
+    return drv_bo_get_plane_offset(bo->bo, plane);
 }
 
 PUBLIC uint32_t gbm_bo_get_plane_size(struct gbm_bo *bo, size_t plane)
@@ -325,7 +340,12 @@ PUBLIC uint32_t gbm_bo_get_plane_size(struct gbm_bo *bo, size_t plane)
 
 PUBLIC uint32_t gbm_bo_get_plane_stride(struct gbm_bo *bo, size_t plane)
 {
-       return drv_bo_get_plane_stride(bo->bo, plane);
+       return gbm_bo_get_stride_for_plane(bo, plane);
+}
+
+PUBLIC uint32_t gbm_bo_get_stride_for_plane(struct gbm_bo *bo, size_t plane)
+{
+    return drv_bo_get_plane_stride(bo->bo, plane);
 }
 
 PUBLIC uint64_t gbm_bo_get_plane_format_modifier(struct gbm_bo *bo, size_t plane)

diff --git a/gbm.h b/gbm.h
index ce05ce3..0398ac2 100644 (file)
--- a/gbm.h
+++ b/gbm.h
@@ -376,9 +376,13 @@ gbm_bo_get_stride_or_tiling(struct gbm_bo *bo);
 uint32_t
 gbm_bo_get_format(struct gbm_bo *bo);
 
+/* Deprecated */
 uint64_t
 gbm_bo_get_format_modifier(struct gbm_bo *bo);
 
+uint64_t
+gbm_bo_get_modifier(struct gbm_bo *bo);
+
 struct gbm_device *
 gbm_bo_get_device(struct gbm_bo *bo);
 
@@ -388,24 +392,36 @@ gbm_bo_get_handle(struct gbm_bo *bo);
 int
 gbm_bo_get_fd(struct gbm_bo *bo);
 
+/* Deprecated */
 size_t
 gbm_bo_get_num_planes(struct gbm_bo *bo);
 
+size_t
+gbm_bo_get_plane_count(struct gbm_bo *bo);
+
 union gbm_bo_handle
 gbm_bo_get_plane_handle(struct gbm_bo *bo, size_t plane);
 
 int
 gbm_bo_get_plane_fd(struct gbm_bo *bo, size_t plane);
 
+/* Deprecated */
 uint32_t
 gbm_bo_get_plane_offset(struct gbm_bo *bo, size_t plane);
 
 uint32_t
+gbm_bo_get_offset(struct gbm_bo *bo, size_t plane);
+
+uint32_t
 gbm_bo_get_plane_size(struct gbm_bo *bo, size_t plane);
 
+/* Deprecated */
 uint32_t
 gbm_bo_get_plane_stride(struct gbm_bo *bo, size_t plane);
 
+uint32_t
+gbm_bo_get_stride_for_plane(struct gbm_bo *bo, size_t plane);
+
 uint64_t
 gbm_bo_get_plane_format_modifier(struct gbm_bo *bo, size_t plane);