From 3ac09e5a78920f46fb4764ddc489b00c53b5a10e Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 17 Jun 2021 19:49:24 +0900 Subject: [PATCH] tbm_module: change tbm_module_bufmgr symbol names The changed symbols are below. - tbm_module_bufmgr_alloc_bo - tbm_module_bufmgr_alloc_bo_with_format - tbm_module_bufmgr_import_bo_with_fd - tbm_module_bufmgr_import_bo_with_key Change-Id: Ia91b4fabc15777c06d153062d498eb38650df140 --- src/tbm_bufmgr.c | 14 +++++++------- src/tbm_bufmgr_int.h | 8 ++++---- src/tbm_module.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index d0f18b0..56365ba 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -913,10 +913,10 @@ tbm_bufmgr_internal_alloc_bo(tbm_bufmgr bufmgr, int size, int flags, tbm_error_e /* LCOV_EXCL_STOP */ } - bo_data = tbm_module_bufmgr_bo_alloc(bufmgr->module, bo, size, flags, error); + bo_data = tbm_module_bufmgr_alloc_bo(bufmgr->module, bo, size, flags, error); if (!bo_data) { /* LCOV_EXCL_START */ - TBM_ERR("tbm_module_bufmgr_bo_alloc failed. size:%d flags:%s error:%d", size, _tbm_flag_to_str(flags), *error); + TBM_ERR("tbm_module_bufmgr_alloc_bo failed. size:%d flags:%s error:%d", size, _tbm_flag_to_str(flags), *error); free(bo); return NULL; /* LCOV_EXCL_STOP */ @@ -954,7 +954,7 @@ tbm_bufmgr_internal_alloc_bo_with_format(tbm_bufmgr bufmgr, int format, int bo_i goto fail; } - bo->bo_data = tbm_module_bufmgr_bo_alloc_with_format(bufmgr->module, format, bo_idx, width, height, bpp, flags, error); + bo->bo_data = tbm_module_bufmgr_alloc_bo_with_format(bufmgr->module, format, bo_idx, width, height, bpp, flags, error); if (!bo->bo_data) { /* LCOV_EXCL_START */ _tbm_set_last_result(*error); @@ -1036,10 +1036,10 @@ tbm_bufmgr_internal_import_bo_with_key(tbm_bufmgr bufmgr, unsigned int key, tbm_ /* LCOV_EXCL_STOP */ } - bo->bo_data = tbm_module_bufmgr_bo_import_key(bufmgr->module, bo, key, error); + bo->bo_data = tbm_module_bufmgr_import_bo_with_key(bufmgr->module, bo, key, error); if (!bo->bo_data) { /* LCOV_EXCL_START */ - TBM_ERR("tbm_module_bufmgr_bo_import_key failed. tbm_key:%d", key); + TBM_ERR("tbm_module_bufmgr_import_bo_with_key failed. tbm_key:%d", key); free(bo); return NULL; /* LCOV_EXCL_STOP */ @@ -1083,10 +1083,10 @@ tbm_bufmgr_internal_import_bo_with_fd(tbm_bufmgr bufmgr, tbm_fd fd, tbm_error_e /* LCOV_EXCL_STOP */ } - bo->bo_data = tbm_module_bufmgr_bo_import_fd(bufmgr->module, bo, fd, error); + bo->bo_data = tbm_module_bufmgr_import_bo_with_fd(bufmgr->module, bo, fd, error); if (!bo->bo_data) { /* LCOV_EXCL_START */ - TBM_ERR("tbm_module_bufmgr_bo_import_fd failed. tbm_fd:%d", fd); + TBM_ERR("tbm_module_bufmgr_import_bo_with_fd failed. tbm_fd:%d", fd); free(bo); return NULL; /* LCOV_EXCL_STOP */ diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index b5e4eb0..b921fdc 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -365,10 +365,10 @@ int tbm_module_bufmgr_get_capabilities(tbm_module *module, tbm_ tbm_error_e tbm_module_bufmgr_bind_native_display(tbm_module *module, void *native_display); tbm_error_e tbm_module_bufmgr_get_supported_formats(tbm_module *module, uint32_t **formats, uint32_t *num); tbm_error_e tbm_module_bufmgr_get_plane_data(tbm_module *module, int format, int plane_idx, uint32_t w, uint32_t h, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx); -tbm_backend_bo_data *tbm_module_bufmgr_bo_alloc(tbm_module *module, tbm_bo bo, int size, int flags, tbm_error_e *error); -tbm_backend_bo_data *tbm_module_bufmgr_bo_alloc_with_format(tbm_module *module, int format, int bo_idx, int width, int height, int bpp, tbm_bo_memory_type flags, tbm_error_e *error); -tbm_backend_bo_data *tbm_module_bufmgr_bo_import_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_error_e *error); -tbm_backend_bo_data *tbm_module_bufmgr_bo_import_key(tbm_module *module, tbm_bo bo, tbm_key key, tbm_error_e *error); +tbm_backend_bo_data *tbm_module_bufmgr_alloc_bo(tbm_module *module, tbm_bo bo, int size, int flags, tbm_error_e *error); +tbm_backend_bo_data *tbm_module_bufmgr_alloc_bo_with_format(tbm_module *module, int format, int bo_idx, int width, int height, int bpp, tbm_bo_memory_type flags, tbm_error_e *error); +tbm_backend_bo_data *tbm_module_bufmgr_import_bo_with_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_error_e *error); +tbm_backend_bo_data *tbm_module_bufmgr_import_bo_with_key(tbm_module *module, tbm_bo bo, tbm_key key, tbm_error_e *error); void tbm_module_bo_free(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, int get_from_hal_surface); int tbm_module_bo_get_size(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, tbm_error_e *error); diff --git a/src/tbm_module.c b/src/tbm_module.c index 974c67b..9932c45 100644 --- a/src/tbm_module.c +++ b/src/tbm_module.c @@ -645,7 +645,7 @@ tbm_module_bufmgr_get_plane_data(tbm_module *module, int format, int plane_idx, } tbm_backend_bo_data * -tbm_module_bufmgr_bo_alloc(tbm_module *module, tbm_bo bo, int size, int flags, tbm_error_e *error) +tbm_module_bufmgr_alloc_bo(tbm_module *module, tbm_bo bo, int size, int flags, tbm_error_e *error) { tbm_backend_bo_data *bo_data = NULL; tbm_backend_bufmgr_func *bufmgr_func = NULL; @@ -685,7 +685,7 @@ tbm_module_bufmgr_bo_alloc(tbm_module *module, tbm_bo bo, int size, int flags, t } tbm_backend_bo_data * -tbm_module_bufmgr_bo_alloc_with_format(tbm_module *module, int format, int bo_idx, int width, +tbm_module_bufmgr_alloc_bo_with_format(tbm_module *module, int format, int bo_idx, int width, int height, int bpp, tbm_bo_memory_type flags, tbm_error_e *error) { tbm_backend_bo_data *bo_data = NULL; @@ -728,7 +728,7 @@ tbm_module_bufmgr_bo_alloc_with_format(tbm_module *module, int format, int bo_id tbm_backend_bo_data * -tbm_module_bufmgr_bo_import_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_error_e *error) +tbm_module_bufmgr_import_bo_with_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_error_e *error) { tbm_backend_bo_data *bo_data = NULL; tbm_backend_bufmgr_func *bufmgr_func = NULL; @@ -771,7 +771,7 @@ tbm_module_bufmgr_bo_import_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_err } tbm_backend_bo_data * -tbm_module_bufmgr_bo_import_key(tbm_module *module, tbm_bo bo, tbm_key key, tbm_error_e *error) +tbm_module_bufmgr_import_bo_with_key(tbm_module *module, tbm_bo bo, tbm_key key, tbm_error_e *error) { tbm_backend_bo_data *bo_data = NULL; tbm_backend_bufmgr_func *bufmgr_func = NULL; -- 2.7.4