X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftbm_surface_internal.c;h=8c6fc391112d1d19b029e0e7a164e31f73c68561;hb=e63541a42a8470996ae0dc2209b2febaaa71c390;hp=5f8ebcb9fa6d54d7626e82ecc801e0bbbe404f86;hpb=4afe2f52523916cf6e50cf79f54df9bd19a707f5;p=platform%2Fcore%2Fuifw%2Flibtbm.git

diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c
index 5f8ebcb..8c6fc39 100644
--- a/src/tbm_surface_internal.c
+++ b/src/tbm_surface_internal.c
@@ -320,7 +320,6 @@ _tbm_surface_internal_query_plane_data(tbm_surface_h surface,
 
 	struct _tbm_surface *surf = (struct _tbm_surface *)surface;
 	struct _tbm_bufmgr *bufmgr = surf->bufmgr;
-	int ret = 0;
 	tbm_error_e error;
 
 	TBM_RETURN_VAL_IF_FAIL(bufmgr != NULL, 0);
@@ -328,54 +327,13 @@ _tbm_surface_internal_query_plane_data(tbm_surface_h surface,
 	TBM_RETURN_VAL_IF_FAIL(surf->info.height > 0, 0);
 	TBM_RETURN_VAL_IF_FAIL(surf->info.format > 0, 0);
 
-	if (bufmgr->use_hal_tbm) {
-		error = (tbm_error_e)hal_tbm_bufmgr_get_plane_data(bufmgr->hal_bufmgr, (hal_tbm_format)surf->info.format,
-								plane_idx, surf->info.width, surf->info.height, size, offset, pitch, bo_idx);
-		/* LCOV_EXCL_START */
-		if (error == TBM_ERROR_NOT_SUPPORTED) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			return 0;
-		} else if (error != TBM_ERROR_NONE) {
-			TBM_ERR("Fail to surface_get_plane_data. surface(%p) error(%d)\n", surface, error);
-			_tbm_set_last_result(error);
-			return 0;
-		}
-		/* LCOV_EXCL_STOP */
-		ret = 1;
-	} else if (bufmgr->backend_module_data) {
-		if (!bufmgr->bufmgr_func->bufmgr_get_plane_data) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			return 0;
-		}
-
-		error = bufmgr->bufmgr_func->bufmgr_get_plane_data(bufmgr->bufmgr_data, surf->info.format, plane_idx,
-						surf->info.width, surf->info.height, size, offset, pitch, bo_idx);
-		if (error != TBM_ERROR_NONE) {
-			/* LCOV_EXCL_START */
-			TBM_ERR("Fail to surface_get_plane_data. surface(%p) error(%d)\n", surface, error);
-			_tbm_set_last_result(error);
-			return 0;
-			/* LCOV_EXCL_STOP */
-		}
-		ret = 1;
-	} else {
-		if (!bufmgr->backend->surface_get_plane_data) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			return 0;
-		}
-
-		ret = bufmgr->backend->surface_get_plane_data(surf->info.width,
-				surf->info.height, surf->info.format, plane_idx, size, offset, pitch, bo_idx);
-		if (!ret) {
-			/* LCOV_EXCL_START */
-			TBM_ERR("Fail to surface_get_plane_data. surface(%p)\n", surface);
-			_tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-			return 0;
-			/* LCOV_EXCL_STOP */
-		}
+	error = tbm_module_bufmgr_get_plane_data(bufmgr->module, surf->info.format, plane_idx, surf->info.width, surf->info.height, size, offset, pitch, bo_idx);
+	if (error != TBM_ERROR_NONE) {
+		_tbm_set_last_result(error);
+		return 0;
 	}
 
-	return ret;
+	return 1;
 }
 
 static void
@@ -703,60 +661,13 @@ _tbm_surface_internal_create_surface(tbm_bufmgr bufmgr, int width, int height, i
 				bo_size += surf->info.planes[j].size;
 		}
 
-		if (bufmgr->use_hal_tbm) {
-			surf->bos[i] = tbm_bo_alloc_with_format(bufmgr, format, i, width, height, surf->info.bpp/8, flags, error);
-			if (*error == TBM_ERROR_NOT_SUPPORTED) {
-				surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to alloc bo idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
-			}
-		} else if (bufmgr->backend_module_data) {
-			if (bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format) {
-				/* LCOV_EXCL_START */
-				surf->bos[i] = tbm_bo_alloc_with_format(bufmgr, format, i, width, height, surf->info.bpp/8, flags, error);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to tbm_bo_alloc_with_format idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
-				/* LCOV_EXCL_STOP */
-			} else if (bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format && (flags & TBM_BO_TILED)) {
-				/* LCOV_EXCL_START */
-				surf->bos[i] = tbm_bo_alloc_with_tiled_format(bufmgr, width, height, surf->info.bpp/8, format, flags, i, error);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to tbm_bo_alloc_with_tiled_format idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
-				/* LCOV_EXCL_STOP */
-			} else {
-				surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to alloc bo idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
-			}
-		} else {
-			if (bufmgr->backend->surface_bo_alloc) {
-				/* LCOV_EXCL_START */
-				surf->bos[i] = tbm_bo_alloc_with_surface(bufmgr, width, height, format, flags, i);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to tbm_bo_alloc_with_surface idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				/* LCOV_EXCL_STOP */
-				}
-			} else {
-				surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to alloc bo idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
+		surf->bos[i] = tbm_bufmgr_internal_alloc_bo_with_format(bufmgr, format, i, width, height, surf->info.bpp/8, flags, error);
+		if (!surf->bos[i]) {
+			surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
+			if (!surf->bos[i]) {
+				TBM_ERR("fail to alloc bo idx:%d\n", i);
+				*error = tbm_get_last_error();
+				goto alloc_bo_fail;
 			}
 		}
 
@@ -895,7 +806,7 @@ _tbm_surface_internal_hal_tbm_create_surface(tbm_bufmgr bufmgr, int width, int h
 					bo_size += surf->info.planes[j].size;
 			}
 
-			surf->bos[i] = tbm_bo_alloc_with_format(bufmgr, format, i, width, height, surf->info.bpp / 8, flags, error);
+			surf->bos[i] = tbm_bufmgr_internal_alloc_bo_with_format(bufmgr, format, i, width, height, surf->info.bpp / 8, flags, error);
 			if (*error == TBM_ERROR_NOT_SUPPORTED) {
 				surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
 				if (!surf->bos[i]) {
@@ -1087,7 +998,6 @@ tbm_surface_internal_query_supported_formats(uint32_t **formats,
 		uint32_t *num)
 {
 	struct _tbm_bufmgr *bufmgr;
-	int ret = 0;
 	bool bufmgr_initialized = false;
 	tbm_error_e error;
 
@@ -1110,46 +1020,10 @@ tbm_surface_internal_query_supported_formats(uint32_t **formats,
 
 	bufmgr = g_surface_bufmgr;
 
-	if (bufmgr->use_hal_tbm) {
-		error = (tbm_error_e)hal_tbm_bufmgr_get_supported_formats(bufmgr->hal_bufmgr, formats, num);
-		/* LCOV_EXCL_START */
-		if (error == TBM_ERROR_NOT_SUPPORTED) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			goto fail;
-		} else if (error != TBM_ERROR_NONE) {
-			_tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-			goto fail;
-		}
-		/* LCOV_EXCL_STOP */
-		ret = 1;
-	} else if (bufmgr->backend_module_data) {
-		if (!bufmgr->bufmgr_func->bufmgr_get_supported_formats) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			goto fail;
-		}
-
-		error = bufmgr->bufmgr_func->bufmgr_get_supported_formats(bufmgr->bufmgr_data, formats, num);
-		if (error != TBM_ERROR_NONE) {
-			/* LCOV_EXCL_START */
-			TBM_ERR("Fail to surface_supported_format. error(%d)\n", error);
-			goto fail;
-			/* LCOV_EXCL_START */
-		}
-		ret = 1;
-	} else {
-		if (!bufmgr->backend->surface_supported_format) {
-			_tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-			goto fail;
-		}
-
-		ret = bufmgr->backend->surface_supported_format(formats, num);
-		if (!ret)  {
-			/* LCOV_EXCL_START */
-			TBM_ERR("Fail to surface_supported_format.\n");
-			_tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-			goto fail;
-			/* LCOV_EXCL_START */
-		}
+	error = tbm_module_bufmgr_get_supported_formats(bufmgr->module, formats, num);
+	if (error != TBM_ERROR_NONE) {
+		_tbm_set_last_result(error);
+		goto fail;
 	}
 
 	TBM_TRACE_SURFACE_INTERNAL("tbm_bufmgr(%p) format num(%u)\n", g_surface_bufmgr, *num);
@@ -1161,7 +1035,7 @@ tbm_surface_internal_query_supported_formats(uint32_t **formats,
 
 	_tbm_surface_mutex_unlock();
 
-	return ret;
+	return 1;
 
 /* LCOV_EXCL_START */
 fail: