[evas-gl] enable dynamic_hint in wayland_egl

a feature called dynamic hint has been disabled in wayland.
so i enable this hint and fixed some crash.

1. Add flag in wayland_egl
: we need to check 'EGL_TIZEN_image_native_surface' in wayland
  currently only gl_x11 check it.

2. Change dyn.target GL_TEXTURE_EXTERNAL_OES to GL_TEXTURE_2D
: if this target is GL_TEXTURE_EXTERNAL_OES, TM1 only show black screen.
  i think  some driver can't use GL_TEXTURE_EXTERNAL_OES.
  upstream efl only use GL_TEXTURE_2D.

3. fixed crash in ector.
: fixed some crash when ector use dynamic hint.

Change-Id: If7f4b43d0e1634fb5ebdb9ca906c96b178ca283d

diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index c2d3d8d14677e2f6ba727ee25b1952def5417ec7..7a03857271ba4830271bbfd0df4b480c90c16a08 100755 (executable)
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -771,10 +771,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
 
    _print_tex_count();
 
-   if (gc->shared->info.sec_tbm_surface)
-     pt->dyn.target = GL_TEXTURE_EXTERNAL_OES;
-   else
-     pt->dyn.target = GL_TEXTURE_2D;
+   pt->dyn.target = GL_TEXTURE_2D;
 
    glGenTextures(1, &(pt->texture));
    glBindTexture(pt->dyn.target, pt->texture);

diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index b240e26497f4fbe2add6740405da9ca8dd56f6fe..d7a845cf6d1bbad47784ec38f64384baff92dc45 100644 (file)
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2503,9 +2503,10 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
 {
    int w, h, stride;
    Evas_GL_Image *glim = surface;
-   RGBA_Image *dst = glim->im;
+   DATA32 *pixels;
+   int load_err;
 
-   void *pixels = evas_cache_image_pixels(&dst->cache_entry);
+   glim = eng_image_data_get(data, glim, EINA_TRUE, &pixels, &load_err,NULL);
    eng_image_stride_get(data, glim, &stride);
    eng_image_size_get(data, glim, &w, &h);
    memset(pixels, 0, stride * h);

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 943189a0ee2dd6d712abe97794b1a3df0a18f99f..62502a5dd46e85a227fb715449365621b60c90fa 100755 (executable)
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -252,6 +252,10 @@ gl_extn_veto(Render_Engine *re)
           {
              glsym_eglSwapBuffersWithDamage = NULL;
           }
+        if (strstr(str, "EGL_TIZEN_image_native_surface"))
+          {
+             eng_get_ob(re)->gl_context->shared->info.egl_tbm_ext = 1;
+          }
      }
    else
      {