Rename some front-end APIs of tpl_display.

 - tpl_get_native_window_info -> tpl_display_get_native_window_info
 - tpl_get_native_pixmap_info -> tpl_display_get_native_pixmap_info
 - tpl_get_native_buffer -> tpl_display_get_buffer_from_native_pixmap

Change-Id: I7ec481f4830c54a1aa87873dcf953c89929b2437

diff --git a/src/tpl.c b/src/tpl.c
index 6920f96..2b2feef 100644 (file)
--- a/src/tpl.c
+++ b/src/tpl.c
@@ -326,40 +326,3 @@ __tpl_surface_init_backend(tpl_surface_t *surface, tpl_backend_type_t type)
        }
 }
 
-tpl_bool_t
-tpl_get_native_window_info(tpl_display_t *display, tpl_handle_t window,
-                          int *width, int *height, tbm_format *format, int depth, int a_size)
-{
-       if (display->backend.get_window_info == NULL)
-       {
-               TPL_ERR("Backend for display has not been initialized!");
-                return TPL_FALSE;
-       }
-
-       return display->backend.get_window_info(display, window, width, height, format, depth, a_size);
-}
-
-tpl_bool_t
-tpl_get_native_pixmap_info(tpl_display_t *display, tpl_handle_t pixmap,
-                          int *width, int *height, tbm_format *format)
-{
-        if (display->backend.get_pixmap_info == NULL)
-       {
-               TPL_ERR("Backend for display has not been initialized!");
-                return TPL_FALSE;
-       }
-
-       return display->backend.get_pixmap_info(display, pixmap, width, height, format);
-}
-
-tbm_surface_h
-tpl_get_native_buffer(tpl_display_t *display, tpl_handle_t pixmap)
-{
-        if (display->backend.get_native_buffer == NULL)
-       {
-               TPL_ERR("Backend for display has not been initialized!");
-                return NULL;
-       }
-
-       return display->backend.get_native_buffer(pixmap);
-}

diff --git a/src/tpl.h b/src/tpl.h
index 75fcd87..6765afc 100644 (file)
--- a/src/tpl.h
+++ b/src/tpl.h
@@ -569,13 +569,13 @@ tpl_bool_t tpl_surface_get_damage(tpl_surface_t *surface,
  * @param format pointer to receive format of the window.
  * @return TPL_TRUE if the window is valid, TPL_FALSE otherwise.
  */
-tpl_bool_t tpl_get_native_window_info(tpl_display_t *display,
-                                     tpl_handle_t window,
-                                     int *width,
-                                     int *height,
-                                     tbm_format *format,
-                                     int depth,
-                                     int a_size);
+tpl_bool_t tpl_display_get_native_window_info(tpl_display_t *display,
+                                             tpl_handle_t window,
+                                             int *width,
+                                             int *height,
+                                             tbm_format *format,
+                                             int depth,
+                                             int a_size);
 
 /**
  * Query information on the given native pixmap.
@@ -587,11 +587,11 @@ tpl_bool_t tpl_get_native_window_info(tpl_display_t *display,
  * @param format pointer to receive format of the pixmap.
  * @return TPL_TRUE if the pixmap is valid, TPL_FALSE otherwise.
  */
-tpl_bool_t tpl_get_native_pixmap_info(tpl_display_t *display,
-                                     tpl_handle_t pixmap,
-                                     int *width,
-                                     int *height,
-                                     tbm_format *format);
+tpl_bool_t tpl_display_get_native_pixmap_info(tpl_display_t *display,
+                                             tpl_handle_t pixmap,
+                                             int *width,
+                                             int *height,
+                                             tbm_format *format);
 
 /**
  * Get native buffer from the given native pixmap.
@@ -600,8 +600,8 @@ tpl_bool_t tpl_get_native_pixmap_info(tpl_display_t *display,
  * @param pixmap handle of the native pixmap.
  * @return tbm_surface_h native buffer.
  */
-tbm_surface_h tpl_get_native_buffer(tpl_display_t *display,
-                                   tpl_handle_t pixmap);
+tbm_surface_h tpl_display_get_buffer_from_native_pixmap(tpl_display_t *display,
+                                                       tpl_handle_t pixmap);
 
 
 void tpl_display_wait_native(tpl_display_t *display);

diff --git a/src/tpl_display.c b/src/tpl_display.c
index 27ed858..776aa3d 100644 (file)
--- a/src/tpl_display.c
+++ b/src/tpl_display.c
@@ -228,3 +228,41 @@ tpl_display_get_bufmgr_fd(tpl_display_t *display)
 
        return display->bufmgr_fd;
 }
+
+tpl_bool_t
+tpl_display_get_native_window_info(tpl_display_t *display, tpl_handle_t window,
+                          int *width, int *height, tbm_format *format, int depth, int a_size)
+{
+       if (display->backend.get_window_info == NULL)
+       {
+               TPL_ERR("Backend for display has not been initialized!");
+                return TPL_FALSE;
+       }
+
+       return display->backend.get_window_info(display, window, width, height, format, depth, a_size);
+}
+
+tpl_bool_t
+tpl_display_get_native_pixmap_info(tpl_display_t *display, tpl_handle_t pixmap,
+                          int *width, int *height, tbm_format *format)
+{
+        if (display->backend.get_pixmap_info == NULL)
+       {
+               TPL_ERR("Backend for display has not been initialized!");
+                return TPL_FALSE;
+       }
+
+       return display->backend.get_pixmap_info(display, pixmap, width, height, format);
+}
+
+tbm_surface_h
+tpl_display_get_buffer_from_native_pixmap(tpl_display_t *display, tpl_handle_t pixmap)
+{
+        if (display->backend.get_buffer_from_native_pixmap == NULL)
+       {
+               TPL_ERR("Backend for display has not been initialized!");
+                return NULL;
+       }
+
+       return display->backend.get_buffer_from_native_pixmap(pixmap);
+}

diff --git a/src/tpl_gbm.c b/src/tpl_gbm.c
index ccc1670..6266af7 100644 (file)
--- a/src/tpl_gbm.c
+++ b/src/tpl_gbm.c
@@ -233,7 +233,7 @@ __tpl_gbm_display_get_pixmap_info(tpl_display_t *display, tpl_handle_t pixmap,
 }
 
 static tbm_surface_h
-__tpl_gbm_display_get_native_buffer(tpl_handle_t pixmap)
+__tpl_gbm_display_get_buffer_from_native_pixmap(tpl_handle_t pixmap)
 {
        tbm_surface_h tbm_surface = NULL;
 
@@ -441,7 +441,7 @@ __tpl_display_init_backend_gbm(tpl_display_backend_t *backend)
        backend->filter_config                  = __tpl_gbm_display_filter_config;
        backend->get_window_info                = __tpl_gbm_display_get_window_info;
        backend->get_pixmap_info                = __tpl_gbm_display_get_pixmap_info;
-        backend->get_native_buffer             = __tpl_gbm_display_get_native_buffer;
+       backend->get_buffer_from_native_pixmap  = __tpl_gbm_display_get_buffer_from_native_pixmap;
        backend->flush                          = __tpl_gbm_display_flush;
 #ifdef EGL_BIND_WL_DISPLAY
        backend->bind_client_display_handle     = __tpl_gbm_display_bind_client_wayland_display;

diff --git a/src/tpl_internal.h b/src/tpl_internal.h
index 366dc59..a9bbab8 100644 (file)
--- a/src/tpl_internal.h
+++ b/src/tpl_internal.h
@@ -46,7 +46,7 @@ struct _tpl_display_backend
        tpl_bool_t              (*get_pixmap_info)(tpl_display_t *display, tpl_handle_t pixmap,
                                                   int *width, int *height, tbm_format *format);
 
-       tbm_surface_h           (*get_native_buffer)(tpl_handle_t pixmap);
+       tbm_surface_h           (*get_buffer_from_native_pixmap)(tpl_handle_t pixmap);
 
        void                    (*flush)(tpl_display_t *display);
        void                    (*wait_native)(tpl_display_t *display);

diff --git a/src/tpl_tbm.c b/src/tpl_tbm.c
index f9345dc..61cdc5b 100644 (file)
--- a/src/tpl_tbm.c
+++ b/src/tpl_tbm.c
@@ -154,7 +154,7 @@ __tpl_tbm_display_get_pixmap_info(tpl_display_t *display, tpl_handle_t pixmap,
 }
 
 static tbm_surface_h
-__tpl_tbm_display_get_native_buffer(tpl_handle_t pixmap)
+__tpl_tbm_display_get_buffer_from_native_pixmap(tpl_handle_t pixmap)
 {
        TPL_ASSERT(pixmap);
        return (tbm_surface_h)pixmap;
@@ -338,7 +338,7 @@ __tpl_display_init_backend_tbm(tpl_display_backend_t *backend)
        backend->filter_config                  = __tpl_tbm_display_filter_config;
        backend->get_window_info                = __tpl_tbm_display_get_window_info;
        backend->get_pixmap_info                = __tpl_tbm_display_get_pixmap_info;
-       backend->get_native_buffer              = __tpl_tbm_display_get_native_buffer;
+       backend->get_buffer_from_native_pixmap  = __tpl_tbm_display_get_buffer_from_native_pixmap;
        backend->flush                          = __tpl_tbm_display_flush;
 }