From 594f8abb1b73783cfdf3fe982fcf7ea932f0bad7 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 15 Jun 2021 13:38:08 +0900 Subject: [PATCH] tbm_bo: remove tbm_bo_alloc_with_surface The tbm_bo_alloc_with_surface does not use anymore. The bufmgr->backend will be deprecated. Change-Id: I032df2de270e2fd4bbe7f5829bdede962213d8ab --- src/tbm_bo.c | 48 -------------------------------------------- src/tbm_bufmgr_int.h | 4 +--- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/src/tbm_bo.c b/src/tbm_bo.c index eeccc8b..6d988cb 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -449,54 +449,6 @@ fail: return NULL; } -tbm_bo -tbm_bo_alloc_with_surface(tbm_bufmgr bufmgr, int width, int height, int format, int flags, int bo_idx) -{ - tbm_bo bo; - void *bo_priv; - - _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_surface 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->backend->surface_bo_alloc) { - TBM_ERR("error: not supported tbm_bo_alloc_with_surface\n"); - _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; - } - - bo_priv = bufmgr->backend->surface_bo_alloc(bo, width, height, format, flags, bo_idx); - if (!bo_priv) { - TBM_ERR("error: fail to tbm_bo_alloc_with_surface 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_INVALID_OPERATION); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; - } - - bo->priv = bo_priv; - _tbm_bo_init(bufmgr, bo, flags); - - _tbm_bufmgr_mutex_unlock(); - - return bo; -} - tbm_bo tbm_bo_alloc_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags) { diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index 7edd03d..fe2f186 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -346,9 +346,7 @@ void _tbm_set_last_result(tbm_error_e err); void _tbm_bufmgr_mutex_lock(void); void _tbm_bufmgr_mutex_unlock(void); -tbm_bo tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, int bpp, - int height, tbm_bo_memory_type flags, tbm_error_e *error); -tbm_bo tbm_bo_alloc_with_surface(tbm_bufmgr bufmgr, int width, int height, int format, int flags, int bo_idx); +tbm_bo tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, int bpp, int height, tbm_bo_memory_type flags, tbm_error_e *error); tbm_bo tbm_bo_alloc_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags); /* tbm_module functions */ -- 2.34.1