tbm_bo: remove tbm_bo_alloc_with_tiled_format
[platform/core/uifw/libtbm.git] / src / tbm_bo.c
index cf1dda0..eeccc8b 100644 (file)
@@ -354,7 +354,6 @@ tbm_bo
 tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 {
        tbm_bo bo;
-       void *bo_priv;
        tbm_backend_bo_data *bo_data;
        tbm_error_e error;
 
@@ -375,34 +374,16 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 
        _tbm_util_check_bo_cnt(bufmgr);
 
-       if (bufmgr->use_hal_tbm) {
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo(bufmgr->hal_bufmgr, size, flags, (hal_tbm_error *)&error);
+       bo_data = tbm_module_bufmgr_bo_alloc(bufmgr->module, bo, size, flags, &error);
+       if (!bo_data || error != TBM_ERROR_NONE) {
                /* LCOV_EXCL_START */
-               if (!bo_data) {
-                       _tbm_set_last_result(error);
-                       goto alloc_fail;
-               }
+               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;
-       } else if (bufmgr->backend_module_data) {
-               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo(bufmgr->bufmgr_data, (unsigned int)size, flags, &error);
-               if (!bo_data) {
-                       /* LCOV_EXCL_START */
-                       _tbm_set_last_result(error);
-                       goto alloc_fail;
-                       /* LCOV_EXCL_STOP */
-               }
-               bo->bo_data = bo_data;
-       } else {
-               bo_priv = bufmgr->backend->bo_alloc(bo, size, flags);
-               if (!bo_priv) {
-                       /* LCOV_EXCL_START */
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto alloc_fail;
-                       /* LCOV_EXCL_STOP */
-               }
-               bo->priv = bo_priv;
        }
+       bo->bo_data = bo_data;
+       bo->priv = (void *)bo_data; // TODO: this will be DEPRECATED.
 
        _tbm_bo_init(bufmgr, bo, flags);
 
@@ -425,8 +406,7 @@ 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;
-       tbm_backend_bo_data *bo_data;
+       tbm_bo bo = NULL;
 
        _tbm_bufmgr_mutex_lock();
        _tbm_set_last_result(TBM_ERROR_NONE);
@@ -435,50 +415,24 @@ tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width,
 
        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);
-               goto calloc_fail;
+               /* LCOV_EXCL_STOP */
+               goto fail;
        }
 
        _tbm_util_check_bo_cnt(bufmgr);
 
-       /* LCOV_EXCL_START */
-       if (!bufmgr->use_hal_tbm) {
-               if (!bufmgr->backend_module_data || !bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format) {
-                       TBM_ERR("error: not supported tbm_bo_alloc_with_format\n");
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       goto bo_alloc_fail;
-               }
-       }
-       /* LCOV_EXCL_STOP */
-
-       if (bufmgr->use_hal_tbm) {
-               hal_tbm_error ret;
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_format(bufmgr->hal_bufmgr,
-                                                               format, bo_idx, width, height, bpp, (hal_tbm_bo_memory_type)flags, &ret);
-               if (error)
-                       *error = (tbm_error_e)ret;
-               if (ret != HAL_TBM_ERROR_NONE) {
-                       if (ret != HAL_TBM_ERROR_NOT_SUPPORTED) {
-                               TBM_ERR("error: fail to tbm_bo_alloc_with_format\n");
-                               if (error)
-                                       _tbm_set_last_result(*error);
-                       }
-                       goto bo_alloc_fail;
-               }
-               bo->bo_data = bo_data;
-       } else {
-               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format(bufmgr->bufmgr_data, format, bo_idx,
-                                                                                                                               width, height, flags, error);
-               if (!bo_data) {
-                       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));
-                       if (error)
-                               _tbm_set_last_result(*error);
-                       goto bo_alloc_fail;
-               }
-               bo->bo_data = bo_data;
+       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);
@@ -487,82 +441,11 @@ tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width,
 
        return bo;
 
-bo_alloc_fail:
-       free(bo);
-calloc_fail:
-       _tbm_bufmgr_mutex_unlock();
-       return NULL;
-}
-
-tbm_bo
-tbm_bo_alloc_with_tiled_format(tbm_bufmgr bufmgr, int width, int height, int bpp, int format,
-                                                       tbm_bo_memory_type flags, int bo_idx, tbm_error_e *error)
-{
-       tbm_bo bo;
-       tbm_backend_bo_data *bo_data;
-
-       _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) {
-               TBM_ERR("error: fail to tbm_bo_alloc_with_tiled_format fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       if (!bufmgr->use_hal_tbm) {
-               if (!bufmgr->backend_module_data || !bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format) {
-                       TBM_ERR("error: not supported tbm_bo_alloc_with_tiled_format\n");
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       goto bo_alloc_fail;
-               }
-       }
-
-       if (bufmgr->use_hal_tbm) {
-               hal_tbm_error ret;
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_format(bufmgr->hal_bufmgr,
-                                                               width, height, bpp, format, (hal_tbm_bo_memory_type)flags, bo_idx, &ret);
-               if (error)
-                       *error = (tbm_error_e)ret;
-               if (ret != HAL_TBM_ERROR_NONE) {
-                       if (ret != HAL_TBM_ERROR_NOT_SUPPORTED) {
-                               TBM_ERR("error: fail to tbm_bo_alloc_with_tiled_format fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                                       FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-                               if (error)
-                                       _tbm_set_last_result(*error);
-                       }
-                       goto bo_alloc_fail;
-               }
-               bo->bo_data = bo_data;
-       } else {
-               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format(bufmgr->bufmgr_data, width, height,
-                                                                                                                                       bpp, format, flags, bo_idx, error);
-               if (!bo_data) {
-                       TBM_ERR("error: fail to tbm_bo_alloc_with_tiled_format fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                                       FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-                       if (error)
-                               _tbm_set_last_result(*error);
-                       goto bo_alloc_fail;
-               }
-               bo->bo_data = bo_data;
-       }
-
-       _tbm_bo_init(bufmgr, bo, flags);
-
+fail:
+       if (bo)
+               free(bo);
        _tbm_bufmgr_mutex_unlock();
 
-       return bo;
-
-bo_alloc_fail:
-       free(bo);
-       _tbm_bufmgr_mutex_unlock();
        return NULL;
 }