From: sunghyun kim Date: Thu, 27 Jul 2017 05:50:31 +0000 (+0900) Subject: [evasgl] fix warning in extn & tbm backend X-Git-Tag: accepted/tizen/4.0/unified/20170816.011633~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5ea54534b442ba6f31269390aba4abe501a8a95;p=platform%2Fupstream%2Fefl.git [evasgl] fix warning in extn & tbm backend fix warning in extn & tbm_backend 1. fixed pointer type in ecore_evs_tbmc.c 2. add EINA_UNUSED for unused value 3. fix resource_id initail value for fix warning 4. change ecore_evas_extn_socket_new_internal() for fix warning Change-Id: I7ae91fcfd3a246614bca5a1fe0c9ea18a7578a3a --- diff --git a/src/lib/ecore_evas/ecore_evas_tbm.c b/src/lib/ecore_evas/ecore_evas_tbm.c index ea023b4..58b647c 100755 --- a/src/lib/ecore_evas/ecore_evas_tbm.c +++ b/src/lib/ecore_evas/ecore_evas_tbm.c @@ -532,10 +532,10 @@ static Ecore_Evas_Engine_Func _ecore_tbm_engine_func = NULL // aux_hints_set }; -static tbm_surface_queue_h * +static void * _ecore_evas_tbm_queue_alloc(void *data EINA_UNUSED, int w, int h) { - return tbm_surface_queue_create(3, w, h, TBM_FORMAT_ARGB8888, TBM_BO_DEFAULT); + return (void *)tbm_surface_queue_create(3, w, h, TBM_FORMAT_ARGB8888, TBM_BO_DEFAULT); } static void diff --git a/src/lib/ecore_evas/ecore_evas_tbm.h b/src/lib/ecore_evas/ecore_evas_tbm.h index 02cfff3..7def861 100755 --- a/src/lib/ecore_evas/ecore_evas_tbm.h +++ b/src/lib/ecore_evas/ecore_evas_tbm.h @@ -4,7 +4,7 @@ typedef struct _Ecore_Evas_Engine_Tbm_Data Ecore_Evas_Engine_Tbm_Data; struct _Ecore_Evas_Engine_Tbm_Data { - const void* tbm_queue; + void* tbm_queue; tbm_surface_h tbm_surf; Eina_Bool ext_tbm_queue; void (*free_func) (void *data, void *tbm_queue); diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c index c215abb..a0b3c06 100644 --- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c +++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c @@ -113,7 +113,7 @@ static int extn_type = EXTN_TYPE_NONE; /* Tizen Only : Callback function & listener for tizen remote surface */ #ifdef BUILD_TIZEN_REMOTE_SURFACE -static void _ecore_evas_extn_rsp_cb_resource_id(void *data, struct tizen_remote_surface_provider *provider, uint32_t res_id) +static void _ecore_evas_extn_rsp_cb_resource_id(void *data, struct tizen_remote_surface_provider *provider EINA_UNUSED, uint32_t res_id) { /* to get resource id of this remote surface */ Ecore_Evas *ee = data; @@ -139,13 +139,13 @@ static void _ecore_evas_extn_rsp_cb_resource_id(void *data, struct tizen_remote_ extn->resource_id = res_id; INF("[EXTN_GL] remote surcace's resource_id: %u ",extn->resource_id); } -static void _ecore_evas_extn_rsp_cb_visibility(void *data, struct tizen_remote_surface_provider *provider, uint32_t visibility) +static void _ecore_evas_extn_rsp_cb_visibility(void *data EINA_UNUSED, struct tizen_remote_surface_provider *provider EINA_UNUSED, uint32_t visibility EINA_UNUSED) { /* To do : add visibility change */ } static void -_ecore_evas_extn_rs_cb_buffer_update(void *data, struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time) /* This callback will be deprecated */ +_ecore_evas_extn_rs_cb_buffer_update(void *data, struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time EINA_UNUSED) /* This callback will be deprecated */ { Evas_Object* img = data; @@ -194,7 +194,7 @@ _ecore_evas_extn_rs_cb_buffer_update(void *data, struct tizen_remote_surface *tr static void _ecore_evas_extn_rs_cb_changed_buffer(void *data, struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *buffer, - int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys) + int32_t img_file_fd, uint32_t img_file_size EINA_UNUSED, uint32_t time EINA_UNUSED, struct wl_array *keys EINA_UNUSED) { /* check type of given buffer */ if (type == TIZEN_REMOTE_SURFACE_BUFFER_TYPE_TBM) @@ -250,7 +250,7 @@ _ecore_evas_extn_rs_cb_changed_buffer(void *data, struct tizen_remote_surface *t close(img_file_fd); /* close passed fd whatever type is */ } static void -_ecore_evas_extn_rs_cb_missing(void *data, struct tizen_remote_surface *trs) +_ecore_evas_extn_rs_cb_missing(void *data EINA_UNUSED, struct tizen_remote_surface *trs EINA_UNUSED) { ERR("Plug is missing...! "); } @@ -462,7 +462,7 @@ _ecore_evas_extn_free(Ecore_Evas *ee) #ifdef BUILD_TIZEN_REMOTE_SURFACE if(extn->extn_type_client == EXTN_TYPE_WAYLAND_EGL) { - extn->resource_id = NULL; + extn->resource_id = 0; if(extn->tizen_rsp) tizen_remote_surface_provider_destroy(extn->tizen_rsp); if(extn->tizen_rs) { @@ -1162,7 +1162,7 @@ _ecore_evas_plug_cb_window_iconify_change(void *data, int type EINA_UNUSED, void } static Eina_Bool -_ecore_evas_plug_cb_window_show(void *data, int type EINA_UNUSED, void *event) +_ecore_evas_plug_cb_window_show(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { Extn *extn; Ecore_Evas *ee; @@ -2165,7 +2165,7 @@ _ipc_client_add(void *data, int type EINA_UNUSED, void *event) ipc.w = ee->w; ipc.h = ee->h; ecore_ipc_client_send(e->client, MAJOR, OP_GL_REF, - extn->resource_id, NULL, 0, + extn->resource_id, 0, 0, NULL,0); ecore_ipc_client_send(e->client, MAJOR, OP_RESIZE, 0, 0, 0, &ipc, sizeof(ipc)); @@ -2747,10 +2747,20 @@ ecore_evas_extn_socket_new_internal(int w, int h) return NULL; } } + evas_key_modifier_add(ee->evas, "Shift"); + evas_key_modifier_add(ee->evas, "Control"); + evas_key_modifier_add(ee->evas, "Alt"); + evas_key_modifier_add(ee->evas, "Meta"); + evas_key_modifier_add(ee->evas, "Hyper"); + evas_key_modifier_add(ee->evas, "Super"); + evas_key_lock_add(ee->evas, "Caps_Lock"); + evas_key_lock_add(ee->evas, "Num_Lock"); + evas_key_lock_add(ee->evas, "Scroll_Lock"); + + extn_ee_list = eina_list_append(extn_ee_list, ee); } + else #endif - - if (_ecore_evas_extn_type_get() == EXTN_TYPE_SHM) { Evas_Engine_Info_Buffer *einfo; Ecore_Evas_Engine_Buffer_Data *bdata; @@ -2830,19 +2840,19 @@ ecore_evas_extn_socket_new_internal(int w, int h) ecore_evas_free(ee); return NULL; } - _ecore_evas_register(ee); + _ecore_evas_register(ee); + evas_key_modifier_add(ee->evas, "Shift"); + evas_key_modifier_add(ee->evas, "Control"); + evas_key_modifier_add(ee->evas, "Alt"); + evas_key_modifier_add(ee->evas, "Meta"); + evas_key_modifier_add(ee->evas, "Hyper"); + evas_key_modifier_add(ee->evas, "Super"); + evas_key_lock_add(ee->evas, "Caps_Lock"); + evas_key_lock_add(ee->evas, "Num_Lock"); + evas_key_lock_add(ee->evas, "Scroll_Lock"); + + extn_ee_list = eina_list_append(extn_ee_list, ee); } - evas_key_modifier_add(ee->evas, "Shift"); - evas_key_modifier_add(ee->evas, "Control"); - evas_key_modifier_add(ee->evas, "Alt"); - evas_key_modifier_add(ee->evas, "Meta"); - evas_key_modifier_add(ee->evas, "Hyper"); - evas_key_modifier_add(ee->evas, "Super"); - evas_key_lock_add(ee->evas, "Caps_Lock"); - evas_key_lock_add(ee->evas, "Num_Lock"); - evas_key_lock_add(ee->evas, "Scroll_Lock"); - - extn_ee_list = eina_list_append(extn_ee_list, ee); return ee; } @@ -2903,7 +2913,7 @@ _ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, if (!tizen_rsm) { ERR("tizen_rsm is NULL"); - return NULL; + return EINA_FALSE; } if (!(extn->tizen_rsp)) @@ -2913,7 +2923,7 @@ _ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, if (!(extn->tizen_rsp)) { ERR("Could not create tizen_remote_surface_provider\n"); - return NULL; + return EINA_FALSE; } tizen_remote_surface_provider_add_listener(extn->tizen_rsp, &_ecore_evas_extn_gl_socket_listener, ee); } diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h index 3fe2613..4aa406e 100644 --- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h +++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h @@ -33,8 +33,10 @@ # include # include # include +# include # include # include +# include #endif // TIZEN ONLY (170220): request e19 compositor to create socket diff --git a/src/modules/evas/engines/gl_tbm/evas_engine.c b/src/modules/evas/engines/gl_tbm/evas_engine.c index 60a7964..8bac9e9 100644 --- a/src/modules/evas/engines/gl_tbm/evas_engine.c +++ b/src/modules/evas/engines/gl_tbm/evas_engine.c @@ -1379,9 +1379,8 @@ _native_cb_free(void *data, void *image) } static int -_native_cb_yinvert(void *data, void *image) +_native_cb_yinvert(void *data EINA_UNUSED, void *image) { - Render_Engine *re = data; Evas_GL_Image *im = image; Native *n = im->native.data; int yinvert = 0; @@ -1818,6 +1817,7 @@ module_open(Evas_Module *em) ORD(output_dump); ORD(image_native_set); + ORD(image_native_get); ORD(gl_current_context_get); ORD(gl_error_get);