tbm_bufmgr: change tbm_bo_alloc_with_format name

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

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index 0f4210f..8872848 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)) {\
@@ -403,53 +401,6 @@ alloc_fail:
 
 /* 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_ERR("tbm_module_bufmgr_bo_alloc_with_format failed. fmt:%d idx:%d wxh:%dx%d mem_types:%s\n",
-                               format, bo_idx, width, height, _tbm_flag_to_str(flags));
-               _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;
@@ -871,17 +822,15 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
                /* LCOV_EXCL_STOP */
        }
 
-       if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
-               LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) {
-                       if (bo2->bo_data == bo->bo_data) {
-                               TBM_TRACE_BO("find bo(%p) ref(%d) key(%d) flag(%s) in list",
-                                               bo2, bo2->ref_cnt, key, _tbm_flag_to_str(bo2->flags));
-                               bo2->ref_cnt++;
-                               free(bo);
-                               _tbm_bufmgr_mutex_unlock();
-                               return bo2;
-                       }
-               }
+       // return the existed bo2 if bo->bo_data and bo2->bo_data is the same
+       bo2 = tbm_bufmgr_internal_find_bo(bufmgr, bo);
+       if (bo2) {
+               TBM_TRACE_BO("find bo(%p) ref(%d) key(%d) flag(%s) in list",
+                                       bo2, bo2->ref_cnt, key, _tbm_flag_to_str(bo2->flags));
+               bo2->ref_cnt++;
+               free(bo);
+               _tbm_bufmgr_mutex_unlock();
+               return bo2;
        }
 
        if (bufmgr->use_hal_tbm) {
@@ -949,17 +898,15 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
                /* LCOV_EXCL_STOP */
        }
 
-       if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
-               LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) {
-                       if (bo2->bo_data == bo->bo_data) {
-                               TBM_TRACE_BO("find bo(%p) ref(%d) fd(%d) flag(%s) in list\n",
-                                               bo2, bo2->ref_cnt, fd, _tbm_flag_to_str(bo2->flags));
-                               bo2->ref_cnt++;
-                               free(bo);
-                               _tbm_bufmgr_mutex_unlock();
-                               return bo2;
-                       }
-               }
+       // return the existed bo2 if bo->bo_data and bo2->bo_data is the same
+       bo2 = tbm_bufmgr_internal_find_bo(bufmgr, bo);
+       if (bo2) {
+               TBM_TRACE_BO("find bo(%p) ref(%d) fd(%d) flag(%s) in list",
+                                       bo2, bo2->ref_cnt, fd, _tbm_flag_to_str(bo2->flags));
+               bo2->ref_cnt++;
+               free(bo);
+               _tbm_bufmgr_mutex_unlock();
+               return bo2;
        }
 
        if (bufmgr->use_hal_tbm) {