tbm_module: change tbm_backend_surface_data into tbm_surface_data

Change-Id: Ib8b0cc86f82ed4cd4dd32ac5ed0ec08aa75baefa

diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h
index dffecc0..c48cfd6 100644 (file)
--- a/src/tbm_bufmgr_int.h
+++ b/src/tbm_bufmgr_int.h
@@ -251,7 +251,7 @@ struct _tbm_surface {
                int height;
        } damage;
 
-       tbm_backend_surface_data *surface_data; /* surface data of the backend module */
+       tbm_surface_data *surface_data; /* surface data of the backend module */
 };
 
 typedef struct {

diff --git a/src/tbm_module.c b/src/tbm_module.c
index 3ec1a34..276098c 100644 (file)
--- a/src/tbm_module.c
+++ b/src/tbm_module.c
@@ -648,7 +648,7 @@ int
 tbm_module_support_surface_data(tbm_module *module)
 {
        tbm_error_e error = TBM_ERROR_NONE;
-       tbm_backend_surface_data *surface_data = NULL;
+       tbm_surface_data *surface_data = NULL;
 
        static int tbm_module_check_support_surface_data = 0;
 
@@ -679,15 +679,15 @@ done:
 }
 
 
-tbm_backend_surface_data *
+tbm_surface_data *
 tbm_module_alloc_surface_data(tbm_module *module, int width, int height, int format, int flags, tbm_error_e *error)
 {
-       tbm_backend_surface_data *surface_data = NULL;
+       tbm_surface_data *surface_data = NULL;
 
        TBM_RETURN_VAL_SET_ERR_IF_FAIL(module, NULL, *error, TBM_ERROR_INVALID_PARAMETER);
        TBM_RETURN_VAL_SET_ERR_IF_FAIL(module->type == TBM_MODULE_TYPE_HAL_TBM, NULL, *error, TBM_ERROR_INVALID_OPERATION);
 
-       surface_data = calloc(1, sizeof(struct _tbm_backend_surface_data));
+       surface_data = calloc(1, sizeof(struct _tbm_surface_data));
        if (!surface_data) {
                TBM_ERR("memory allocation failed.");
                *error = TBM_ERROR_OUT_OF_MEMORY;
@@ -714,15 +714,15 @@ tbm_module_alloc_surface_data(tbm_module *module, int width, int height, int for
        return surface_data;
 }
 
-tbm_backend_surface_data *
+tbm_surface_data *
 tbm_module_import_surface_data(tbm_module *module, int width, int height, int format, tbm_surface_buffer_data *buffer_data, tbm_error_e *error)
 {
-       tbm_backend_surface_data *surface_data = NULL;
+       tbm_surface_data *surface_data = NULL;
 
        TBM_RETURN_VAL_SET_ERR_IF_FAIL(module, NULL, *error, TBM_ERROR_INVALID_PARAMETER);
        TBM_RETURN_VAL_SET_ERR_IF_FAIL(module->type == TBM_MODULE_TYPE_HAL_TBM, NULL, *error, TBM_ERROR_INVALID_OPERATION);
 
-       surface_data = calloc(1, sizeof(struct _tbm_backend_surface_data));
+       surface_data = calloc(1, sizeof(struct _tbm_surface_data));
        if (!surface_data) {
                TBM_ERR("memory allocation failed.");
                *error = TBM_ERROR_OUT_OF_MEMORY;
@@ -917,7 +917,7 @@ tbm_module_import_bo_data_with_key(tbm_module *module, tbm_bo bo, tbm_key key, t
 }
 
 void
-tbm_surface_data_free(tbm_backend_surface_data *surface_data)
+tbm_surface_data_free(tbm_surface_data *surface_data)
 {
        TBM_RETURN_IF_FAIL(surface_data);
        TBM_RETURN_IF_FAIL(surface_data->module);
@@ -932,7 +932,7 @@ tbm_surface_data_free(tbm_backend_surface_data *surface_data)
 }
 
 tbm_error_e
-tbm_surface_data_get_plane_data(tbm_backend_surface_data *surface_data, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx)
+tbm_surface_data_get_plane_data(tbm_surface_data *surface_data, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx)
 {
        tbm_error_e error;
 
@@ -946,7 +946,7 @@ tbm_surface_data_get_plane_data(tbm_backend_surface_data *surface_data, int plan
 }
 
 tbm_backend_bo_data **
-tbm_surface_data_get_bo_data_array(tbm_backend_surface_data *surface_data, int *num_bos, tbm_error_e *error)
+tbm_surface_data_get_bo_data_array(tbm_surface_data *surface_data, int *num_bos, tbm_error_e *error)
 {
        hal_tbm_bo **hal_bos = NULL;
 
@@ -960,7 +960,7 @@ tbm_surface_data_get_bo_data_array(tbm_backend_surface_data *surface_data, int *
 }
 
 tbm_surface_buffer_data *
-tbm_surface_data_export(tbm_backend_surface_data *surface_data, tbm_error_e *error)
+tbm_surface_data_export(tbm_surface_data *surface_data, tbm_error_e *error)
 {
        tbm_surface_buffer_data *buffer_data;
 

diff --git a/src/tbm_module.h b/src/tbm_module.h
index 6a00338..c831bd5 100644 (file)
--- a/src/tbm_module.h
+++ b/src/tbm_module.h
@@ -69,10 +69,10 @@ typedef struct _tbm_module {
        hal_tbm_bufmgr           *hal_bufmgr;           /* hal-api-tbm bufmgr */
 } tbm_module;
 
-typedef struct _tbm_backend_surface_data {
+typedef struct _tbm_surface_data {
        tbm_module *module;
        hal_tbm_surface *hal_surface;
-} tbm_backend_surface_data;
+} tbm_surface_data;
 
 /* tbm_module functions */
 tbm_module *tbm_module_load(int fd);
@@ -84,18 +84,18 @@ tbm_error_e          tbm_module_get_supported_formats(tbm_module *module, uint32
 tbm_error_e          tbm_module_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);
 int                  tbm_module_support_surface_data(tbm_module *module);
 
-tbm_backend_surface_data  *tbm_module_alloc_surface_data(tbm_module *module, int width, int height, int format, int flags, tbm_error_e *error);
-tbm_backend_surface_data  *tbm_module_import_surface_data(tbm_module *module, int width, int height, int format, tbm_surface_buffer_data *buffer_data, tbm_error_e *error);
+tbm_surface_data  *tbm_module_alloc_surface_data(tbm_module *module, int width, int height, int format, int flags, tbm_error_e *error);
+tbm_surface_data  *tbm_module_import_surface_data(tbm_module *module, int width, int height, int format, tbm_surface_buffer_data *buffer_data, tbm_error_e *error);
 
 tbm_backend_bo_data *tbm_module_alloc_bo_data(tbm_module *module, tbm_bo bo, int size, int flags, tbm_error_e *error);
 tbm_backend_bo_data *tbm_module_alloc_bo_data_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_import_bo_data_with_fd(tbm_module *module, tbm_bo bo, tbm_fd fd, tbm_error_e *error);
 tbm_backend_bo_data *tbm_module_import_bo_data_with_key(tbm_module *module, tbm_bo bo, tbm_key key, tbm_error_e *error);
 
-void                      tbm_surface_data_free(tbm_backend_surface_data *surface_data);
-tbm_error_e               tbm_surface_data_get_plane_data(tbm_backend_surface_data *surface_data, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx);
-tbm_backend_bo_data     **tbm_surface_data_get_bo_data_array(tbm_backend_surface_data *surface_data, int *num_bos, tbm_error_e *error);
-tbm_surface_buffer_data  *tbm_surface_data_export(tbm_backend_surface_data *surface_data, tbm_error_e *error);
+void                      tbm_surface_data_free(tbm_surface_data *surface_data);
+tbm_error_e               tbm_surface_data_get_plane_data(tbm_surface_data *surface_data, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx);
+tbm_backend_bo_data     **tbm_surface_data_get_bo_data_array(tbm_surface_data *surface_data, int *num_bos, tbm_error_e *error);
+tbm_surface_buffer_data  *tbm_surface_data_export(tbm_surface_data *surface_data, tbm_error_e *error);
 
 void          tbm_module_bo_free(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, int get_from_surface_data);
 int           tbm_module_bo_get_size(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, tbm_error_e *error);