Set user_data to tbm_surface not tbm_bo

Change-Id: Ibc478c60764662e3bb6ba0493e5dfbc089e7ae0f

diff --git a/src/tpl_gbm.c b/src/tpl_gbm.c
index 13cb2cb..18b134e 100644 (file)
--- a/src/tpl_gbm.c
+++ b/src/tpl_gbm.c
@@ -56,11 +56,9 @@ static void __tpl_gbm_buffer_free(tpl_gbm_buffer_t *gbm_buffer);
 static inline tpl_gbm_buffer_t *
 __tpl_gbm_get_gbm_buffer_from_tbm_surface(tbm_surface_h surface)
 {
-       tbm_bo bo;
        tpl_gbm_buffer_t *buf = NULL;
 
-       bo = tbm_surface_internal_get_bo(surface, 0);
-       tbm_bo_get_user_data(bo, KEY_TPL_GBM_BUFFER, (void **)&buf);
+       tbm_surface_internal_get_user_data(surface, KEY_TPL_GBM_BUFFER, (void **)&buf);
 
        return buf;
 }
@@ -69,12 +67,9 @@ static inline void
 __tpl_gbm_set_gbm_buffer_to_tbm_surface(tbm_surface_h surface,
                                        tpl_gbm_buffer_t *buf)
 {
-       tbm_bo bo;
-
-       bo = tbm_surface_internal_get_bo(surface, 0);
-       tbm_bo_add_user_data(bo, KEY_TPL_GBM_BUFFER,
+       tbm_surface_internal_add_user_data(surface, KEY_TPL_GBM_BUFFER,
                             (tbm_data_free)__tpl_gbm_buffer_free);
-       tbm_bo_set_user_data(bo, KEY_TPL_GBM_BUFFER, buf);
+       tbm_surface_internal_set_user_data(surface, KEY_TPL_GBM_BUFFER, buf);
 }
 
 static TPL_INLINE tpl_bool_t

diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c
index 30e98bc..9b4ef59 100755 (executable)
--- a/src/tpl_wayland_egl.c
+++ b/src/tpl_wayland_egl.c
@@ -64,11 +64,10 @@ static void __tpl_wayland_egl_buffer_free(tpl_wayland_egl_buffer_t
 static TPL_INLINE tpl_wayland_egl_buffer_t *
 __tpl_wayland_egl_get_wayland_buffer_from_tbm_surface(tbm_surface_h surface)
 {
-       tbm_bo bo;
        tpl_wayland_egl_buffer_t *buf = NULL;
 
-       bo = tbm_surface_internal_get_bo(surface, 0);
-       tbm_bo_get_user_data(bo, KEY_tpl_wayland_egl_buffer, (void **)&buf);
+       tbm_surface_internal_get_user_data(surface, KEY_tpl_wayland_egl_buffer,
+                                          (void **)&buf);
 
        return buf;
 }
@@ -77,14 +76,11 @@ static TPL_INLINE void
 __tpl_wayland_egl_set_wayland_buffer_to_tbm_surface(tbm_surface_h surface,
                tpl_wayland_egl_buffer_t *buf)
 {
-       tbm_bo bo;
-
-       bo = tbm_surface_internal_get_bo(surface, 0);
-
-       tbm_bo_add_user_data(bo, KEY_tpl_wayland_egl_buffer,
-                            (tbm_data_free)__tpl_wayland_egl_buffer_free);
+       tbm_surface_internal_add_user_data(surface, KEY_tpl_wayland_egl_buffer,
+                                          (tbm_data_free)__tpl_wayland_egl_buffer_free);
 
-       tbm_bo_set_user_data(bo, KEY_tpl_wayland_egl_buffer, buf);
+       tbm_surface_internal_set_user_data(surface, KEY_tpl_wayland_egl_buffer,
+                                          buf);
 }
 
 static TPL_INLINE tpl_bool_t