fix build errors while doing integration works

1. set @beta to properties which include void_ptr
2. EFL_UI_EVENT_CLICKED -> EFL_INPUT_EVENT_CLICKED
3. apply EFL_CANVAS_GROUP_CALC_OPS to tizen only widgets
4. fix wrong integration for evas_gl_api.c

Change-Id: Iec7a61f1c37925b8c9ae9c965807b2ec3ffb8732

diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 7cded1e..d3c1158 100644 (file)
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -306,7 +306,7 @@ struct Efl.Access.Gesture_Info
    event_time: uint; [[gesture occurance time]]
 }
 
-type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]]
+type Efl.Access.Relation_Set: list<Efl.Access.Relation>; [[Elementary Accessibility relation set type]]
 
 mixin Efl.Access.Object requires Efl.Object
 {
@@ -333,7 +333,7 @@ mixin Efl.Access.Object requires Efl.Object
          }
       }
       //TIZEN_ONLY(20190922): add name callback, description callback.
-      @property name_cb {
+      @property name_cb @beta {
          set {
             [[Sets name information callback about widget.
 
@@ -379,7 +379,7 @@ mixin Efl.Access.Object requires Efl.Object
       }
       //
       //TIZEN_ONLY(20190922): add name callback, description callback.
-      @property description_cb {
+      @property description_cb @beta {
          set {
             [[Sets contextual information callback about widget.
 
@@ -394,7 +394,7 @@ mixin Efl.Access.Object requires Efl.Object
       }
       //
       //TIZEN_ONLY(20170405) Add gesture method to accessible interface
-      @property gesture_cb {
+      @property gesture_cb @beta{
          set {
             [[Sets gesture callback to give widget.
 

diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index b3486e0..c85f8c6 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -491,7 +491,7 @@ abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
           [['Virtual' function which checks if handling of passing focus to sub-objects is supported by widget.]]
           return: bool; [[$true on success, $false otherwise]]
        }
-       focus_list_direction_get @const {
+       focus_list_direction_get @const @beta {
           [[Get focus list direction]]
           return: bool; [[$true on success, $false otherwise]]
           params {
@@ -553,7 +553,7 @@ abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
           }
           return: bool; [[$true on success, $false otherwise]]
        }
-       focus_list_next_get @const {
+       focus_list_next_get @const @beta {
            [[Get next item in focus list]]
           return: bool; [[$true on success, $false otherwise]]
           params {

diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index ea380cd..055a40e 100644 (file)
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -523,7 +523,7 @@ _on_clicked_cb(void *data,
                const char *emission EINA_UNUSED,
                const char *source EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, EFL_INPUT_EVENT_CLICKED, NULL);
 }
 //
 

diff --git a/src/lib/elementary_tizen/elc_ctxpopup.c b/src/lib/elementary_tizen/elc_ctxpopup.c
index 7df7660..9ddd402 100644 (file)
--- a/src/lib/elementary_tizen/elc_ctxpopup.c
+++ b/src/lib/elementary_tizen/elc_ctxpopup.c
@@ -1040,7 +1040,7 @@ _elm_ctxpopup_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_p
 }
 
 EOLIAN static void
-_elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
+_elm_ctxpopup_efl_canvas_group_calculate(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Eina_List *elist;
    Elm_Ctxpopup_Item_Data *item;
@@ -3110,7 +3110,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
 /* Internal EO APIs and hidden overrides */
 
 #define ELM_CTXPOPUP_EXTRA_OPS \
-   ELM_LAYOUT_SIZING_EVAL_OPS(elm_ctxpopup), \
+   EFL_CANVAS_GROUP_CALC_OPS(elm_ctxpopup), \
    EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_ctxpopup)
 //
 #include "../elementary/elm_ctxpopup_item_eo.c"

diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c
index 6695851..3fc144d 100644 (file)
--- a/src/lib/elementary_tizen/elm_genlist.c
+++ b/src/lib/elementary_tizen/elm_genlist.c
@@ -1264,7 +1264,7 @@ _calc(void *data)
 }
 
 EOLIAN static void
-_elm_genlist_elm_layout_sizing_eval(Eo *obj, Elm_Genlist_Data *sd)
+_elm_genlist_efl_canvas_group_calculate(Eo *obj, Elm_Genlist_Data *sd)
 {
    Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1;
 
@@ -2402,6 +2402,8 @@ _elm_genlist_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Pan_Data
    Item_Block *itb;
    ELM_WIDGET_DATA_GET_OR_RETURN(psd->wsd->obj, wd);
 
+   efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
+
    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
    evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
 
@@ -9851,7 +9853,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_genlist, Elm_Genlist_Data)
 /* Internal EO APIs and hidden overrides */
 
 #define ELM_GENLIST_EXTRA_OPS \
-   ELM_LAYOUT_SIZING_EVAL_OPS(elm_genlist), \
+   EFL_CANVAS_GROUP_CALC_OPS(elm_genlist), \
    EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_genlist)
 
 #define ELM_GENLIST_PAN_EXTRA_OPS \

diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 249ddd8..6c3a44a 100755 (executable)
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -865,7 +865,58 @@ _evgl_glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLi
            }
       }
 
-   _gles3_api.glFramebufferTexture(target, attachment, texture, level);
+    _gles3_api.glFramebufferTexture(target, attachment, texture, level);
+}
+
+static void
+_evgl_glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
+{
+    EVGL_Resource *rsc;
+    EVGL_Context *ctx;
+
+    if (!(rsc=_evgl_tls_resource_get()))
+      {
+         ERR("Unable to execute GL command. Error retrieving tls");
+         return;
+      }
+
+    if (!rsc->current_eng)
+      {
+         ERR("Unable to retrive Current Engine");
+         return;
+      }
+
+    ctx = rsc->current_ctx;
+    if (!ctx)
+      {
+         ERR("Unable to retrive Current Context");
+         return;
+      }
+
+    if (!_evgl_direct_enabled())
+      {
+         if (ctx->version == EVAS_GL_GLES_3_X)
+           {
+              if (target == GL_DRAW_FRAMEBUFFER || target == GL_FRAMEBUFFER)
+                {
+                   if (ctx->current_draw_fbo == 0)
+                     {
+                        SET_GL_ERROR(GL_INVALID_OPERATION);
+                        return;
+                     }
+                }
+              else if (target == GL_READ_FRAMEBUFFER)
+                {
+                   if (ctx->current_read_fbo == 0)
+                     {
+                        SET_GL_ERROR(GL_INVALID_OPERATION);
+                        return;
+                     }
+                }
+           }
+      }
+
+    _gles3_api.glFramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 
@@ -3158,111 +3209,6 @@ _normal_gles3_api_get(Evas_GL_API *funcs, int minor_version)
         ORD(glVertexAttribIFormat);
         ORD(glVertexAttribBinding);
         ORD(glVertexBindingDivisor);
-      case 0:
-        ORD(glBeginQuery);
-        ORD(glBeginTransformFeedback);
-        ORD(glBindBufferBase);
-        ORD(glBindBufferRange);
-        ORD(glBindSampler);
-        ORD(glBindTransformFeedback);
-        ORD(glBindVertexArray);
-        ORD(glBlitFramebuffer);
-        ORD(glClearBufferfi);
-        ORD(glClearBufferfv);
-        ORD(glClearBufferiv);
-        ORD(glClearBufferuiv);
-        ORD(glClientWaitSync);
-        ORD(glCompressedTexImage3D);
-        ORD(glCompressedTexSubImage3D);
-        ORD(glCopyBufferSubData);
-        ORD(glCopyTexSubImage3D);
-        ORD(glDeleteQueries);
-        ORD(glDeleteSamplers);
-        ORD(glDeleteSync);
-        ORD(glDeleteTransformFeedbacks);
-        ORD(glDeleteVertexArrays);
-        ORD(glDrawArraysInstanced);
-        ORD(glDrawBuffers);
-        ORD(glDrawElementsInstanced);
-        ORD(glDrawRangeElements);
-        ORD(glEndQuery);
-        ORD(glEndTransformFeedback);
-        ORD(glFenceSync);
-        ORD(glFlushMappedBufferRange);
-        ORD(glFramebufferTextureLayer);
-        ORD(glGenQueries);
-        ORD(glGenSamplers);
-        ORD(glGenTransformFeedbacks);
-        ORD(glGenVertexArrays);
-        ORD(glGetActiveUniformBlockiv);
-        ORD(glGetActiveUniformBlockName);
-        ORD(glGetActiveUniformsiv);
-        ORD(glGetBufferParameteri64v);
-        ORD(glGetBufferPointerv);
-        ORD(glGetFragDataLocation);
-        ORD(glGetInteger64i_v);
-        ORD(glGetInteger64v);
-        ORD(glGetIntegeri_v);
-        ORD(glGetInternalformativ);
-        ORD(glGetProgramBinary);
-        ORD(glGetQueryiv);
-        ORD(glGetQueryObjectuiv);
-        ORD(glGetSamplerParameterfv);
-        ORD(glGetSamplerParameteriv);
-        ORD(glGetStringi);
-        ORD(glGetSynciv);
-        ORD(glGetTransformFeedbackVarying);
-        ORD(glGetUniformBlockIndex);
-        ORD(glGetUniformIndices);
-        ORD(glGetUniformuiv);
-        ORD(glGetVertexAttribIiv);
-        ORD(glGetVertexAttribIuiv);
-        ORD(glInvalidateFramebuffer);
-        ORD(glInvalidateSubFramebuffer);
-        ORD(glIsQuery);
-        ORD(glIsSampler);
-        ORD(glIsSync);
-        ORD(glIsTransformFeedback);
-        ORD(glIsVertexArray);
-        ORD(glMapBufferRange);
-        ORD(glPauseTransformFeedback);
-        ORD(glProgramBinary);
-        ORD(glProgramParameteri);
-        ORD(glReadBuffer);
-        ORD(glRenderbufferStorageMultisample);
-        ORD(glResumeTransformFeedback);
-        ORD(glSamplerParameterf);
-        ORD(glSamplerParameterfv);
-        ORD(glSamplerParameteri);
-        ORD(glSamplerParameteriv);
-        ORD(glTexImage3D);
-        ORD(glTexStorage2D);
-        ORD(glTexStorage3D);
-        ORD(glTexSubImage3D);
-        ORD(glTransformFeedbackVaryings);
-        ORD(glUniform1ui);
-        ORD(glUniform1uiv);
-        ORD(glUniform2ui);
-        ORD(glUniform2uiv);
-        ORD(glUniform3ui);
-        ORD(glUniform3uiv);
-        ORD(glUniform4ui);
-        ORD(glUniform4uiv);
-        ORD(glUniformBlockBinding);
-        ORD(glUniformMatrix2x3fv);
-        ORD(glUniformMatrix3x2fv);
-        ORD(glUniformMatrix2x4fv);
-        ORD(glUniformMatrix4x2fv);
-        ORD(glUniformMatrix3x4fv);
-        ORD(glUniformMatrix4x3fv);
-        ORD(glUnmapBuffer);
-        ORD(glVertexAttribDivisor);
-        ORD(glVertexAttribI4i);
-        ORD(glVertexAttribI4iv);
-        ORD(glVertexAttribI4ui);
-        ORD(glVertexAttribI4uiv);
-        ORD(glVertexAttribIPointer);
-        ORD(glWaitSync);
      }
 
 #undef ORD
@@ -3645,111 +3591,6 @@ _debug_gles3_api_get(Evas_GL_API *funcs, int minor_version)
         ORD(glVertexAttribIFormat);
         ORD(glVertexAttribBinding);
         ORD(glVertexBindingDivisor);
-      case 0:
-        ORD(glBeginQuery);
-        ORD(glBeginTransformFeedback);
-        ORD(glBindBufferBase);
-        ORD(glBindBufferRange);
-        ORD(glBindSampler);
-        ORD(glBindTransformFeedback);
-        ORD(glBindVertexArray);
-        ORD(glBlitFramebuffer);
-        ORD(glClearBufferfi);
-        ORD(glClearBufferfv);
-        ORD(glClearBufferiv);
-        ORD(glClearBufferuiv);
-        ORD(glClientWaitSync);
-        ORD(glCompressedTexImage3D);
-        ORD(glCompressedTexSubImage3D);
-        ORD(glCopyBufferSubData);
-        ORD(glCopyTexSubImage3D);
-        ORD(glDeleteQueries);
-        ORD(glDeleteSamplers);
-        ORD(glDeleteSync);
-        ORD(glDeleteTransformFeedbacks);
-        ORD(glDeleteVertexArrays);
-        ORD(glDrawArraysInstanced);
-        ORD(glDrawBuffers);
-        ORD(glDrawElementsInstanced);
-        ORD(glDrawRangeElements);
-        ORD(glEndQuery);
-        ORD(glEndTransformFeedback);
-        ORD(glFenceSync);
-        ORD(glFlushMappedBufferRange);
-        ORD(glFramebufferTextureLayer);
-        ORD(glGenQueries);
-        ORD(glGenSamplers);
-        ORD(glGenTransformFeedbacks);
-        ORD(glGenVertexArrays);
-        ORD(glGetActiveUniformBlockiv);
-        ORD(glGetActiveUniformBlockName);
-        ORD(glGetActiveUniformsiv);
-        ORD(glGetBufferParameteri64v);
-        ORD(glGetBufferPointerv);
-        ORD(glGetFragDataLocation);
-        ORD(glGetInteger64i_v);
-        ORD(glGetInteger64v);
-        ORD(glGetIntegeri_v);
-        ORD(glGetInternalformativ);
-        ORD(glGetProgramBinary);
-        ORD(glGetQueryiv);
-        ORD(glGetQueryObjectuiv);
-        ORD(glGetSamplerParameterfv);
-        ORD(glGetSamplerParameteriv);
-        ORD(glGetStringi);
-        ORD(glGetSynciv);
-        ORD(glGetTransformFeedbackVarying);
-        ORD(glGetUniformBlockIndex);
-        ORD(glGetUniformIndices);
-        ORD(glGetUniformuiv);
-        ORD(glGetVertexAttribIiv);
-        ORD(glGetVertexAttribIuiv);
-        ORD(glInvalidateFramebuffer);
-        ORD(glInvalidateSubFramebuffer);
-        ORD(glIsQuery);
-        ORD(glIsSampler);
-        ORD(glIsSync);
-        ORD(glIsTransformFeedback);
-        ORD(glIsVertexArray);
-        ORD(glMapBufferRange);
-        ORD(glPauseTransformFeedback);
-        ORD(glProgramBinary);
-        ORD(glProgramParameteri);
-        ORD(glReadBuffer);
-        ORD(glRenderbufferStorageMultisample);
-        ORD(glResumeTransformFeedback);
-        ORD(glSamplerParameterf);
-        ORD(glSamplerParameterfv);
-        ORD(glSamplerParameteri);
-        ORD(glSamplerParameteriv);
-        ORD(glTexImage3D);
-        ORD(glTexStorage2D);
-        ORD(glTexStorage3D);
-        ORD(glTexSubImage3D);
-        ORD(glTransformFeedbackVaryings);
-        ORD(glUniform1ui);
-        ORD(glUniform1uiv);
-        ORD(glUniform2ui);
-        ORD(glUniform2uiv);
-        ORD(glUniform3ui);
-        ORD(glUniform3uiv);
-        ORD(glUniform4ui);
-        ORD(glUniform4uiv);
-        ORD(glUniformBlockBinding);
-        ORD(glUniformMatrix2x3fv);
-        ORD(glUniformMatrix3x2fv);
-        ORD(glUniformMatrix2x4fv);
-        ORD(glUniformMatrix4x2fv);
-        ORD(glUniformMatrix3x4fv);
-        ORD(glUniformMatrix4x3fv);
-        ORD(glUnmapBuffer);
-        ORD(glVertexAttribDivisor);
-        ORD(glVertexAttribI4i);
-        ORD(glVertexAttribI4iv);
-        ORD(glVertexAttribI4ui);
-        ORD(glVertexAttribI4uiv);
-        ORD(glVertexAttribIPointer);
-        ORD(glWaitSync);
      }
 
 #undef ORD
@@ -4005,111 +3846,6 @@ _evgl_load_gles3_apis(void *dl_handle, Evas_GL_API *funcs, int minor_version,
         ORD(glVertexAttribIFormat);
         ORD(glVertexAttribBinding);
         ORD(glVertexBindingDivisor);
-      case 0:
-        ORD(glBeginQuery);
-        ORD(glBeginTransformFeedback);
-        ORD(glBindBufferBase);
-        ORD(glBindBufferRange);
-        ORD(glBindSampler);
-        ORD(glBindTransformFeedback);
-        ORD(glBindVertexArray);
-        ORD(glBlitFramebuffer);
-        ORD(glClearBufferfi);
-        ORD(glClearBufferfv);
-        ORD(glClearBufferiv);
-        ORD(glClearBufferuiv);
-        ORD(glClientWaitSync);
-        ORD(glCompressedTexImage3D);
-        ORD(glCompressedTexSubImage3D);
-        ORD(glCopyBufferSubData);
-        ORD(glCopyTexSubImage3D);
-        ORD(glDeleteQueries);
-        ORD(glDeleteSamplers);
-        ORD(glDeleteSync);
-        ORD(glDeleteTransformFeedbacks);
-        ORD(glDeleteVertexArrays);
-        ORD(glDrawArraysInstanced);
-        ORD(glDrawBuffers);
-        ORD(glDrawElementsInstanced);
-        ORD(glDrawRangeElements);
-        ORD(glEndQuery);
-        ORD(glEndTransformFeedback);
-        ORD(glFenceSync);
-        ORD(glFlushMappedBufferRange);
-        ORD(glFramebufferTextureLayer);
-        ORD(glGenQueries);
-        ORD(glGenSamplers);
-        ORD(glGenTransformFeedbacks);
-        ORD(glGenVertexArrays);
-        ORD(glGetActiveUniformBlockiv);
-        ORD(glGetActiveUniformBlockName);
-        ORD(glGetActiveUniformsiv);
-        ORD(glGetBufferParameteri64v);
-        ORD(glGetBufferPointerv);
-        ORD(glGetFragDataLocation);
-        ORD(glGetInteger64i_v);
-        ORD(glGetInteger64v);
-        ORD(glGetIntegeri_v);
-        ORD(glGetInternalformativ);
-        ORD(glGetProgramBinary);
-        ORD(glGetQueryiv);
-        ORD(glGetQueryObjectuiv);
-        ORD(glGetSamplerParameterfv);
-        ORD(glGetSamplerParameteriv);
-        ORD(glGetStringi);
-        ORD(glGetSynciv);
-        ORD(glGetTransformFeedbackVarying);
-        ORD(glGetUniformBlockIndex);
-        ORD(glGetUniformIndices);
-        ORD(glGetUniformuiv);
-        ORD(glGetVertexAttribIiv);
-        ORD(glGetVertexAttribIuiv);
-        ORD(glInvalidateFramebuffer);
-        ORD(glInvalidateSubFramebuffer);
-        ORD(glIsQuery);
-        ORD(glIsSampler);
-        ORD(glIsSync);
-        ORD(glIsTransformFeedback);
-        ORD(glIsVertexArray);
-        ORD(glMapBufferRange);
-        ORD(glPauseTransformFeedback);
-        ORD(glProgramBinary);
-        ORD(glProgramParameteri);
-        ORD(glReadBuffer);
-        ORD(glRenderbufferStorageMultisample);
-        ORD(glResumeTransformFeedback);
-        ORD(glSamplerParameterf);
-        ORD(glSamplerParameterfv);
-        ORD(glSamplerParameteri);
-        ORD(glSamplerParameteriv);
-        ORD(glTexImage3D);
-        ORD(glTexStorage2D);
-        ORD(glTexStorage3D);
-        ORD(glTexSubImage3D);
-        ORD(glTransformFeedbackVaryings);
-        ORD(glUniform1ui);
-        ORD(glUniform1uiv);
-        ORD(glUniform2ui);
-        ORD(glUniform2uiv);
-        ORD(glUniform3ui);
-        ORD(glUniform3uiv);
-        ORD(glUniform4ui);
-        ORD(glUniform4uiv);
-        ORD(glUniformBlockBinding);
-        ORD(glUniformMatrix2x3fv);
-        ORD(glUniformMatrix3x2fv);
-        ORD(glUniformMatrix2x4fv);
-        ORD(glUniformMatrix4x2fv);
-        ORD(glUniformMatrix3x4fv);
-        ORD(glUniformMatrix4x3fv);
-        ORD(glUnmapBuffer);
-        ORD(glVertexAttribDivisor);
-        ORD(glVertexAttribI4i);
-        ORD(glVertexAttribI4iv);
-        ORD(glVertexAttribI4ui);
-        ORD(glVertexAttribI4uiv);
-        ORD(glVertexAttribIPointer);
-        ORD(glWaitSync);
      }
 #undef ORD