change the args for hal_tbm_surface api

add modifiers information to hal_tbm_bufmgr_alloc_surface
change integer to uint32_t

Change-Id: Idef78db35848e1a3236ea25d96435fb6ef3b7c4a

diff --git a/include/hal-tbm-interface.h b/include/hal-tbm-interface.h
index 28c169943111b9312436a7958dd442129e50bc87..b2480a50a07555dd4c1a6026038b3e2801a10d57 100644 (file)
--- a/include/hal-tbm-interface.h
+++ b/include/hal-tbm-interface.h
@@ -69,13 +69,13 @@ struct _hal_tbm_bufmgr_funcs {
        hal_tbm_error (*bufmgr_get_supported_formats)(hal_tbm_bufmgr *bufmgr, uint32_t **formats, uint32_t *num);
        hal_tbm_error (*bufmgr_get_plane_data)(hal_tbm_bufmgr *bufmgr, hal_tbm_format format, int plane_idx, int width, int height,
                                                                                uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx);
+       hal_tbm_surface *(*bufmgr_alloc_surface)(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, uint64_t *modifiers, uint32_t num_modifiers, hal_tbm_error *error);
+       hal_tbm_surface *(*bufmgr_import_surface)(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error);
        hal_tbm_bo *(*bufmgr_alloc_bo)(hal_tbm_bufmgr *bufmgr, unsigned int size, hal_tbm_bo_memory_type mem_types, hal_tbm_error *error);
        hal_tbm_bo *(*bufmgr_alloc_bo_with_format)(hal_tbm_bufmgr *bufmgr, int format, int bo_idx, int width, int height, int bpp,
                                                                                hal_tbm_bo_memory_type mem_types, hal_tbm_error *error);
        hal_tbm_bo *(*bufmgr_import_fd)(hal_tbm_bufmgr *bufmgr, hal_tbm_fd fd, hal_tbm_error *error);
        hal_tbm_bo *(*bufmgr_import_key)(hal_tbm_bufmgr *bufmgr, hal_tbm_key key, hal_tbm_error *error);
-       hal_tbm_surface *(*bufmgr_alloc_surface)(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_error *error);
-       hal_tbm_surface *(*bufmgr_import_surface)(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error);
 };
 
 struct _hal_tbm_surface_funcs {

diff --git a/include/hal-tbm.h b/include/hal-tbm.h
index a792190ec3fa92a65ef77bcb241a81d50f21a88a..fcf0c38a39047413d36d7199546ec0ad1b702b04 100644 (file)
--- a/include/hal-tbm.h
+++ b/include/hal-tbm.h
@@ -55,8 +55,8 @@ hal_tbm_bufmgr_capability  hal_tbm_bufmgr_get_capabilities(hal_tbm_bufmgr *bufmg
 hal_tbm_error              hal_tbm_bufmgr_get_supported_formats(hal_tbm_bufmgr *bufmgr, uint32_t **formats, uint32_t *num);
 hal_tbm_error              hal_tbm_bufmgr_get_plane_data(hal_tbm_bufmgr *bufmgr, hal_tbm_format format, int plane_idx, int width, int height,
                                           uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx);
-hal_tbm_surface           *hal_tbm_bufmgr_alloc_surface(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_error *error);
-hal_tbm_surface           *hal_tbm_bufmgr_import_surface(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error);
+hal_tbm_surface           *hal_tbm_bufmgr_alloc_surface(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, uint64_t *modifiers, uint32_t num_modifiers, hal_tbm_error *error);
+hal_tbm_surface           *hal_tbm_bufmgr_import_surface(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error);
 hal_tbm_bo                *hal_tbm_bufmgr_alloc_bo(hal_tbm_bufmgr *bufmgr, unsigned int size, hal_tbm_bo_memory_type mem_types, hal_tbm_error *error);
 hal_tbm_bo                *hal_tbm_bufmgr_alloc_bo_with_format(hal_tbm_bufmgr *bufmgr, int format, int bo_idx, int width, int height, int bpp,
                                           hal_tbm_bo_memory_type mem_types, hal_tbm_error *error);

diff --git a/src/hal-api-tbm.c b/src/hal-api-tbm.c
index d875d62754dfc60f7cfbea0f814ed77f208a694d..ecb86bbd0cca0f254391a429d2e652bb12571469 100644 (file)
--- a/src/hal-api-tbm.c
+++ b/src/hal-api-tbm.c
@@ -314,15 +314,15 @@ hal_tbm_bufmgr_get_plane_data(hal_tbm_bufmgr *bufmgr, hal_tbm_format format, int
 
 
 EXTERN hal_tbm_surface *
-hal_tbm_bufmgr_alloc_surface(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_error *error)
+hal_tbm_bufmgr_alloc_surface(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, uint64_t *modifiers, uint32_t num_modifiers, hal_tbm_error *error)
 {
        BUFMGR_FUNC_ENTRY_NULL(bufmgr_alloc_surface);
 
-       return bufmgr_funcs->bufmgr_alloc_surface((hal_tbm_bufmgr *)bufmgr, width, height, format, error);
+       return bufmgr_funcs->bufmgr_alloc_surface((hal_tbm_bufmgr *)bufmgr, width, height, format, modifiers, num_modifiers, error);
 }
 
 EXTERN hal_tbm_surface *
-hal_tbm_bufmgr_import_surface(hal_tbm_bufmgr *bufmgr, int width, int height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error)
+hal_tbm_bufmgr_import_surface(hal_tbm_bufmgr *bufmgr, uint32_t width, uint32_t height, hal_tbm_format format, hal_tbm_surface_buffer_data *buffer_data, hal_tbm_error *error)
 {
        BUFMGR_FUNC_ENTRY_NULL(bufmgr_import_surface);