evas_gl : wayland_egl :

 1. do not call ecore_wl2_window_buffer_attach and ecore_wl2_window_commit at eng_outbuf_flush

 2. add missed patch

Change-Id: I6245f174d8917bc75a403e92da573aa539a7737f

diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index aac39d2..691b8fb 100755 (executable)
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -788,9 +788,9 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc, int pipe)
    if (foc == 0)
      {
         if ((rot == 0) || (rot == 180))
-           glViewport(offx, offy, w, h);
+           GL_TH(glViewport, offx, offy, w, h);
         else
-           glViewport(offx, offy, h, w);
+           GL_TH(glViewport, offx, offy, h, w);
         // std matrix
         if (m == 1)
            matrix_ortho(gc->shared->proj,

diff --git a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
index 3b6036b..3b63f1c 100755 (executable)
--- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
+++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
@@ -44,6 +44,10 @@ struct _Evas_Engine_Info_Wayland
    //TIZEN_ONLY(20171115): support output transform
    int window_rotation;
    //
+   /* window surface should be made with these config */
+   int           depth_bits;
+   int           stencil_bits;
+   int           msaa_bits;
 };
 
 #endif

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index bd723a2..5e1b138 100755 (executable)
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -751,8 +751,8 @@ eng_output_update(void *engine EINA_UNUSED, void *data, void *info, unsigned int
    wls = ecore_wl2_window_surface_get(inf->info.wl2_win);
    if (!wls && (ob->egl_surface != EGL_NO_SURFACE))
      {
-        eglDestroySurface(ob->egl_disp, ob->egl_surface);
-        eglMakeCurrent(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE,
+       eglDestroySurface(ob->egl_disp, ob->egl_surface);
+       GL_TH(eglMakeCurrent, ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE,
                        EGL_NO_CONTEXT);
         ob->egl_surface = EGL_NO_SURFACE;
         ob->wl2_win = NULL;

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
old mode 100644 (file)
new mode 100755 (executable)
index 89c39fb..f5aedbb
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -81,6 +81,16 @@ struct _Outbuf
 
    Eina_Bool lost_back : 1;
    Eina_Bool surf : 1;
+
+   struct {
+      unsigned char depth_buffer_size;
+      unsigned char stencil_buffer_size;
+      unsigned char msaa;
+   } detected;
+
+   int depth_bits;
+   int stencil_bits;
+   int msaa_bits;
 };
 
 struct _Context_3D

diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index 9ffaa25..659a69c 100755 (executable)
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -89,9 +89,12 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
    Eina_Bool blacklist = EINA_FALSE;
    struct wl_display *wl_disp;
 
-// TIZEN_ONLY(20171123) : bug fixed : using wl_surface
+//TIZEN_ONLY(20171123) : bug fixed : using wl_surface
    struct wl_surface *wl_surface;
 //
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+   int val = 0;
+//
    /* try to allocate space for our window */
    if (!(gw = calloc(1, sizeof(Outbuf))))
      return NULL;
@@ -110,6 +113,11 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
    gw->alpha = einfo->info.destination_alpha;
    gw->rot = einfo->info.rotation;
 
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+   gw->depth_bits = einfo->depth_bits;
+   gw->stencil_bits = einfo->stencil_bits;
+   gw->msaa_bits = einfo->msaa_bits;
+//
    context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
    context_attrs[1] = 2;
    context_attrs[2] = EGL_NONE;
@@ -128,13 +136,26 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
    config_attrs[n++] = 1;
    /* FIXME: end n900 breakage */
 # endif
-   config_attrs[n++] = EGL_ALPHA_SIZE;
-   config_attrs[n++] = gw->alpha;
-   config_attrs[n++] = EGL_DEPTH_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_STENCIL_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_NONE;
+  config_attrs[n++] = EGL_ALPHA_SIZE;
+  config_attrs[n++] = gw->alpha;
+  config_attrs[n++] = EGL_DEPTH_SIZE;
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+//  config_attrs[n++] = 0;
+  config_attrs[n++] = gw->depth_bits;
+//
+  config_attrs[n++] = EGL_STENCIL_SIZE;
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+//  config_attrs[n++] = 0;
+   config_attrs[n++] = gw->stencil_bits;
+   if (gw->msaa_bits > 0)
+     {
+        config_attrs[n++] = EGL_SAMPLE_BUFFERS;
+        config_attrs[n++] = 1;
+        config_attrs[n++] = EGL_SAMPLES;
+        config_attrs[n++] = gw->msaa_bits;
+     }
+//
+  config_attrs[n++] = EGL_NONE;
 
    /* FIXME: Remove this line as soon as eglGetDisplay() autodetection
     * gets fixed. Currently it is incorrectly detecting wl_display and
@@ -202,7 +223,7 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
       eng_window_free(gw);
       return NULL;
     }
- // TIZEN_ONLY(20171123)
+// TIZEN_ONLY(20171123)
 
    context = _tls_context_get();
    gw->egl_context =
@@ -258,23 +279,42 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
         return NULL;
      }
 
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+   eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_DEPTH_SIZE, &val);
+   gw->detected.depth_buffer_size = val;
+   DBG("Detected depth size %d", val);
+   eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_STENCIL_SIZE, &val);
+   gw->detected.stencil_buffer_size = val;
+   DBG("Detected stencil size %d", val);
+   eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_SAMPLES, &val);
+   gw->detected.msaa = val;
+   DBG("Detected msaa %d", val);
+//
+
    if (!gw->gl_context)
      {
         eng_gl_symbols(gw->egl_disp);
 
-        if (!(gw->gl_context = glsym_evas_gl_common_context_new()))
-          {
-             eng_window_free(gw);
-             return NULL;
-          }
-        gw->gl_context->egldisp = gw->egl_disp;
-        gw->gl_context->eglctxt = gw->egl_context;
-        eng_window_use(gw);
-     }
-//* TIZEN_ONLY(20171123) : temporary patch */
-//   if (w && h)
-//     eng_window_resurf(gw);
-   return gw;
+       if (!(gw->gl_context = glsym_evas_gl_common_context_new()))
+         {
+            eng_window_free(gw);
+            return NULL;
+         }
+       gw->gl_context->egldisp = gw->egl_disp;
+       gw->gl_context->eglctxt = gw->egl_context;
+       eng_window_use(gw);
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+       glsym_evas_gl_common_context_resize(gw->gl_context, gw->w, gw->h, gw->rot);
+//
+    }
+
+/* TIZEN_ONLY(20171123) : temporary patch */
+//  if (w && h)
+//    eng_window_resurf(gw);
+//TIZEN_ONLY(20171127): do not call ecore_wl2_window_buffer_attach
+  gw->surf = EINA_TRUE;
+//
+  return gw;
 }
 
 void 
@@ -653,8 +693,10 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_
    glsym_evas_gl_common_context_done(ob->gl_context);
    eglSwapInterval(ob->egl_disp, 0);
 
-   ecore_wl2_window_buffer_attach(ob->wl2_win, NULL, 0, 0, EINA_TRUE);
-   ecore_wl2_window_commit(ob->wl2_win, EINA_FALSE);
+// TIZEN_ONLY(20171127) : wayland_egl bug fixed
+//   ecore_wl2_window_buffer_attach(ob->wl2_win, NULL, 0, 0, EINA_TRUE);
+//   ecore_wl2_window_commit(ob->wl2_win, EINA_FALSE);
+//
 
    if ((glsym_eglSwapBuffersWithDamage) && (surface_damage) &&
        (ob->swap_mode != MODE_FULL))
@@ -683,7 +725,10 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_
 
  end:
    glsym_evas_gl_preload_render_unlock(eng_preload_make_current, ob);
-   ecore_wl2_display_flush(ob->wl2_disp);
+
+// TIZEN_ONLY(20171127) : wayland_egl bug fixed
+//   ecore_wl2_display_flush(ob->wl2_disp);
+//
 }
 
 Evas_Engine_GL_Context *