remove bufmgr parameter at the tbm_surface_internal APIs

Change-Id: Ic201ac119cc2548a56a2cd115c402bcf0d08e6f3

diff --git a/src/tbm_surface.c b/src/tbm_surface.c
index 5002c723b95062239dce213abc079e6b86ede718..546fe28c1e0137ce58dc10658544fdb7e181467d 100755 (executable)
--- a/src/tbm_surface.c
+++ b/src/tbm_surface.c
@@ -34,8 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tbm_bufmgr_int.h"
 #include "tbm_surface_internal.h"
 
-extern tbm_bufmgr gBufMgr;
-
 static int
 _tbm_surface_get_info (struct _tbm_surface *surf, int opt, tbm_surface_info_s *info, int map)
 {
@@ -83,12 +81,7 @@ _tbm_surface_get_info (struct _tbm_surface *surf, int opt, tbm_surface_info_s *i
 int
 tbm_surface_query_formats (uint32_t **formats, uint32_t *num)
 {
-    if (!gBufMgr)
-    {
-        gBufMgr = tbm_bufmgr_init (-1);
-    }
-
-    if (!tbm_surface_internal_query_supported_formats (gBufMgr, formats, num))
+    if (!tbm_surface_internal_query_supported_formats (formats, num))
         return TBM_SURFACE_ERROR_INVALID_OPERATION;
 
     return TBM_SURFACE_ERROR_NONE;
@@ -107,12 +100,7 @@ tbm_surface_create (int width, int height, tbm_format format)
 
     struct _tbm_surface *surf = NULL;
 
-    if (!gBufMgr)
-    {
-        gBufMgr = tbm_bufmgr_init (-1);
-    }
-
-    surf = tbm_surface_internal_create_with_flags (gBufMgr, width, height, format, TBM_BO_DEFAULT);
+    surf = tbm_surface_internal_create_with_flags (width, height, format, TBM_BO_DEFAULT);
     if (!surf)
     {
 #ifdef HAVE_CAPI_0_1_1
@@ -131,22 +119,10 @@ tbm_surface_create (int width, int height, tbm_format format)
 int
 tbm_surface_destroy (tbm_surface_h surface)
 {
-    struct _tbm_surface *surf = NULL;
-    int i;
-
     if (!surface)
         return TBM_SURFACE_ERROR_INVALID_PARAMETER;
 
-    surf = (struct _tbm_surface *)surface;
-
-    for (i = 0; i < surf->num_bos; i++)
-    {
-        tbm_bo_unref (surf->bos[i]);
-        surf->bos[i] = NULL;
-    }
-
-    free (surf);
-    surf = NULL;
+    tbm_surface_internal_destroy (surface);
 
     return TBM_SURFACE_ERROR_NONE;
 }

diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c
index f3b593f8d4c9da1d29862735c4b84d62af2d91a8..6a993b6cc95daebf9cd5993a59687f2ced4e671e 100755 (executable)
--- a/src/tbm_surface_internal.c
+++ b/src/tbm_surface_internal.c
@@ -33,6 +33,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tbm_bufmgr.h"
 #include "tbm_bufmgr_int.h"
 #include "tbm_surface_internal.h"
+#include "list.h"
+
+static tbm_bufmgr g_surface_bufmgr = NULL;
+struct list_head g_surface_list; /* list of surfaces belonging to bufmgr */
 
 static int _tbm_surface_internal_get_num_planes (tbm_format format)
 {
@@ -204,13 +208,33 @@ static int _tbm_surface_internal_get_bpp (tbm_format format)
     return bpp;
 }
 
+static void
+_init_surface_bufmgr()
+{
+    g_surface_bufmgr = tbm_bufmgr_init (-1);
+}
+
+static void
+_deinit_surface_bufmgr()
+{
+    if (!g_surface_bufmgr)
+        return;
+
+    tbm_bufmgr_deinit (g_surface_bufmgr);
+    g_surface_bufmgr = NULL;
+}
+
 
 int
-tbm_surface_internal_query_supported_formats (tbm_bufmgr bufmgr, uint32_t **formats, uint32_t *num)
+tbm_surface_internal_query_supported_formats (uint32_t **formats, uint32_t *num)
 {
-    TBM_RETURN_VAL_IF_FAIL (bufmgr, 0);
+    if (!g_surface_bufmgr)
+    {
+        _init_surface_bufmgr();
+        LIST_INITHEAD (&g_surface_list);
+    }
 
-    struct _tbm_bufmgr *mgr = (struct _tbm_bufmgr*)bufmgr;
+    struct _tbm_bufmgr *mgr = g_surface_bufmgr;
     int ret = 0;
 
     pthread_mutex_lock (&mgr->lock);
@@ -223,13 +247,19 @@ tbm_surface_internal_query_supported_formats (tbm_bufmgr bufmgr, uint32_t **form
 }
 
 tbm_surface_h
-tbm_surface_internal_create_with_flags (tbm_bufmgr bufmgr, int width, int height, int format, int flags)
+tbm_surface_internal_create_with_flags (int width, int height, int format, int flags)
 {
-    TBM_RETURN_VAL_IF_FAIL (bufmgr, NULL);
     TBM_RETURN_VAL_IF_FAIL (width > 0, NULL);
     TBM_RETURN_VAL_IF_FAIL (height > 0, NULL);
 
-    struct _tbm_bufmgr *mgr = (struct _tbm_bufmgr*)bufmgr;
+    if (!g_surface_bufmgr)
+    {
+        _init_surface_bufmgr();
+        LIST_INITHEAD (&g_surface_list);
+    }
+
+    struct _tbm_bufmgr *mgr = g_surface_bufmgr;
+
 
     TBM_RETURN_VAL_IF_FAIL (TBM_BUFMGR_IS_VALID(mgr), NULL);
 
@@ -243,7 +273,7 @@ tbm_surface_internal_create_with_flags (tbm_bufmgr bufmgr, int width, int height
     if (!surf)
         return NULL;
 
-    surf->bufmgr = bufmgr;
+    surf->bufmgr = mgr;
     surf->info.width = width;
     surf->info.height = height;
     surf->info.format = format;
@@ -269,22 +299,34 @@ tbm_surface_internal_create_with_flags (tbm_bufmgr bufmgr, int width, int height
     {
         free (surf);
         surf = NULL;
+
+        if(LIST_IS_EMPTY (&g_surface_list))
+        {
+            _deinit_surface_bufmgr ();
+            LIST_DELINIT (&g_surface_list);
+        }
     }
 
-//    LIST_ADD (&surf->item_link, &mgr->surf_list);
+    LIST_ADD (&surf->item_link, &g_surface_list);
 
     return surf;
 }
 
 tbm_surface_h
-tbm_surface_internal_create_with_bos (tbm_bufmgr bufmgr, int width, int height, int format, tbm_bo *bos, int num)
+tbm_surface_internal_create_with_bos (int width, int height, int format, tbm_bo *bos, int num)
 {
-    TBM_RETURN_VAL_IF_FAIL (bufmgr, NULL);
     TBM_RETURN_VAL_IF_FAIL (width > 0, NULL);
     TBM_RETURN_VAL_IF_FAIL (height > 0, NULL);
     TBM_RETURN_VAL_IF_FAIL (bos, NULL);
 
-    struct _tbm_bufmgr *mgr = (struct _tbm_bufmgr*)bufmgr;
+    if (!g_surface_bufmgr)
+    {
+        _init_surface_bufmgr();
+        LIST_INITHEAD (&g_surface_list);
+    }
+
+
+    struct _tbm_bufmgr *mgr = g_surface_bufmgr;
 
     TBM_RETURN_VAL_IF_FAIL (TBM_BUFMGR_IS_VALID(mgr), NULL);
 
@@ -298,7 +340,7 @@ tbm_surface_internal_create_with_bos (tbm_bufmgr bufmgr, int width, int height,
     if (!surf)
         return NULL;
 
-    surf->bufmgr = bufmgr;
+    surf->bufmgr = mgr;
     surf->info.width = width;
     surf->info.height = height;
     surf->info.format = format;
@@ -321,13 +363,13 @@ tbm_surface_internal_create_with_bos (tbm_bufmgr bufmgr, int width, int height,
     surf->num_bos = num;
     for (i = 0; i < num; i++)
     {
-        bos[i] = tbm_bo_alloc (mgr, surf->info.size, TBM_BO_DEFAULT);
-        if (!bos[i])
+        if (bos[i] == NULL)
             goto bail1;
-        surf->bos[i] = bos[i];
+
+        surf->bos[i] = tbm_bo_ref(bos[i]);
     }
 
-//    LIST_ADD (&surf->item_link, &mgr->surf_list);
+    LIST_ADD (&surf->item_link, &g_surface_list);
 
     return surf;
 bail1:
@@ -335,17 +377,53 @@ bail1:
     {
         if (surf->bos[i])
         {
-            free (surf->bos[i]);
+            tbm_bo_unref (surf->bos[i]);
             surf->bos[i] = NULL;
         }
     }
 
     free (surf);
     surf = NULL;
+
+    if(LIST_IS_EMPTY (&g_surface_list))
+    {
+        _deinit_surface_bufmgr ();
+        LIST_DELINIT (&g_surface_list);
+    }
+
     return NULL;
 }
 
 
+void
+tbm_surface_internal_destroy (tbm_surface_h surface)
+{
+    int i;
+
+    if (!surface)
+        return;
+
+    surface = (struct _tbm_surface *)surface;
+
+    for (i = 0; i < surface->num_bos; i++)
+    {
+        tbm_bo_unref (surface->bos[i]);
+        surface->bos[i] = NULL;
+    }
+
+    LIST_DEL (&surface->item_link);
+
+    free (surface);
+    surface = NULL;
+
+    if(LIST_IS_EMPTY (&g_surface_list))
+    {
+        _deinit_surface_bufmgr ();
+        LIST_DELINIT (&g_surface_list);
+    }
+}
+
+
 int
 tbm_surface_internal_get_num_bos (tbm_surface_h surface)
 {
@@ -376,6 +454,7 @@ tbm_surface_internal_get_size (tbm_surface_h surface)
     struct _tbm_bufmgr *mgr = surf->bufmgr;
     int size = 0;
 
+    TBM_RETURN_VAL_IF_FAIL (mgr != NULL, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.width > 0, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.height > 0, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.format > 0, 0);
@@ -399,6 +478,7 @@ tbm_surface_internal_get_plane_data (tbm_surface_h surface, int plane_idx, uint3
     struct _tbm_bufmgr *mgr = surf->bufmgr;
     int ret = 0;
 
+    TBM_RETURN_VAL_IF_FAIL (mgr != NULL, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.width > 0, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.height > 0, 0);
     TBM_RETURN_VAL_IF_FAIL (surf->info.format > 0, 0);

diff --git a/src/tbm_surface_internal.h b/src/tbm_surface_internal.h
index 1fc551466064ffaa6db61a4766d05e52a87c2a3e..68a2233b5827d3f272df4654ba8a0d277cc8bf31 100755 (executable)
--- a/src/tbm_surface_internal.h
+++ b/src/tbm_surface_internal.h
@@ -65,7 +65,7 @@ extern "C" {
    tbm_surface_bufmgr_deinit (bufmgr);
    @endcode
  */
-int tbm_surface_internal_query_supported_formats (tbm_bufmgr bufmgr, uint32_t **formats, uint32_t *num);
+int tbm_surface_internal_query_supported_formats (uint32_t **formats, uint32_t *num);
 
 /**
  * @brief Creates the tbm_surface with memory type.
@@ -103,7 +103,7 @@ int tbm_surface_internal_query_supported_formats (tbm_bufmgr bufmgr, uint32_t **
    tbm_surface_bufmgr_deinit (bufmgr);
    @endcode
  */
-tbm_surface_h tbm_surface_internal_create_with_flags (tbm_bufmgr bufmgr, int width, int height, int format, int flags);
+tbm_surface_h tbm_surface_internal_create_with_flags (int width, int height, int format, int flags);
 
 /**
  * @brief Creates the tbm_surface with buffer objects.
@@ -140,7 +140,14 @@ tbm_surface_h tbm_surface_internal_create_with_flags (tbm_bufmgr bufmgr, int wid
    tbm_surface_bufmgr_deinit (bufmgr);
    @endcode
  */
-tbm_surface_h tbm_surface_internal_create_with_bos (tbm_bufmgr bufmgr, int width, int height, int format, tbm_bo *bos, int num);
+tbm_surface_h tbm_surface_internal_create_with_bos (int width, int height, int format, tbm_bo *bos, int num);
+
+
+/**
+ * @brief Destroy the tbm surface
+    TODO:
+ */
+void tbm_surface_internal_destroy (tbm_surface_h surface);
 
 /**
  * @brief Gets the number of buffer objects associated with the tbm_surface.