[Model] REDWOOD/Baltic

    [BinType] AP
    [Customer] Internal
    [Issue#] PLM130320-2454, p130315-7386, p130315-0802, p130308-6088, p130308-5634, p130308-0583, p130037-5279, p13037-5279
    [Problem] On DDK R3P2, glPixelStorei should be changned for OPENGLES
    [Cause] glPixelStorei issue.
    [Solution] fixed bug
    [Team] Graphics/EFL
    [Request] N/A
    [Horizontal Expansion] N/A

Change-Id: I5bbf3328afe094b932ccc09d36a94cd537297b7b

diff --git a/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/engines/gl_common/evas_gl_common.h
index 70b598d..6bb2f2d 100644 (file)
--- a/src/modules/engines/gl_common/evas_gl_common.h
+++ b/src/modules/engines/gl_common/evas_gl_common.h
@@ -42,6 +42,9 @@
 #ifndef GL_BGRA
 # define GL_BGRA 0x80E1
 #endif
+#ifndef GL_UNPACK_ROW_LENGTH_EXT
+# define GL_UNPACK_ROW_LENGTH_EXT 0x0cf2
+#endif
 
 #ifndef EGL_NO_CONTEXT
 # define EGL_NO_CONTEXT 0
@@ -207,6 +210,7 @@ struct _Evas_GL_Shared
       Eina_Bool tex_rect : 1;
       Eina_Bool sec_image_map : 1;
       Eina_Bool bin_program : 1;
+      Eina_Bool unpack_row_length : 1;
       // tuning params - per gpu/cpu combo?
 #define MAX_CUTOUT             512
 #define DEF_CUTOUT                  512

diff --git a/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/engines/gl_common/evas_gl_context.c
index 31027e7..0065850 100644 (file)
--- a/src/modules/engines/gl_common/evas_gl_context.c
+++ b/src/modules/engines/gl_common/evas_gl_context.c
@@ -552,6 +552,14 @@ evas_gl_common_context_new(void)
              if ((strstr((char *)ext, "GL_ARB_get_program_binary")) ||
                  (strstr((char *)ext, "GL_OES_get_program_binary")))
                shared->info.bin_program = 1;
+#ifdef GL_UNPACK_ROW_LENGTH
+             shared->info.unpack_row_length = 1;
+# ifdef GL_GLES
+             if (!strstr((char *)ext, "_unpack_subimage"))
+               shared->info.unpack_row_length = 0;
+# endif
+#endif
+
 #ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
              if ((strstr((char *)ext, "GL_EXT_texture_filter_anisotropic")))
                 glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,

diff --git a/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/engines/gl_common/evas_gl_texture.c
index 8b892d6..ae5ee73 100644 (file)
--- a/src/modules/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/engines/gl_common/evas_gl_texture.c
@@ -858,10 +858,11 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
    fmt = tex->pt->format;
    glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
    GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#endif
+   if (tex->gc->shared->info.unpack_row_length)
+     {
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+     }
    glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
    GLERR(__FUNCTION__, __FILE__, __LINE__, "");
 
@@ -894,24 +895,26 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
                1, 1,
                fmt, tex->pt->dataformat,
                im->image.data + ((im->cache_entry.h - 1) * im->cache_entry.w) + (im->cache_entry.w - 1));
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, im->cache_entry.w);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   // |xxx
-   // |xxx
-   //
-   _tex_sub_2d(tex->x - 1, tex->y,
-               1, im->cache_entry.h,
-               fmt, tex->pt->dataformat,
-               im->image.data);
-   //  xxx|
-   //  xxx|
-   //
-   _tex_sub_2d(tex->x + im->cache_entry.w, tex->y,
-               1, im->cache_entry.h,
-               fmt, tex->pt->dataformat,
-               im->image.data + (im->cache_entry.w - 1));
-#else
+   if (tex->gc->shared->info.unpack_row_length)
+     {
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, im->cache_entry.w);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        // |xxx
+        // |xxx
+        //
+        _tex_sub_2d(tex->x - 1, tex->y,
+                    1, im->cache_entry.h,
+                    fmt, tex->pt->dataformat,
+                    im->image.data);
+        //  xxx|
+        //  xxx|
+        //
+        _tex_sub_2d(tex->x + im->cache_entry.w, tex->y,
+                    1, im->cache_entry.h,
+                    fmt, tex->pt->dataformat,
+                    im->image.data + (im->cache_entry.w - 1));
+     }
+   else
      {
         DATA32 *tpix, *ps, *pd;
         int i;
@@ -948,7 +951,6 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
                     fmt, tex->pt->dataformat,
                     tpix);
      }
-#endif
    if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
      {
         glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
@@ -1043,10 +1045,11 @@ evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels,
    if (!tex->pt) return;
    glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
    GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#endif
+   if (tex->gc->shared->info.unpack_row_length)
+     {
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+     }
    glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
    GLERR(__FUNCTION__, __FILE__, __LINE__, "");
    _tex_sub_2d(tex->x, tex->y, w, h, tex->pt->format, tex->pt->dataformat,
@@ -1119,65 +1122,68 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
 {
    if (!tex->pt) return;
    // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + (h / 2) + 1] - rows[h + (h / 2)]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
-#else
-   unsigned int y;
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   if ((rows[1] - rows[0]) == (int)w)
-     _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   else
+   if (tex->gc->shared->info.unpack_row_length)
      {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
+        _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
+        glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
+        _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
+        glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + (h / 2) + 1] - rows[h + (h / 2)]);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
+        _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
      }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
-   if ((rows[h + 1] - rows[h]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
    else
      {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptu->format, tex->ptu->dataformat, rows[h + y]);
-     }
+        unsigned int y;
 
-   glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
-   if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
-   else
-     {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2) + y]);
+         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
+        if ((rows[1] - rows[0]) == (int)w)
+          _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
+        else
+          {
+             for (y = 0; y < h; y++)
+               _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
+          }
+
+        glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
+        if ((rows[h + 1] - rows[h]) == (int)(w / 2))
+          _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
+        else
+          {
+             for (y = 0; y < (h / 2); y++)
+               _tex_sub_2d(0, y, w / 2, 1, tex->ptu->format, tex->ptu->dataformat, rows[h + y]);
+          }
+
+        glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
+        if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (int)(w / 2))
+          _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
+        else
+          {
+             for (y = 0; y < (h / 2); y++)
+               _tex_sub_2d(0, y, w / 2, 1, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2) + y]);
+          }
      }
-#endif
    if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
      {
         glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
@@ -1374,48 +1380,51 @@ evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
    tex->ptuv = tex->double_buffer.ptuv[tex->double_buffer.source];
 
    // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
-#else
-   unsigned int y;
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   if ((rows[1] - rows[0]) == (int)w)
-     _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   else
+   if (tex->gc->shared->info.unpack_row_length)
      {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
+        _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
+        glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
+        _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
      }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
-   if ((rows[h + 1] - rows[h]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
    else
      {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptuv->format, tex->ptuv->dataformat, rows[h + y]);
+        unsigned int y;
+
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
+        if ((rows[1] - rows[0]) == (int)w)
+          _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
+        else
+          {
+             for (y = 0; y < h; y++)
+               _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
+          }
+
+        glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
+        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+        _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
+        if ((rows[h + 1] - rows[h]) == (int)(w / 2))
+          _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
+        else
+          {
+             for (y = 0; y < (h / 2); y++)
+               _tex_sub_2d(0, y, w / 2, 1, tex->ptuv->format, tex->ptuv->dataformat, rows[h + y]);
+          }
      }
-#endif
    if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
      {
         glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);