evas: use Evas_GL_image for generate texture unit for Evas_3D_Texture.

Summary:
Used engine function for load image/data and use texture unit through
Evas_GL_Image object
Used Evas_ColorSpace format instead Evas_3D_Color/Pixel format
Added transformation matrix for adjusting texture unit coordinates in shader
Added property in Evas_3D_Texture for mark possibility get texture without atlas
(see https://phab.enlightenment.org/conpherence/54/, I suppose it will done
after this patch)

Reviewers: Hermet, cedric

Reviewed By: cedric

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2371

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

5 files changed, 127 insertions, 67 deletions

diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 1e1fb5945b..296444268f 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -698,44 +698,6 @@ typedef enum _Evas_3D_Comparison
 } Evas_3D_Comparison;
 
 /**
- * Color formats of pixel data
- *
- * @since 1.10
- * @ingroup Evas_3D_Types
- */
-typedef enum _Evas_3D_Color_Format
-{
-   /**< Color contains full components, red, green, blue and alpha */
-   EVAS_3D_COLOR_FORMAT_RGBA = 0,
-   /**< Color contains only red, green and blue components */
-   EVAS_3D_COLOR_FORMAT_RGB,
-   /**< Color contains only alpha component */
-   EVAS_3D_COLOR_FORMAT_ALPHA
-} Evas_3D_Color_Format;
-
-/**
- * Pixel formats
- *
- * @since 1.10
- * @ingroup Evas_3D_Types
- */
-typedef enum _Evas_3D_Pixel_Format
-{
-   /**< 8-bit pixel with single component */
-   EVAS_3D_PIXEL_FORMAT_8 = 0,
-   /**< 16-bit pixel with three components (5-6-5 bit) */
-   EVAS_3D_PIXEL_FORMAT_565,
-   /**< 24-bit pixel with three 8-bit components */
-   EVAS_3D_PIXEL_FORMAT_888,
-   /**< 32-bit pixel with four 8-bit components */
-   EVAS_3D_PIXEL_FORMAT_8888,
-   /**< 16-bit pixel with four 4-bit components */
-   EVAS_3D_PIXEL_FORMAT_4444,
-   /**< 16-bit pixel with four components (5-5-5-1 bit) */
-   EVAS_3D_PIXEL_FORMAT_5551
-} Evas_3D_Pixel_Format;
-
-/**
  * Wrap modes
  *
  * @since 1.10
diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c
index 314450cddf..8b68d818d6 100644
--- a/src/lib/evas/canvas/evas_3d_texture.c
+++ b/src/lib/evas/canvas/evas_3d_texture.c
@@ -234,7 +234,7 @@ _evas_3d_texture_evas_3d_object_update_notify(Eo *obj, Evas_3D_Texture_Data *pd)
              if (e->engine.func->texture_new)
                {
                   pd->engine_data =
-                     e->engine.func->texture_new(e->engine.data.output);
+                     e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
                }
 
              if (pd->engine_data == NULL)
@@ -308,7 +308,6 @@ evas_3d_texture_material_del(Evas_3D_Texture *texture, Evas_3D_Material *materia
      eina_hash_set(pd->materials, &material, (const void *)(uintptr_t)(count - 1));
 }
 
-
 EAPI Evas_3D_Texture *
 evas_3d_texture_add(Evas *e)
 {
@@ -324,6 +323,8 @@ EOLIAN static void
 _evas_3d_texture_eo_base_constructor(Eo *obj, Evas_3D_Texture_Data *pd EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, eo_constructor());
+   pd->atlas_enable = EINA_TRUE;
+
    eo_do(obj, evas_3d_object_type_set(EVAS_3D_OBJECT_TYPE_TEXTURE));
 }
 
@@ -335,37 +336,68 @@ _evas_3d_texture_eo_base_destructor(Eo *obj, Evas_3D_Texture_Data *pd  EINA_UNUS
 }
 
 EOLIAN static void
-_evas_3d_texture_data_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_3D_Color_Format color_format,
-                             Evas_3D_Pixel_Format pixel_format, int w, int h, const void *data)
+_evas_3d_texture_data_set(Eo *obj, Evas_3D_Texture_Data *pd,
+                          Evas_Colorspace color_format,
+                          int w, int h, const void *data)
 {
    Eo *evas = NULL;
+   void *image = NULL;
    eo_do(obj, evas = evas_common_evas_get());
    Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
-     pd->engine_data = e->engine.func->texture_new(e->engine.data.output);
+     pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
+   if (!data)
+     {
+        ERR("Failure, image data is empty");
+        return;
+     }
 
-   if (e->engine.func->texture_data_set)
-     e->engine.func->texture_data_set(e->engine.data.output, pd->engine_data,
-                                      color_format, pixel_format, w, h, data);
+   image = e->engine.func->image_new_from_data(e->engine.data.output, w, h, (DATA32 *)data, EINA_TRUE, color_format);
+   if (!image)
+     {
+        ERR("Can't load image from data");
+        return;
+     }
 
+   if (e->engine.func->texture_image_set)
+     e->engine.func->texture_image_set(e->engine.data.output,
+                                       pd->engine_data,
+                                       image);
+   e->engine.func->image_free(e->engine.data.output, image);
    eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_TEXTURE_DATA, NULL));
 }
 
 EOLIAN static void
 _evas_3d_texture_file_set(Eo *obj, Evas_3D_Texture_Data *pd, const char *file, const char *key)
 {
+
+   Evas_Image_Load_Opts lo;
+   int load_error;
    Eo *evas = NULL;
+   void *image;
+
    eo_do(obj, evas = evas_common_evas_get());
    Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
-     pd->engine_data = e->engine.func->texture_new(e->engine.data.output);
+     pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
+
+   memset(&lo, 0x0, sizeof(Evas_Image_Load_Opts));
+   image = e->engine.func->image_load(e->engine.data.output,
+                                      file, key, &load_error, &lo);
+   if (!image)
+     {
+        ERR("Can't load image from file");
+        return;
+     }
 
-   if (e->engine.func->texture_file_set)
-     e->engine.func->texture_file_set(e->engine.data.output, pd->engine_data,
-                                      file, key);
+   if (e->engine.func->texture_image_set)
+     e->engine.func->texture_image_set(e->engine.data.output,
+                                       pd->engine_data,
+                                       image);
 
+   e->engine.func->image_free(e->engine.data.output, image);
    eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_TEXTURE_DATA, NULL));
 }
 
@@ -374,6 +406,7 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou
 {
    Eo *evas = NULL;
    eo_do(obj, evas = evas_common_evas_get());
+   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
    Evas_Object_Protected_Data *src;
 
    if (source == pd->source)
@@ -403,6 +436,8 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou
         ERR("No evas surface associated with the source object.");
         return;
      }
+   if (!pd->engine_data && e->engine.func->texture_new)
+     pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
 
    _texture_proxy_set(obj, source, src);
    eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_TEXTURE_DATA, NULL));
@@ -442,19 +477,21 @@ _evas_3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *p
    return !src_obj->proxy->src_invisible;
 }
 
-EOLIAN static Evas_3D_Color_Format
+EOLIAN static Evas_Colorspace
 _evas_3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd)
 {
-   // FIXME: we need an unknown color format and unify that with Evas color space to
-   Evas_3D_Color_Format format = -1;
+   Evas_Colorspace format = -1;
    Eo *evas = NULL;
    eo_do(obj, evas = evas_common_evas_get());
    Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
-   if (e->engine.func->texture_color_format_get)
+   if (e->engine.func->image_colorspace_get &&
+       e->engine.func->texture_image_get)
      {
-        e->engine.func->texture_color_format_get(e->engine.data.output,
-                                                 pd->engine_data, &format);
+        void *image;
+
+        image = e->engine.func->texture_image_get(e->engine.data.output, pd->engine_data);
+        format = e->engine.func->image_colorspace_get(e->engine.data.output, image);
      }
 
    return format;
@@ -527,4 +564,15 @@ _evas_3d_texture_filter_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_
      }
 }
 
+EOLIAN static void
+_evas_3d_texture_atlas_enable_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Eina_Bool use_atlas)
+{
+   if (pd->atlas_enable != use_atlas) pd->atlas_enable = use_atlas;
+}
+
+EOLIAN static Eina_Bool
+_evas_3d_texture_atlas_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd)
+{
+   return pd->atlas_enable;
+}
 #include "canvas/evas_3d_texture.eo.c"
diff --git a/src/lib/evas/canvas/evas_3d_texture.eo b/src/lib/evas/canvas/evas_3d_texture.eo
index 83ab29a9d6..39efb61e23 100644
--- a/src/lib/evas/canvas/evas_3d_texture.eo
+++ b/src/lib/evas/canvas/evas_3d_texture.eo
@@ -31,6 +31,29 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
             bool visible; /*@ @c EINA_TRUE for visible, @c EINA_FALSE for invisible.*/
          }
       }
+      atlas_enable {
+         set {
+            /*
+              Set enable flag to generation texture unit with support atlas.
+
+              Use this flag only in case not normalize texture coordinates.
+
+              By default, is enabled.
+
+              @ingroup Evas_3D_Texture
+             */
+         }
+         get {
+            /*
+              Get enable flag of generation texture unit with support atlas.
+
+              @ingroup Evas_3D_Texture
+             */
+         }
+         values {
+            bool use_atlas; /*@ @c EINA_TRUE for enable, @c EINA_FALSE for disable.*/
+         }
+      }
    }
    methods {
       data_set {
@@ -43,8 +66,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
           */
 
          params {
-            @in Evas_3D_Color_Format color_format; /*@ Color format of the texture. */
-            @in Evas_3D_Pixel_Format pixel_format; /*@ Pixel format of the data. */
+            @in Evas_Colorspace color_format; /*@ Color format of the texture. */
             @in int w; /*@ Width of the data. */
             @in int h; /*@ Height of the data. */
             @in const(void)* data; /*@ Pointer to the data. */
@@ -55,8 +77,6 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
          /*
            Set the data of the given texture from file.
 
-           Only PNG format is supported.
-
            @ingroup Evas_3D_Texture
           */
 
@@ -96,7 +116,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
 
            @ingroup Evas_3D_Texture
           */
-         return: Evas_3D_Color_Format;
+         return: Evas_Colorspace;
       }
 
       size_get @const {
diff --git a/src/lib/evas/include/evas_3d_utils.h b/src/lib/evas/include/evas_3d_utils.h
index d11533ff6e..87bf70867d 100644
--- a/src/lib/evas/include/evas_3d_utils.h
+++ b/src/lib/evas/include/evas_3d_utils.h
@@ -1150,6 +1150,36 @@ evas_mat3_invserse(Evas_Mat3 *out, const Evas_Mat3 *mat)
      }
 }
 
+static inline void
+evas_mat3_set_position_transform(Evas_Mat3 *out, const Evas_Real p_x, const Evas_Real p_y)
+{
+   Evas_Real        *d = &out->m[0];
+   memset(d, 0x00, sizeof(Evas_Mat3));
+   d[0] = 1;
+   d[2] = p_x;
+   d[4] = 1;
+   d[5] = p_y;
+   d[8] = 1;
+   if (p_x || p_y)
+     out->flags = 0;
+   else
+     out->flags = EVAS_MATRIX_IS_IDENTITY;
+}
+
+static inline void
+evas_mat3_set_scale_transform(Evas_Mat3 *out, Evas_Real s_x, Evas_Real s_y)
+{
+   Evas_Real        *d = &out->m[0];
+   memset(d, 0x00, sizeof(Evas_Mat3));
+   d[0] = s_x;
+   d[4] = s_y;
+   d[8] = 1;
+   if (s_x != 1.0 || s_y != 1.0)
+     out->flags = 0;
+   else
+     out->flags = EVAS_MATRIX_IS_IDENTITY;
+}
+
 /* 2x2 matrix */
 static inline void
 evas_mat2_identity_set(Evas_Mat2 *m)
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index af2592bc1a..427a71de0d 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -369,9 +369,11 @@ struct _Evas_3D_Texture
    Evas_Object      *source;
    Eina_Bool         proxy_rendering;
    void             *proxy_surface;
-
    /* Engine-side object. */
    void             *engine_data;
+
+   /*Use atlases, @EINA_TRUE by default*/
+   Eina_Bool        atlas_enable :1;
 };
 
 struct _Evas_3D_Material
@@ -389,7 +391,7 @@ struct _Evas_3D_Material
 
 struct _Evas_3D_Scene_Public_Data
 {
-   Evas_Color        bg_color;
+   Evas_Color       bg_color;
    Evas_3D_Node     *camera_node;
    Eina_List        *light_nodes;
    Eina_List        *mesh_nodes;
@@ -1360,17 +1362,15 @@ struct _Evas_Func
    int (*drawable_texture_color_pick_id_get) (void *drawable);
    double (*drawable_texture_pixel_color_get) (unsigned int tex EINA_UNUSED, int x, int y, void *drawable);
 
-   void *(*texture_new)                  (void *data);
+   void *(*texture_new)                  (void *data, Eina_Bool use_atlas);
    void  (*texture_free)                 (void *data, void *texture);
-   void  (*texture_data_set)             (void *data, void *texture, Evas_3D_Color_Format format, Evas_3D_Pixel_Format pixel_format, int w, int h, const void *pixels);
-   void  (*texture_file_set)             (void *data, void *texture, const char *file, const char *key);
-   void  (*texture_color_format_get)     (void *data, void *texture, Evas_3D_Color_Format *format);
    void  (*texture_size_get)             (void *data, void *texture, int *w, int *h);
    void  (*texture_wrap_set)             (void *data, void *texture, Evas_3D_Wrap_Mode s, Evas_3D_Wrap_Mode t);
    void  (*texture_wrap_get)             (void *data, void *texture, Evas_3D_Wrap_Mode *s, Evas_3D_Wrap_Mode *t);
    void  (*texture_filter_set)           (void *data, void *texture, Evas_3D_Texture_Filter min, Evas_3D_Texture_Filter mag);
    void  (*texture_filter_get)           (void *data, void *texture, Evas_3D_Texture_Filter *min, Evas_3D_Texture_Filter *mag);
    void  (*texture_image_set)            (void *data, void *texture, void *image);
+   void *(*texture_image_get)            (void *data, void *texture);
 
    Ector_Surface *(*ector_get)           (void *data);
    void  (*ector_begin)                  (void *data, void *context, void *surface, int x, int y, Eina_Bool do_async);