tbm_bufmgr: add tbm_bufmgr_internal_alloc_bo and use it

[platform/core/uifw/libtbm.git] / src / tbm_bo.c

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index daefd18..dd75031 100644 (file)
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -34,8 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tbm_bufmgr_int.h"
 #include "list.h"
 
-#define TBM_BO_MAGIC 0xBF011234
-
 /* check condition */
 #define TBM_BO_RETURN_IF_FAIL(cond) {\
        if (!(cond)) {\
@@ -55,7 +53,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
        } \
 }
 
-static char *
+char *
 _tbm_flag_to_str(int f)
 {
        static char str[255];
@@ -354,7 +352,6 @@ tbm_bo
 tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 {
        tbm_bo bo;
-       tbm_backend_bo_data *bo_data;
        tbm_error_e error;
 
        _tbm_bufmgr_mutex_lock();
@@ -363,139 +360,24 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
        TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
        TBM_BO_RETURN_VAL_IF_FAIL(size > 0, NULL);
 
-       bo = calloc(1, sizeof(struct _tbm_bo));
+       bo = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags, &error);
        if (!bo) {
                /* LCOV_EXCL_START */
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
+               TBM_ERR("tbm_bufmgr_internal_alloc_bo failed. error:%d", error);
+               _tbm_set_last_result(error);
                _tbm_bufmgr_mutex_unlock();
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       bo_data = tbm_module_bufmgr_bo_alloc(bufmgr->module, bo, size, flags, &error);
-       if (!bo_data || error != TBM_ERROR_NONE) {
-               /* LCOV_EXCL_START */
-               TBM_ERR("tbm_module_bufmgr_bo_alloc failed. error:%d", error);
-               _tbm_set_last_result(error);
-               goto alloc_fail;
-               /* LCOV_EXCL_STOP */
-       }
-       bo->bo_data = bo_data;
-       bo->priv = (void *)bo_data; // TODO: this will be DEPRECATED.
-
-       _tbm_bo_init(bufmgr, bo, flags);
-
        TBM_TRACE_BO("bo(%p) size(%d) refcnt(%d), flag(%s)\n", bo, size, bo->ref_cnt,
                        _tbm_flag_to_str(bo->flags));
 
        _tbm_bufmgr_mutex_unlock();
 
        return bo;
-
-alloc_fail:
-       TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", size, _tbm_flag_to_str(flags));
-       free(bo);
-       _tbm_bufmgr_mutex_unlock();
-       return NULL;
 }
 
-/* LCOV_EXCL_START */
-tbm_bo
-tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width,
-                                               int height, int bpp, tbm_bo_memory_type flags, tbm_error_e *error)
-{
-       tbm_bo bo = NULL;
-
-       _tbm_bufmgr_mutex_lock();
-       _tbm_set_last_result(TBM_ERROR_NONE);
-
-       TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-
-       bo = calloc(1, sizeof(struct _tbm_bo));
-       if (!bo) {
-               /* LCOV_EXCL_START */
-               TBM_ERR("error: fail to tbm_bo_alloc_with_format fmt(%s) idx(%d) w(%d) h(%d) mem_types(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               /* LCOV_EXCL_STOP */
-               goto fail;
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       bo->bo_data = tbm_module_bufmgr_bo_alloc_with_format(bufmgr->module, format, bo_idx, width, height, bpp, flags, error);
-       if (!bo->bo_data) {
-               /* LCOV_EXCL_START */
-               _tbm_set_last_result(*error);
-               /* LCOV_EXCL_STOP */
-               goto fail;
-       }
-
-       _tbm_bo_init(bufmgr, bo, flags);
-
-       _tbm_bufmgr_mutex_unlock();
-
-       return bo;
-
-fail:
-       if (bo)
-               free(bo);
-       _tbm_bufmgr_mutex_unlock();
-
-       return NULL;
-}
-
-tbm_bo
-tbm_bo_alloc_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags)
-{
-       tbm_bo bo, bo2 = NULL;
-
-       _tbm_bufmgr_mutex_lock();
-       _tbm_set_last_result(TBM_ERROR_NONE);
-
-       TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-       TBM_BO_RETURN_VAL_IF_FAIL(bo_data, NULL);
-
-       // return an existed bo if the bo is already created with the same bo_data.
-       if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
-               LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) {
-                       if (bo2->bo_data == bo_data) {
-                               TBM_ERR("find bo(%p) ref(%d) flag(%s) in list\n",
-                                               bo2, bo2->ref_cnt, _tbm_flag_to_str(bo2->flags));
-                               bo2->ref_cnt++;
-                               _tbm_bufmgr_mutex_unlock();
-                               return bo2;
-                       }
-               }
-       }
-
-       bo = calloc(1, sizeof(struct _tbm_bo));
-       if (!bo) {
-               /* LCOV_EXCL_START */
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-               /* LCOV_EXCL_STOP */
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       bo->get_from_hal_surface = 1;
-       bo->bo_data = bo_data;
-
-       _tbm_bo_init(bufmgr, bo, flags);
-
-       TBM_TRACE_BO("bo(%p) refcnt(%d), flag(%s)\n", bo, bo->ref_cnt, _tbm_flag_to_str(bo->flags));
-
-       _tbm_bufmgr_mutex_unlock();
-
-       return bo;
-}
-
-/* LCOV_EXCL_STOP */
-
 tbm_bo
 tbm_bo_ref(tbm_bo bo)
 {