[EGIT] [core/efl] master 01/03: EDC Doc: Some fixes
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=12f9fea2a4d4d641a09fd6563a83b925d62e4868 commit 12f9fea2a4d4d641a09fd6563a83b925d62e4868 Author: Jean-Philippe Andre Date: Fri Oct 2 18:14:25 2015 +0900 EDC Doc: Some fixes We need to move this doc to the wiki and complete it :) --- src/bin/edje/edje_cc_handlers.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 156a15b..e75f0cd 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -126,7 +126,16 @@ *@ref sec_collections_group_programs "Programs" * * @ref sec_collections_group_script "Script" - * @ref sec_collections_group_program_sequence "Sequence" + * @ref sec_collections_group_programs_program "Program" + * + *@ref sec_collections_group_script "Script" + *@ref sec_collections_group_program_sequence "Sequence" + * + * @ref sec_collections_group_script "Script" + * + * + * @ref sec_collections_group_script "Script" + * @ref sec_toplevel_fonts "Fonts" * *@ref sec_collections_group_physics "Physics" * --
[EGIT] [core/efl] master 03/03: Evas textblock: Force relayout during proxy render
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b031bbee9bf0b66bbe125abfaf066cd90042879a
commit b031bbee9bf0b66bbe125abfaf066cd90042879a
Author: Jean-Philippe Andre
Date: Tue Oct 6 20:18:32 2015 +0900
Evas textblock: Force relayout during proxy render
If the textblock object was not visible in the main canvas, but
still needs to be rendered in a proxy surface, then _relayout may
not have been called. This forces generation of paragraphs based on
the current geometry.
This patch is ugly. I know. This is evas render :)
---
src/lib/evas/canvas/evas_object_textblock.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index ce419c2..ca37af4 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -11566,6 +11566,17 @@ evas_object_textblock_render(Evas_Object *eo_obj
EINA_UNUSED,
{0, 1, 2, 1, 0}
};
+ /* [FIXME!!!] rare case when relayout was not called: cache.clip made
+* the object not visible (eg. clipped out), but it is actually visible
+* in this context (eg. inside a proxy) - UGLY DIRTY FIX */
+ if (obj->layer->evas->is_frozen &&
+ (o->changed || o->content_changed || o->format_changed ||
o->obstacle_changed))
+ _relayout_if_needed(eo_obj, o);
+
+ /* If there are no paragraphs and thus there are no lines,
+* there's nothing left to do. */
+ if (!o->paragraphs) return;
+
/* render object to surface with context, and offxet by x,y */
ENFN->context_multiplier_unset(output, context);
ENFN->context_multiplier_set(output, context, 0, 0, 0, 0);
@@ -11577,9 +11588,6 @@ evas_object_textblock_render(Evas_Object *eo_obj
EINA_UNUSED,
obj->cur->geometry.w,
obj->cur->geometry.h);
clip = ENFN->context_clip_get(output, context, &cx, &cy, &cw, &ch);
- /* If there are no paragraphs and thus there are no lines,
-* there's nothing left to do. */
- if (!o->paragraphs) return;
ENFN->context_color_set(output, context, 0, 0, 0, 0);
ca = cr = cg = cb = 0;
--
[EGIT] [core/efl] master 02/03: Evas render: Fix another bad proxy clipping issue
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2b47181f4edaade0d774893d67e9707c6a8141ee
commit 2b47181f4edaade0d774893d67e9707c6a8141ee
Author: Jean-Philippe Andre
Date: Tue Oct 6 17:36:29 2015 +0900
Evas render: Fix another bad proxy clipping issue
This is an ugly hack to fix an issue reported in D3114. I don't
understand how the proposed patch could even fix anything given
the current situation.
Test case:
- Create edje object with textblock inside
- Clip out edje object (--> all children become not visible)
- Take textblock from edje and set it as source of a proxy
- Mark proxy as source_clip
Result: Nothing visible.
Expected: Proxy should contain the textblock object, since
source_clip means we ignore the edje object's clipper, and
only care about the textblock's clipper (entire canvas).
Here's what was happening:
- During a first pass, textblock is not visible, cur->cache.clip
is calculated, marked as clip_use=1 with geom 0,0 0x0
- In a second pass, the proxy is rendered, which needs to draw
the textblock in a surface. But cache.clip was used and it was
wrong.
Solution:
- Ignore cache.clip when rendering inside a proxy. I'm pretty
sure there are other instances where cache.clip will still
be a problem.
Problem: textblock never called relayout since it was not
visible.
Conclusion: cache.clip needs to die. It's a legacy optimization
that now causes more issues than it fixes.
---
src/lib/evas/canvas/evas_render.c | 37 +
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index 3fe93a0..a47e550 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1234,7 +1234,7 @@ _evas_render_mapped_context_clip_set(Evas_Public_Data
*evas, Evas_Object *eo_obj
if (proxy_render_data) proxy_src_clip = proxy_render_data->source_clip;
- if (proxy_src_clip)
+ if (proxy_src_clip && !evas->is_frozen)
{
x = obj->cur->cache.clip.x;
y = obj->cur->cache.clip.y;
@@ -1249,6 +1249,10 @@ _evas_render_mapped_context_clip_set(Evas_Public_Data
*evas, Evas_Object *eo_obj
ENFN->context_clip_set(ENDT, ctx, x + off_x, y + off_y, w, h);
}
+ else if (evas->is_frozen)
+ {
+/* can't trust cache.clip here - clip should be in ctx already */
+ }
else
{
//FIXME: Consider to clip by the proxy clipper.
@@ -1336,14 +1340,31 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object
*eo_obj,
}
else if (proxy_src_clip)
{
- if ((!evas_object_is_visible(eo_obj, obj)) || (obj->clip.clipees)
- || (obj->cur->have_clipees) || (obj->no_render))
+ if (!evas->is_frozen) /* same as "if (proxy_render_data)" */
{
- IFRD(obj->no_render, level, " proxy_src_clip +
no_render\n");
- IFRD(obj->clip.clipees || obj->cur->have_clipees, level, "
proxy_src_clip + has clippees\n");
- IFRD(!evas_object_is_visible(eo_obj, obj), level, " not
visible\n");
- RD(level, "}\n");
- return clean_them;
+ if ((!evas_object_is_visible(eo_obj, obj)) ||
(obj->clip.clipees)
+ || (obj->cur->have_clipees) || (obj->no_render))
+{
+ IFRD(obj->no_render, level, " no_render\n");
+ IFRD(obj->clip.clipees || obj->cur->have_clipees,
level, " has clippees\n");
+ IFRD(!evas_object_is_visible(eo_obj, obj), level, "
not visible\n");
+ RD(level, "}\n");
+ return clean_them;
+}
+ }
+ else
+ {
+ /* can not trust cache.clip - evas is frozen */
+ if (!obj->cur->visible || obj->clip.clipees ||
obj->no_render ||
+ (!obj->cur->color.a && (obj->cur->render_op ==
EVAS_RENDER_BLEND)))
+{
+ IFRD(obj->no_render, level, " proxy_src_clip +
no_render\n");
+ IFRD(obj->clip.clipees || obj->cur->have_clipees,
level, " proxy_src_clip + has clippees\n");
+ IFRD(!obj->cur->visible, level, " proxy_src_clip + not
visible\n");
+ IFRD(!obj->cur->color.a && (obj->cur->render_op ==
EVAS_RENDER_BLEND), level, " proxy_src_clip + 0 alpha\n");
+ RD(level, "}\n");
+ return clean_them;
+}
}
}
else if (!evas_object_is_proxy_visible(eo_obj, obj) ||
--
[EGIT] [core/efl] master 01/01: Evas filters: Fix crash with async sw rendering
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6e04d407cf1eb9506866f72f0d71c76ec2b80bc4
commit 6e04d407cf1eb9506866f72f0d71c76ec2b80bc4
Author: Jean-Philippe Andre
Date: Wed Oct 7 18:08:56 2015 +0900
Evas filters: Fix crash with async sw rendering
If the filtered object (text or image object) was deleted, its
output image (cached inside the filter data) would be freed
immediately. This could cause crashes in case of async rendering.
@fix
---
src/lib/evas/canvas/evas_filter_mixin.c | 8 +++-
src/lib/evas/include/evas_private.h | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c
b/src/lib/evas/canvas/evas_filter_mixin.c
index 934a8c6..154c6dc 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -254,6 +254,7 @@ evas_filter_object_render(Eo *eo_obj,
Evas_Object_Protected_Data *obj,
fcow = FCOW_BEGIN(pd);
fcow->output = filter_output;
fcow->changed = EINA_FALSE;
+fcow->async = do_async;
if (!ok) fcow->invalid = EINA_TRUE;
FCOW_END(fcow, pd);
@@ -518,7 +519,12 @@ _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
if (evas_object_filter_cow_default == pd->data) return;
if (pd->data->output)
- ENFN->image_free(ENDT, pd->data->output);
+ {
+if (!pd->data->async)
+ ENFN->image_free(ENDT, pd->data->output);
+else
+ evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
+ }
eina_hash_free(pd->data->sources);
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
{
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 8c57805..0aa28d1 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1206,6 +1206,7 @@ struct _Evas_Object_Filter_Data
} state;
Eina_Boolchanged : 1;
Eina_Boolinvalid : 1; // Code parse failed
+ Eina_Boolasync : 1;
};
struct _Evas_Object_Func
--
[EGIT] [core/efl] efl-1.15 01/01: Evas filters: Fix crash with async sw rendering
jpeg pushed a commit to branch efl-1.15.
http://git.enlightenment.org/core/efl.git/commit/?id=42beea0ca57594759bd526afd4db62906728b1e7
commit 42beea0ca57594759bd526afd4db62906728b1e7
Author: Jean-Philippe Andre
Date: Wed Oct 7 18:08:56 2015 +0900
Evas filters: Fix crash with async sw rendering
If the filtered object (text or image object) was deleted, its
output image (cached inside the filter data) would be freed
immediately. This could cause crashes in case of async rendering.
@fix
---
src/lib/evas/canvas/evas_filter_mixin.c | 8 +++-
src/lib/evas/include/evas_private.h | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c
b/src/lib/evas/canvas/evas_filter_mixin.c
index 934a8c6..154c6dc 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -254,6 +254,7 @@ evas_filter_object_render(Eo *eo_obj,
Evas_Object_Protected_Data *obj,
fcow = FCOW_BEGIN(pd);
fcow->output = filter_output;
fcow->changed = EINA_FALSE;
+fcow->async = do_async;
if (!ok) fcow->invalid = EINA_TRUE;
FCOW_END(fcow, pd);
@@ -518,7 +519,12 @@ _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
if (evas_object_filter_cow_default == pd->data) return;
if (pd->data->output)
- ENFN->image_free(ENDT, pd->data->output);
+ {
+if (!pd->data->async)
+ ENFN->image_free(ENDT, pd->data->output);
+else
+ evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
+ }
eina_hash_free(pd->data->sources);
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
{
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 01b4340..730eae3 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1194,6 +1194,7 @@ struct _Evas_Object_Filter_Data
} state;
Eina_Boolchanged : 1;
Eina_Boolinvalid : 1; // Code parse failed
+ Eina_Boolasync : 1;
};
struct _Evas_Object_Func
--
[EGIT] [core/efl] master 02/03: Evas render: Fix proxy source_clip with source images
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cfedba598c23844946c5af2e038870c7ca6befdc
commit cfedba598c23844946c5af2e038870c7ca6befdc
Author: Jean-Philippe Andre
Date: Tue Oct 13 22:13:48 2015 +0900
Evas render: Fix proxy source_clip with source images
In case the source is an Evas_Image, we skip proxy_subrender,
and so the clip was not set against the source clip.
---
src/lib/evas/canvas/evas_object_image.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index a16562b..0a525ba 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3291,7 +3291,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
int l, int t, int r, int b, Eina_Bool do_async)
{
Evas_Image_Data *o = obj->private_data, *oi = NULL;
- int imagew, imageh, uvw, uvh;
+ int imagew, imageh, uvw, uvh, cw, ch;
void *pixels;
Evas_Object_Protected_Data *source =
@@ -3349,6 +3349,15 @@ _evas_image_render(Eo *eo_obj,
Evas_Object_Protected_Data *obj,
imageh = oi->cur->image.h;
uvw = source->cur->geometry.w;
uvh = source->cur->geometry.h;
+/* check source_clip since we skip proxy_subrender here */
+if (o->proxy_src_clip)
+ {
+ ENFN->context_clip_clip(ENDT, context,
+ source->cur->cache.clip.x + x,
+ source->cur->cache.clip.y + y,
+ source->cur->cache.clip.w,
+ source->cur->cache.clip.h);
+ }
}
else
{
@@ -3363,6 +3372,9 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
o->proxyrendering = EINA_FALSE;
}
+ ENFN->context_clip_get(ENDT, context, NULL, NULL, &cw, &ch);
+ if (!cw || !ch) return;
+
if (pixels)
{
Evas_Coord idw, idh, idx, idy;
--
[EGIT] [core/efl] master 03/03: Evas: Some coverity fixes
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c22fa8a96ac7c28f93856a8577825b78be9b5270
commit c22fa8a96ac7c28f93856a8577825b78be9b5270
Author: Jean-Philippe Andre
Date: Wed Oct 14 11:19:48 2015 +0900
Evas: Some coverity fixes
This are false alarms. But the explicit null check doesn't hurt.
Also, Coverity doesn't like eo_do_ret. Neither do I. :)
- CID 1327246
- CID 1327245
---
src/lib/evas/canvas/evas_object_image.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 0a525ba..fdf31c7 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3318,7 +3318,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
uvw = imagew;
uvh = imageh;
}
- else if (!o->cur->source)
+ else if (!o->cur->source || !source)
{
pixels = evas_process_dirty_pixels(eo_obj, obj, o, output, surface,
o->engine_data);
/* pixels = o->engine_data; */
@@ -3340,8 +3340,8 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
pixels = oi->engine_data;
if (oi->has_filter)
{
- void *output_buffer = eo_do_ret(source->object, output_buffer,
- evas_filter_output_buffer_get());
+ void *output_buffer = NULL;
+ eo_do(source->object, output_buffer =
evas_filter_output_buffer_get());
if (output_buffer)
pixels = output_buffer;
}
--
[EGIT] [core/efl] master 01/03: Evas render: Fix proxy source_clip logic inversion
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b266b55188ebac499d70ffceb3b8c802bcdfbd0
commit 7b266b55188ebac499d70ffceb3b8c802bcdfbd0
Author: Jean-Philippe Andre
Date: Tue Oct 13 20:33:57 2015 +0900
Evas render: Fix proxy source_clip logic inversion
As spotted by @FurryMyad I inverted the logic for source_clip.
This should restore the proper behaviour while keeping my previous
fixes working. See D2940.
---
src/lib/evas/canvas/evas_render.c| 20 +---
.../evas/engines/software_generic/evas_engine.c | 8
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index fdd0645..f81300b 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1208,21 +1208,35 @@ _proxy_context_clip(Evas_Public_Data *evas, void *ctx,
Evas_Proxy_Render_Data *p
{
const Evas_Coord_Rectangle *clip;
Evas_Object_Protected_Data *clipper;
+ int cw, ch;
/* cache.clip can not be relied on, since the evas is frozen, but we need
* to set the clip. so we recurse from clipper to clipper until we reach
* the source object's clipper */
- if (!proxy_render_data || proxy_render_data->source_clip) return EINA_TRUE;
+ if (!proxy_render_data) return EINA_TRUE;
+ if (proxy_render_data->source_clip)
+ {
+/* trust cache.clip since we clip like the source */
+ENFN->context_clip_clip(ENDT, ctx,
+obj->cur->cache.clip.x + off_x,
+obj->cur->cache.clip.y + off_y,
+obj->cur->cache.clip.w,
obj->cur->cache.clip.h);
+ENFN->context_clip_get(ENDT, ctx, NULL, NULL, &cw, &ch);
+return (cw && ch);
+ }
+
if (!obj || !obj->cur->clipper) return EINA_TRUE;
clipper = obj->cur->clipper;
if (!clipper->cur->visible) return EINA_FALSE;
clip = &clipper->cur->geometry;
ENFN->context_clip_clip(ENDT, ctx, clip->x + off_x, clip->y + off_y,
clip->w, clip->h);
+ ENFN->context_clip_get(ENDT, ctx, NULL, NULL, &cw, &ch);
+ if (!cw || !ch) return EINA_FALSE;
/* stop if we found the source object's clipper */
- if (clipper == proxy_render_data->proxy_obj->cur->clipper) return EINA_TRUE;
+ if (clipper == proxy_render_data->src_obj->cur->clipper) return EINA_TRUE;
/* recurse to the clipper itself */
return _proxy_context_clip(evas, ctx, proxy_render_data, clipper, off_x,
off_y);
@@ -1236,7 +1250,7 @@ _evas_render_mapped_context_clip_set(Evas_Public_Data
*evas, Evas_Object *eo_obj
if (proxy_render_data) proxy_src_clip = proxy_render_data->source_clip;
- if (proxy_src_clip && !evas->is_frozen)
+ if (proxy_src_clip)
{
x = obj->cur->cache.clip.x;
y = obj->cur->cache.clip.y;
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 5c860ae..3bde901 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -579,10 +579,10 @@ eng_context_clip_unset(void *data EINA_UNUSED, void
*context)
static int
eng_context_clip_get(void *data EINA_UNUSED, void *context, int *x, int *y,
int *w, int *h)
{
- *x = ((RGBA_Draw_Context *)context)->clip.x;
- *y = ((RGBA_Draw_Context *)context)->clip.y;
- *w = ((RGBA_Draw_Context *)context)->clip.w;
- *h = ((RGBA_Draw_Context *)context)->clip.h;
+ if (x) *x = ((RGBA_Draw_Context *)context)->clip.x;
+ if (y) *y = ((RGBA_Draw_Context *)context)->clip.y;
+ if (w) *w = ((RGBA_Draw_Context *)context)->clip.w;
+ if (h) *h = ((RGBA_Draw_Context *)context)->clip.h;
return ((RGBA_Draw_Context *)context)->clip.use;
}
--
[EGIT] [core/efl] master 06/06: Evas GL: Fix support for the SW engines (OSMesa)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=425265ca6d1d926081155d0f23a8d801b5ff56d4
commit 425265ca6d1d926081155d0f23a8d801b5ff56d4
Author: Jean-Philippe Andre
Date: Wed Oct 14 19:42:49 2015 +0900
Evas GL: Fix support for the SW engines (OSMesa)
Since @raster changed the behaviour of the dirty flag on images,
damages must be added to redraw the GL surface. Evas_Image checks
if it is an Evas GL surface by looking at its native surface.
But in case of SW engine, there was no native surface information
for Evas GL surfaces. Also, the OPENGL surface type was awfully
abused for OSMesa support. Luckily EVASGL surface type lets us
pass arbitrary pointers :)
---
.../evas/engines/software_generic/evas_engine.c| 17
.../evas/engines/software_x11/evas_engine.c| 46 +++---
2 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 4eaa9a4..721c4ee 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1096,12 +1096,15 @@ eng_image_native_set(void *data EINA_UNUSED, void
*image, void *native)
if (!im || !ns) return im;
- if ((ns->type == EVAS_NATIVE_SURFACE_OPENGL) &&
+ if ((ns->type == EVAS_NATIVE_SURFACE_EVASGL) &&
(ns->version == EVAS_NATIVE_SURFACE_VERSION))
- im2 = evas_cache_image_data(evas_common_image_cache_get(),
- im->w, im->h,
- ns->data.x11.visual, 1,
- EVAS_COLORSPACE_ARGB);
+ {
+
+im2 = evas_cache_image_data(evas_common_image_cache_get(),
+im->w, im->h,
+ns->data.evasgl.surface, 1,
+EVAS_COLORSPACE_ARGB);
+ }
else
im2 = evas_cache_image_data(evas_common_image_cache_get(),
im->w, im->h,
@@ -3178,9 +3181,9 @@ eng_gl_native_surface_get(void *data EINA_UNUSED, void
*surface, void *native_su
if (!sfc) return 0;
- ns->type = EVAS_NATIVE_SURFACE_OPENGL;
+ ns->type = EVAS_NATIVE_SURFACE_EVASGL;
ns->version = EVAS_NATIVE_SURFACE_VERSION;
- ns->data.x11.visual = sfc->buffer;
+ ns->data.evasgl.surface = sfc->buffer;
return 1;
#else
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c
b/src/modules/evas/engines/software_x11/evas_engine.c
index 02e6630..5a5d1cf 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -632,6 +632,20 @@ eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
(re->outbuf_alpha_get(re->generic.ob));
}
+static void
+_native_evasgl_free(void *data EINA_UNUSED, void *image)
+{
+ RGBA_Image *im = image;
+ Native *n = im->native.data;
+
+ im->native.data= NULL;
+ im->native.func.data = NULL;
+ im->native.func.bind = NULL;
+ im->native.func.free = NULL;
+ //im->image.data = NULL;
+ free(n);
+}
+
static void *
eng_image_native_set(void *data EINA_UNUSED, void *image, void *native)
{
@@ -640,7 +654,13 @@ eng_image_native_set(void *data EINA_UNUSED, void *image,
void *native)
Image_Entry *ie = image, *ie2 = NULL;
RGBA_Image *im = image;
- if (!im || !ns) return im;
+ if (!im) return NULL;
+ if (!ns)
+ {
+if (im->native.data && im->native.func.free)
+ im->native.func.free(im->native.func.data, im);
+return NULL;
+ }
if (ns->type == EVAS_NATIVE_SURFACE_X11)
{
@@ -669,10 +689,10 @@ eng_image_native_set(void *data EINA_UNUSED, void *image,
void *native)
}
// Code from software_generic
- if ((ns->type == EVAS_NATIVE_SURFACE_OPENGL) &&
-(ns->version == EVAS_NATIVE_SURFACE_VERSION))
+ if ((ns->type == EVAS_NATIVE_SURFACE_EVASGL) &&
+ (ns->version == EVAS_NATIVE_SURFACE_VERSION))
ie2 = evas_cache_image_data(evas_common_image_cache_get(),
- ie->w, ie->h, ns->data.x11.visual, 1,
+ ie->w, ie->h, ns->data.evasgl.surface, 1,
EVAS_COLORSPACE_ARGB);
else
ie2 = evas_cache_image_data(evas_common_image_cache_get(),
@@ -702,10 +722,26 @@ eng_image_native_set(void *data EINA_UNUSED, void *image,
void *native)
return evas_xcb_image_native_set(re->generic.ob, ie, ns);
#endif
}
- if (ns->type == EVAS_NATIVE_SURFACE_TBM)
+ else if (ns->type == EVAS_NATIVE_SURFACE_TBM)
{
return evas_native_tbm_image_set(re->generic.ob, ie, ns);
}
+ else if (ns->type == EVAS_NATIVE_SURFACE_EVASGL)
+ {
+/* Native contains Evas_Native_Surface. What a mess. */
+Native *n = calloc
[EGIT] [core/efl] master 05/06: Evas GL: Improve ERR log (direct rendering failed)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=045f774c2772bf7fc0b5380051e35c671bdef6be
commit 045f774c2772bf7fc0b5380051e35c671bdef6be
Author: Jean-Philippe Andre
Date: Wed Oct 14 17:43:36 2015 +0900
Evas GL: Improve ERR log (direct rendering failed)
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 46eca42..f59d34e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1329,8 +1329,10 @@ try_again:
}
else
{
- ERR("Win cfg can't support Evas GL DR win (depth %d, stencil
%d, msaa %d)",
- native_win_depth, native_win_stencil, native_win_msaa);
+ ERR("Win cfg can't support Evas GL DR, win: [depth %d,
stencil %d, msaa %d] "
+ "want: [depth %d, stencil %d, msaa %d]",
+ native_win_depth, native_win_stencil, native_win_msaa,
+ depth_size, stencil_bit, msaa_samples);
support_win_cfg = EINA_FALSE;
}
--
[EGIT] [core/efl] master 03/06: Evas GL: Implement glGetString wrapper for OSMesa
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a23fcb8b71a6a849b429f7501b433d7dc1daf470
commit a23fcb8b71a6a849b429f7501b433d7dc1daf470
Author: Jean-Philippe Andre
Date: Wed Oct 14 17:27:53 2015 +0900
Evas GL: Implement glGetString wrapper for OSMesa
This is only one step into making the software engine actually
work the same as a proper GL engine from Evas GL APIs point of view.
This is necessary for the test suite (coming next).
---
.../evas/engines/software_generic/evas_engine.c| 55 +++---
1 file changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 3bde901..4eaa9a4 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -211,7 +211,7 @@ static void (*_sym_glGetShaderiv)
(GLuint shader,
static void (*_sym_glGetShaderInfoLog)(GLuint
shader, GLsizei bufsize, GLsizei* length, char* infolog) = NULL;
static void (*_sym_glGetShaderPrecisionFormat)(GLenum
shadertype, GLenum precisiontype, GLint* range, GLint* precision) = NULL;
static void (*_sym_glGetShaderSource) (GLuint
shader, GLsizei bufsize, GLsizei* length, char* source) = NULL;
-static const GLubyte *(*_sym_glGetString) (GLenum
name) = NULL;
+static const GLubyte *(*_sym_glGetString) (GLenum name)
= NULL;
static void (*_sym_glGetTexParameterfv) (GLenum
target, GLenum pname, GLfloat* params) = NULL;
static void (*_sym_glGetTexParameteriv) (GLenum
target, GLenum pname, GLint* params) = NULL;
static void (*_sym_glGetUniformfv)(GLuint
program, GLint location, GLfloat* params) = NULL;
@@ -4886,11 +4886,53 @@ evgl_glShaderBinary(GLsizei n EINA_UNUSED, const
GLuint* shaders EINA_UNUSED, GL
//n = binaryformat = length = 0;
//shaders = binary = 0;
}
-#endif
-//--//
+
+static const GLubyte *
+evgl_glGetString(GLenum name)
+{
+ static char _version[128] = {0};
+ static char _glsl[128] = {0};
+ const char *ret;
+
+ /* NOTE: Please modify gl_common/evas_gl_api.c as well if you change
+* this function!
+*/
+
+ switch (name)
+ {
+ case GL_VENDOR:
+ case GL_RENDERER:
+// Keep these as-is.
+break;
+
+ case GL_SHADING_LANGUAGE_VERSION:
+ret = (const char *) _sym_glGetString(GL_SHADING_LANGUAGE_VERSION);
+if (!ret) return NULL;
+snprintf(_glsl, sizeof(_glsl), "OpenGL ES GLSL ES 1.00 Evas GL (%s)",
(char *) ret);
+_version[sizeof(_glsl) - 1] = '\0';
+return (const GLubyte *) _glsl;
+
+ case GL_VERSION:
+ret = (const char *) _sym_glGetString(GL_VERSION);
+if (!ret) return NULL;
+snprintf(_version, sizeof(_version), "OpenGL ES 2.0 Evas GL (%s)",
(char *) ret);
+_version[sizeof(_version) - 1] = '\0';
+return (const GLubyte *) _version;
+
+ case GL_EXTENSIONS:
+// assume OSMesa's extensions are safe (no messing with GL context
here)
+break;
+
+ default:
+// GL_INVALID_ENUM is generated if name is not an accepted value.
+WRN("Unknown string requested: %x", (unsigned int) name);
+break;
+ }
+
+ return _sym_glGetString(name);
+}
-#ifdef EVAS_GL
static void
override_gl_apis(Evas_GL_API *api)
{
@@ -4959,7 +5001,7 @@ override_gl_apis(Evas_GL_API *api)
ORD(glGetAttribLocation);
ORD(glGetBooleanv);
ORD(glGetBufferParameteriv);
- ORD(glGetError);
+ ORD(glGetError); // FIXME
ORD(glGetFloatv);
ORD(glGetFramebufferAttachmentParameteriv);
ORD(glGetIntegerv);
@@ -4970,7 +5012,6 @@ override_gl_apis(Evas_GL_API *api)
ORD(glGetShaderInfoLog);
ORD(glGetShaderPrecisionFormat);
ORD(glGetShaderSource);
- ORD(glGetString); // FIXME
ORD(glGetTexParameterfv);
ORD(glGetTexParameteriv);
ORD(glGetUniformfv);
@@ -5044,6 +5085,8 @@ override_gl_apis(Evas_GL_API *api)
#undef ORD
#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, evgl_)
+ ORD(glGetString);
+
if (!gl_lib_is_gles)
{
// Override functions wrapped by Evas_GL
--
[EGIT] [core/efl] master 02/06: Evas GL: Minor changes inside glGetString
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ec7111938c80a28671793f586f62df1e02b39ec9
commit ec7111938c80a28671793f586f62df1e02b39ec9
Author: Jean-Philippe Andre
Date: Wed Oct 14 17:27:23 2015 +0900
Evas GL: Minor changes inside glGetString
---
src/modules/evas/engines/gl_common/evas_gl_api.c | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
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 f91fc35..a97204e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -657,7 +657,7 @@ _evgl_glGetString(GLenum name)
static char _version[128] = {0};
static char _glsl[128] = {0};
EVGL_Resource *rsc;
- const GLubyte *ret;
+ const char *ret;
/* We wrap two values here:
*
@@ -678,6 +678,10 @@ _evgl_glGetString(GLenum name)
* --> crash moved to app side if they blindly call strstr()
*/
+ /* NOTE: Please modify software_generic/evas_engine.c as well if you change
+* this function!
+*/
+
if ((!(rsc = _evgl_tls_resource_get())) || !rsc->current_ctx)
{
ERR("Current context is NULL, not calling glGetString");
@@ -694,17 +698,17 @@ _evgl_glGetString(GLenum name)
break;
case GL_SHADING_LANGUAGE_VERSION:
-ret = glGetString(GL_SHADING_LANGUAGE_VERSION);
+ret = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
if (!ret) return NULL;
#ifdef GL_GLES
-if (ret[18] != (GLubyte) '1')
+if (ret[18] != '1')
{
// We try not to remove the vendor fluff
- snprintf(_glsl, sizeof(_glsl), "OpenGL ES GLSL ES 1.00 Evas GL
(%s)", ((char *) ret) + 18);
+ snprintf(_glsl, sizeof(_glsl), "OpenGL ES GLSL ES 1.00 Evas GL
(%s)", ret + 18);
_glsl[sizeof(_glsl) - 1] = '\0';
return (const GLubyte *) _glsl;
}
-return ret;
+return (const GLubyte *) ret;
#else
// Desktop GL, we still keep the official name
snprintf(_glsl, sizeof(_glsl), "OpenGL ES GLSL ES 1.00 Evas GL (%s)",
(char *) ret);
@@ -713,17 +717,17 @@ _evgl_glGetString(GLenum name)
#endif
case GL_VERSION:
-ret = glGetString(GL_VERSION);
+ret = (const char *) glGetString(GL_VERSION);
if (!ret) return NULL;
#ifdef GL_GLES
-if ((ret[10] != (GLubyte) '2') && (ret[10] != (GLubyte) '3'))
+if ((ret[10] != '2') && (ret[10] != '3'))
{
// We try not to remove the vendor fluff
- snprintf(_version, sizeof(_version), "OpenGL ES 2.0 Evas GL
(%s)", ((char *) ret) + 10);
+ snprintf(_version, sizeof(_version), "OpenGL ES 2.0 Evas GL
(%s)", ret + 10);
_version[sizeof(_version) - 1] = '\0';
return (const GLubyte *) _version;
}
-return ret;
+return (const GLubyte *) ret;
#else
// Desktop GL, we still keep the official name
snprintf(_version, sizeof(_version), "OpenGL ES 2.0 Evas GL (%s)",
(char *) ret);
--
[EGIT] [core/efl] master 01/06: Evas GL: Avoid make_current(0, 0) during destroy
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=86d1b190c2c013db3b8bad6644aa28c303fe2f2d
commit 86d1b190c2c013db3b8bad6644aa28c303fe2f2d
Author: Jean-Philippe Andre
Date: Wed Oct 14 16:58:05 2015 +0900
Evas GL: Avoid make_current(0,0) during destroy
Show an error message and call make_current(NULL, NULL) only if
the object (context, surface) being destroyed is current.
Otherwise, avoid changing the current context & surface.
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 83 ---
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 1091ddb..46eca42 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -984,7 +984,7 @@ _surface_cap_print(int error)
PRINT_LOG("");
PRINT_LOG(" Evas GL Supported Surface Format
");
-
PRINT_LOG("\n");
+
PRINT_LOG("");
PRINT_LOG(" Max Surface Width: %d Height: %d", evgl_engine->caps.max_w,
evgl_engine->caps.max_h);
PRINT_LOG(" Multisample Support: %d", evgl_engine->caps.msaa_supported);
//if (evgl_engine->caps.msaa_supported)
@@ -1973,8 +1973,6 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
EVGL_Resource *rsc;
Eina_Bool dbg;
- // FIXME: This does some make_current(0,0) which may have side effects
-
// Check input parameter
if ((!evgl_engine) || (!sfc))
{
@@ -1992,6 +1990,21 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
if ((dbg = evgl_engine->api_debug_mode))
DBG("Destroying surface sfc %p (eng %p)", sfc, eng_data);
+ if ((rsc->current_ctx) && (rsc->current_ctx->current_sfc == sfc) )
+ {
+if (evgl_engine->api_debug_mode)
+ {
+ ERR("The context is still current before it's being destroyed. "
+ "Calling make_current(NULL, NULL)");
+ }
+else
+ {
+ WRN("The context is still current before it's being destroyed. "
+ "Calling make_current(NULL, NULL)");
+ }
+evgl_make_current(eng_data, NULL, NULL);
+ }
+
// Make current to current context to destroy surface buffers
if (!_internal_resource_make_current(eng_data, rsc->current_ctx))
{
@@ -2050,38 +2063,15 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
}
}
- if ((rsc->current_ctx) && (rsc->current_ctx->current_sfc == sfc) )
- {
-if (evgl_engine->api_debug_mode)
- {
- ERR("The surface is still current before it's being destroyed.");
- ERR("Doing make_current(NULL, NULL)");
- }
-else
- {
- WRN("The surface is still current before it's being destroyed.");
- WRN("Doing make_current(NULL, NULL)");
- }
-evgl_make_current(eng_data, NULL, NULL);
- }
-
if (sfc->current_ctx && sfc->current_ctx->current_sfc == sfc)
sfc->current_ctx->current_sfc = NULL;
- if (dbg) DBG("Calling make_current(NULL, NULL)");
- if (!evgl_engine->funcs->make_current(eng_data, NULL, NULL, 0))
- {
-ERR("Error doing make_current(NULL, NULL).");
-return 0;
- }
-
// Remove it from the list
LKL(evgl_engine->resource_lock);
evgl_engine->surfaces = eina_list_remove(evgl_engine->surfaces, sfc);
LKU(evgl_engine->resource_lock);
free(sfc);
- sfc = NULL;
_surface_context_list_print();
@@ -2170,6 +2160,7 @@ evgl_context_create(void *eng_data, EVGL_Context
*share_ctx,
int
evgl_context_destroy(void *eng_data, EVGL_Context *ctx)
{
+ EVGL_Resource *rsc;
Eina_Bool dbg;
// Check the input
@@ -2178,18 +2169,37 @@ evgl_context_destroy(void *eng_data, EVGL_Context *ctx)
ERR("Invalid input data. Engine: %p Context:%p", evgl_engine, ctx);
return 0;
}
- dbg = evgl_engine->api_debug_mode;
- // FIXME: this calls make_current(0,0) which probably shouldn't be the case
- // if the context is not current (?)
+ // Retrieve the resource object
+ if (!(rsc = _evgl_tls_resource_get()))
+ {
+ERR("Error retrieving resource from TLS");
+return 0;
+ }
- if (dbg) DBG("Destroying context (eng = %p, ctx = %p)", eng_data, ctx);
+ if ((dbg = evgl_engine->api_debug_mode))
+ DBG("Destroying context (eng = %p, ctx = %p)", eng_data, ctx);
+
+ if ((rsc->current_ctx) && (rsc->current_ctx == ctx)
[EGIT] [core/elementary] master 01/01: elm_test: Fix bug in GLView test
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8db552511bb7fb7db52b88a490d8e53cfc370703
commit 8db552511bb7fb7db52b88a490d8e53cfc370703
Author: Jean-Philippe Andre
Date: Wed Oct 14 18:00:24 2015 +0900
elm_test: Fix bug in GLView test
Scenario:
const char * accel = accel_get();
accel_set("gl:depth");
Now accel may not be valid anymore since the original
Eina_Stringshare might have been destroyed. So there was
no point in saving the const char * pointer. It was not valid
after the call to set(). This is a bit confusing here. Returning
char* would be clear: the caller would own the data.
---
src/bin/test_glview.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index ceaf7cc..31c76cf 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -624,7 +624,7 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
gldata_init(gld);
// add a Z-depth buffer to the window and try to use GL
- accel = elm_config_accel_preference_get();
+ accel = eina_stringshare_add(elm_config_accel_preference_get());
elm_config_accel_preference_set("gl:depth");
// new window - do the usual and give it a name, title and delete handler
@@ -633,6 +633,7 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
// restore previous accel preference
elm_config_accel_preference_set(accel);
+ eina_stringshare_del(accel);
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
--
[EGIT] [core/efl] master 04/06: Evas GL: Add a test case for Evas GL (make check)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=93298d6dc2360ef91009ef88a76e3cb0336c0235
commit 93298d6dc2360ef91009ef88a76e3cb0336c0235
Author: Jean-Philippe Andre
Date: Wed Oct 14 17:30:25 2015 +0900
Evas GL: Add a test case for Evas GL (make check)
For now this only covers SOME of Evas GL's functions.
It will try to run with opengl_x11 and buffer (OSMesa). It'll also
try to fail silently if the engine initialization failed, or if
OSMesa could not be found. If the engines work, then Evas GL must
work properly.
---
src/Makefile_Evas.am | 1 +
src/tests/evas/evas_suite.c | 1 +
src/tests/evas/evas_suite.h | 1 +
src/tests/evas/evas_test_evasgl.c | 250 ++
4 files changed, 253 insertions(+)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 71cd597..0e08495 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2127,6 +2127,7 @@ tests/evas/evas_test_filters.c \
tests/evas/evas_test_image.c \
tests/evas/evas_test_mesh.c \
tests/evas/evas_test_mask.c \
+tests/evas/evas_test_evasgl.c \
tests/evas/evas_tests_helpers.h \
tests/evas/evas_suite.h
diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c
index 7b087bb..242215f 100644
--- a/src/tests/evas/evas_suite.c
+++ b/src/tests/evas/evas_suite.c
@@ -28,6 +28,7 @@ static const Evas_Test_Case etc[] = {
{ "Images", evas_test_image_object },
{ "Meshes", evas_test_mesh },
{ "Masking", evas_test_mask },
+ { "Evas GL", evas_test_evasgl },
{ NULL, NULL }
};
diff --git a/src/tests/evas/evas_suite.h b/src/tests/evas/evas_suite.h
index 645f758..574bdc2 100644
--- a/src/tests/evas/evas_suite.h
+++ b/src/tests/evas/evas_suite.h
@@ -13,5 +13,6 @@ void evas_test_filters(TCase *tc);
void evas_test_image_object(TCase *tc);
void evas_test_mesh(TCase *tc);
void evas_test_mask(TCase *tc);
+void evas_test_evasgl(TCase *tc);
#endif /* _EVAS_SUITE_H */
diff --git a/src/tests/evas/evas_test_evasgl.c
b/src/tests/evas/evas_test_evasgl.c
new file mode 100644
index 000..af840b5
--- /dev/null
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -0,0 +1,250 @@
+/* Test Evas GL EAPIs.
+ *
+ * This will try with opengl_x11 and buffer (OSMesa) and silently fail if
+ * the engine or the GL library can't be initialized. This is to test Evas GL
+ * APIs when they can actually work, ie. when OSMesa exists or when the engine
+ * is GL.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include
+#include
+
+#define EFL_GFX_FILTER_BETA
+#include "evas_suite.h"
+#include "Evas.h"
+#include "Evas_GL.h"
+#include "Ecore_Evas.h"
+
+static int
+_detect_osmesa(void)
+{
+ /* assume that if libOSMesa.so links, then we can create an Evas GL */
+ void *lib = dlopen("libOSMesa.so", RTLD_NOW);
+ if (!lib)
+ {
+printf("Could not find OSMesa! Skipping Evas GL tests.\n");
+return 0;
+ }
+ dlclose(lib);
+ return 1;
+}
+
+#define START_EVASGL_TEST(engine, options) \
+ Ecore_Evas *ee; Evas *evas; Evas_Object *im = NULL; \
+ if (!strcmp(engine, "buffer") && !_detect_osmesa()) return; \
+ putenv("EVAS_GL_API_DEBUG=1"); \
+ evas_init(); \
+ ecore_evas_init(); \
+ ee = ecore_evas_new(engine, 0, 0, 1, 1, options); \
+ if (!ee) { printf("Could not create ecore evas. Skipping Evas GL
tests.\n"); \
+ goto init_failed; } \
+ ecore_evas_show(ee); \
+ ecore_evas_manual_render_set(ee, EINA_TRUE); \
+ evas = ecore_evas_get(ee); \
+ im = evas_object_image_filled_add(evas); \
+ evas_object_geometry_set(im, 0, 0, 1, 1); \
+ evas_object_show(im); \
+ ecore_evas_manual_render(ee); \
+ do {} while (0)
+
+#define END_EVASGL_TEST() \
+ init_failed: \
+ evas_object_del(im); \
+ ecore_evas_free(ee); \
+ ecore_evas_shutdown(); \
+ evas_shutdown(); \
+ do {} while (0)
+
+static void
+_test_evasgl_init(const char *engine, const char *options)
+{
+ START_EVASGL_TEST(engine, options);
+ Evas_GL_Context *ctx;
+ Evas_GL_Surface *sfc;
+ Evas_GL_Config *cfg;
+ Evas_GL_API *gl;
+ Evas_GL *evgl;
+
+ fail_if(!(evgl = evas_gl_new(evas)));
+ fail_if(!(cfg = evas_gl_config_new()));
+ fail_if(!(sfc = evas_gl_surface_create(evgl, cfg, 1, 1)));
+ fail_if(!(ctx = evas_gl_context_create(evgl, NULL)));
+
+ /* valid current states */
+ fail_if(!evas_gl_make_current(evgl, sfc, ctx));
+ fail_if(!evas_gl_make_current(evgl, NULL, NULL));
+ fail_if(!evas_gl_make_current(evgl, NULL, ctx));
+
+ /* no context but surface: invalid */
+ fprintf(stderr, " IGNORE ERRORS BEGIN \n");
+ fail_if(evas_gl_make_current(evgl, sfc, NULL) != EINA_FALSE);
+ fprintf(stderr, " IGNORE ERRORS END \n");
+
+ /* API verification */
+ fail_if(!(gl = evas_gl_api_get(evgl)));
+
+ fail_if(!evas_gl_make_current(evgl, NULL, NULL));
+ evas_gl_context_destroy(evgl, ctx);
+ evas_
[EGIT] [core/efl] master 01/05: Evas GL: Don't call eglMakeCurrent if already null
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=079436d4f190faed842dce14276231a0907cba2a
commit 079436d4f190faed842dce14276231a0907cba2a
Author: Jean-Philippe Andre
Date: Wed Oct 14 21:32:11 2015 +0900
Evas GL: Don't call eglMakeCurrent if already null
If the current context & surface are already null, avoid
calling eglMakeCurrent again, since it can return an error
(EGL_FALSE but with no error code, thanks Nvidia).
---
src/modules/evas/engines/gl_x11/evas_engine.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index bdbd86f..930092d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -179,6 +179,10 @@ evgl_eng_make_current(void *data, void *surface, void
*context, int flush)
if ((!context) && (!surface))
{
+if (!eglGetCurrentContext() &&
+!eglGetCurrentSurface(EGL_READ) &&
+!eglGetCurrentSurface(EGL_DRAW))
+ return 1;
ret = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
if (!ret)
{
--
[EGIT] [core/efl] master 04/05: Evas GL: Add test case for surfaceless contexts
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f6fd05ff74df03ace98d9158bf38f8322cffaf53
commit f6fd05ff74df03ace98d9158bf38f8322cffaf53
Author: Jean-Philippe Andre
Date: Wed Oct 14 22:08:55 2015 +0900
Evas GL: Add test case for surfaceless contexts
---
src/tests/evas/evas_test_evasgl.c | 93 ---
1 file changed, 58 insertions(+), 35 deletions(-)
diff --git a/src/tests/evas/evas_test_evasgl.c
b/src/tests/evas/evas_test_evasgl.c
index af840b5..6ee7c92 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -77,7 +77,6 @@ _test_evasgl_init(const char *engine, const char *options)
/* valid current states */
fail_if(!evas_gl_make_current(evgl, sfc, ctx));
fail_if(!evas_gl_make_current(evgl, NULL, NULL));
- fail_if(!evas_gl_make_current(evgl, NULL, ctx));
/* no context but surface: invalid */
fprintf(stderr, " IGNORE ERRORS BEGIN \n");
@@ -199,52 +198,76 @@ _test_evasgl_context_version(const char *engine, const
char *options)
END_EVASGL_TEST();
}
-START_TEST(evas_test_evasgl_init_opengl_x11)
+static void
+_test_evasgl_surfaceless_context(const char *engine, const char *options)
{
- _test_evasgl_init("opengl_x11", NULL);
-}
-END_TEST
+ if (!_detect_osmesa())
+ return;
-START_TEST(evas_test_evasgl_current_get_opengl_x11)
-{
- _test_evasgl_current_get("opengl_x11", NULL);
-}
-END_TEST
+ START_EVASGL_TEST(engine, options);
+ Evas_GL_Context *ctx;
+ Evas_GL_Surface *sfc;
+ Evas_GL_Config *cfg;
+ Evas_GL_API *gl;
+ Evas_GL *evgl;
+ const char *eexts;
-START_TEST(evas_test_evasgl_context_version_opengl_x11)
-{
- _test_evasgl_context_version("opengl_x11", NULL);
-}
-END_TEST
+ fail_if(!(evgl = evas_gl_new(evas)));
+ fail_if(!(ctx = evas_gl_context_create(evgl, NULL)));
-START_TEST(evas_test_evasgl_init_buffer)
-{
- _test_evasgl_init("buffer", NULL);
-}
-END_TEST
+ // FIXME: evas_gl_string_query will fail before the first make_current
+ fail_if(!(cfg = evas_gl_config_new()));
+ fail_if(!(sfc = evas_gl_surface_create(evgl, cfg, 1, 1)));
+ fail_if(!evas_gl_make_current(evgl, sfc, ctx));
+ // FIXME
-START_TEST(evas_test_evasgl_current_get_buffer)
-{
- _test_evasgl_current_get("buffer", NULL);
-}
-END_TEST
+ eexts = evas_gl_string_query(evgl, EVAS_GL_EXTENSIONS);
+ if (eexts && strstr(eexts, "EGL_KHR_surfaceless_context"))
+ {
+fail_if(!evas_gl_make_current(evgl, NULL, ctx));
+fail_if(!(gl = evas_gl_context_api_get(evgl, ctx)));
+fail_if(!gl->glGetString(GL_VERSION));
+ }
+ else printf("Surfaceless context not supported. Skipped.\n");
-START_TEST(evas_test_evasgl_context_version_buffer)
-{
- _test_evasgl_context_version("buffer", NULL);
+ fail_if(!evas_gl_make_current(evgl, NULL, NULL));
+ evas_gl_context_destroy(evgl, ctx);
+ evas_gl_free(evgl);
+
+ END_EVASGL_TEST();
}
-END_TEST
+
+#define TEST_ADD(name) \
+ START_TEST(evas ## name ## _opengl_x11) \
+ { name("opengl_x11", NULL); } \
+ END_TEST \
+ START_TEST(evas ## name ## _buffer) \
+ { name("buffer", NULL); } \
+ END_TEST
+
+TEST_ADD(_test_evasgl_init)
+TEST_ADD(_test_evasgl_current_get)
+TEST_ADD(_test_evasgl_context_version)
+TEST_ADD(_test_evasgl_surfaceless_context)
void evas_test_evasgl(TCase *tc)
{
+#undef TEST_ADD
+#define TEST_ADD(name) tcase_add_test(tc, evas ## name ## _opengl_x11);
+
if (getenv("DISPLAY"))
{
-tcase_add_test(tc, evas_test_evasgl_init_opengl_x11);
-tcase_add_test(tc, evas_test_evasgl_current_get_opengl_x11);
-tcase_add_test(tc, evas_test_evasgl_context_version_opengl_x11);
+TEST_ADD(_test_evasgl_init);
+TEST_ADD(_test_evasgl_current_get);
+TEST_ADD(_test_evasgl_context_version);
+TEST_ADD(_test_evasgl_surfaceless_context);
}
- tcase_add_test(tc, evas_test_evasgl_init_buffer);
- tcase_add_test(tc, evas_test_evasgl_current_get_buffer);
- tcase_add_test(tc, evas_test_evasgl_context_version_buffer);
+#undef TEST_ADD
+#define TEST_ADD(name) tcase_add_test(tc, evas ## name ## _buffer);
+
+ TEST_ADD(_test_evasgl_init);
+ TEST_ADD(_test_evasgl_current_get);
+ TEST_ADD(_test_evasgl_context_version);
+ TEST_ADD(_test_evasgl_surfaceless_context);
}
--
[EGIT] [core/efl] master 03/05: Evas GL: Add EGL_KHR_surfaceless_context since it is supported
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e09a4094bedd0ecc8e7cc4af614dabe1b7b5fb05 commit e09a4094bedd0ecc8e7cc4af614dabe1b7b5fb05 Author: Jean-Philippe Andre Date: Wed Oct 14 21:46:34 2015 +0900 Evas GL: Add EGL_KHR_surfaceless_context since it is supported See 3e39bf36389fdbc8a3f845214. Surfaceless contexts are supported even if the driver does not support them. --- src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c index 03e9805..eb6f156 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c @@ -506,6 +506,11 @@ evgl_api_egl_ext_init(void *getproc, const char *glueexts) sb = eina_strbuf_new(); + // Always supported by Evas GL (faked with internal pbuffer if needed) + // See also GL_OES_surfaceless_context (needs some more work to be actually + // supported). + eina_strbuf_append(sb, "EGL_KHR_surfaceless_context "); + / // Extension HEADER / --
[EGIT] [core/efl] master 02/05: Evas GL: Error out on surfaceless make_current with OSMesa
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9c69d4c1e1baeb9f7f2571321b01a41c7b310a51
commit 9c69d4c1e1baeb9f7f2571321b01a41c7b310a51
Author: Jean-Philippe Andre
Date: Wed Oct 14 21:35:09 2015 +0900
Evas GL: Error out on surfaceless make_current with OSMesa
While OSMesa may support surfaceless contexts, we don't support
them yet in the SW engine. Instead of switching to NULL, NULL,
let's error out and do nothing instead.
---
.../evas/engines/software_generic/evas_engine.c| 23 +-
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 721c4ee..7002378 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -123,7 +123,6 @@ typedef OSMesaContext (*glsym_func_osm_ctx) ();
static Evas_GL_API gl_funcs;
static void *gl_lib_handle;
static int gl_lib_is_gles = 0;
-static Evas_GL_API gl_funcs;
static Eina_Bool _tls_init = EINA_FALSE;
static Eina_TLS gl_current_ctx_key = 0;
@@ -3087,6 +3086,12 @@ eng_gl_make_current(void *data EINA_UNUSED, void
*surface, void *context)
_tls_check();
+ if ((!sfc) ^ (!ctx))
+ {
+ERR("Evas GL on SW engine does not support surfaceless contexts.");
+return 0;
+ }
+
// Unset surface/context
if ((!sfc) || (!ctx))
{
@@ -3101,15 +3106,15 @@ eng_gl_make_current(void *data EINA_UNUSED, void
*surface, void *context)
if (!ctx->initialized)
{
if (ctx->share_ctx)
- share_ctx = ctx->share_ctx->context;
+ share_ctx = ctx->share_ctx->context;
else
- share_ctx = NULL;
+ share_ctx = NULL;
-ctx->context = _sym_OSMesaCreateContextExt(sfc->internal_fmt,
-sfc->depth_bits,
-sfc->stencil_bits,
-0,
-share_ctx);
+ctx->context = _sym_OSMesaCreateContextExt(sfc->internal_fmt,
+ sfc->depth_bits,
+ sfc->stencil_bits,
+ 0,
+ share_ctx);
if (!ctx->context)
{
ERR("Error initializing context.");
@@ -4939,7 +4944,7 @@ evgl_glGetString(GLenum name)
static void
override_gl_apis(Evas_GL_API *api)
{
-
+ memset(&gl_funcs, 0, sizeof(gl_funcs));
api->version = EVAS_GL_API_VERSION;
#define ORD(f) EVAS_API_OVERRIDE(f, api, _sym_)
--
[EGIT] [core/efl] master 05/05: Evas GL: Add more tests
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b401f34dac59e118286c02fa2260c92eead2310
commit 7b401f34dac59e118286c02fa2260c92eead2310
Author: Jean-Philippe Andre
Date: Thu Oct 15 16:02:02 2015 +0900
Evas GL: Add more tests
- glReadPixels
- FBO test
- PBuffer test (only GL engine)
- surface formats test (up to depth=24, stencil=8)
---
src/tests/evas/evas_test_evasgl.c | 304 +++---
1 file changed, 281 insertions(+), 23 deletions(-)
diff --git a/src/tests/evas/evas_test_evasgl.c
b/src/tests/evas/evas_test_evasgl.c
index 6ee7c92..cba2192 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -39,7 +39,8 @@ _detect_osmesa(void)
putenv("EVAS_GL_API_DEBUG=1"); \
evas_init(); \
ecore_evas_init(); \
- ee = ecore_evas_new(engine, 0, 0, 1, 1, options); \
+ if (!options || !strcmp(engine, "buffer")) ee = ecore_evas_new(engine, 0,
0, 1, 1, NULL); \
+ else ee = ecore_evas_gl_x11_options_new(NULL, NULL, 0, 0, 1, 1, options); \
if (!ee) { printf("Could not create ecore evas. Skipping Evas GL
tests.\n"); \
goto init_failed; } \
ecore_evas_show(ee); \
@@ -60,9 +61,9 @@ _detect_osmesa(void)
do {} while (0)
static void
-_test_evasgl_init(const char *engine, const char *options)
+_test_evasgl_init(const char *engine)
{
- START_EVASGL_TEST(engine, options);
+ START_EVASGL_TEST(engine, NULL);
Evas_GL_Context *ctx;
Evas_GL_Surface *sfc;
Evas_GL_Config *cfg;
@@ -96,12 +97,9 @@ _test_evasgl_init(const char *engine, const char *options)
}
static void
-_test_evasgl_current_get(const char *engine, const char *options)
+_test_evasgl_current_get(const char *engine)
{
- if (!_detect_osmesa())
- return;
-
- START_EVASGL_TEST(engine, options);
+ START_EVASGL_TEST(engine, NULL);
Evas_GL_Context *ctx, *ctx2;
Evas_GL_Surface *sfc, *sfc2;
Evas_GL_Config *cfg;
@@ -127,12 +125,16 @@ _test_evasgl_current_get(const char *engine, const char
*options)
fail_if(evgl2 != evgl);
fail_if(sfc2 != sfc);
fail_if(ctx2 != ctx);
+ fail_if(evas_gl_current_surface_get(evgl) != sfc);
+ fail_if(evas_gl_current_context_get(evgl) != ctx);
fail_if(!evas_gl_make_current(evgl, NULL, NULL));
evgl2 = evas_gl_current_evas_gl_get(&ctx2, &sfc2);
fail_if(evgl2 != evgl); /* this should not reset current Evas GL */
fail_if(sfc2 != NULL);
fail_if(ctx2 != NULL);
+ fail_if(evas_gl_current_surface_get(evgl));
+ fail_if(evas_gl_current_context_get(evgl));
evas_gl_context_destroy(evgl, ctx);
evas_gl_surface_destroy(evgl, sfc);
@@ -141,12 +143,9 @@ _test_evasgl_current_get(const char *engine, const char
*options)
}
static void
-_test_evasgl_context_version(const char *engine, const char *options)
+_test_evasgl_context_version(const char *engine)
{
- if (!_detect_osmesa())
- return;
-
- START_EVASGL_TEST(engine, options);
+ START_EVASGL_TEST(engine, NULL);
Evas_GL_Context *ctx, *ctx2;
Evas_GL_Surface *sfc;
Evas_GL_Config *cfg;
@@ -199,12 +198,9 @@ _test_evasgl_context_version(const char *engine, const
char *options)
}
static void
-_test_evasgl_surfaceless_context(const char *engine, const char *options)
+_test_evasgl_surfaceless_context(const char *engine)
{
- if (!_detect_osmesa())
- return;
-
- START_EVASGL_TEST(engine, options);
+ START_EVASGL_TEST(engine, NULL);
Evas_GL_Context *ctx;
Evas_GL_Surface *sfc;
Evas_GL_Config *cfg;
@@ -215,40 +211,294 @@ _test_evasgl_surfaceless_context(const char *engine,
const char *options)
fail_if(!(evgl = evas_gl_new(evas)));
fail_if(!(ctx = evas_gl_context_create(evgl, NULL)));
- // FIXME: evas_gl_string_query will fail before the first make_current
+ // FIXME: evas_gl_string_query will fail before the first make_current (GL)
fail_if(!(cfg = evas_gl_config_new()));
fail_if(!(sfc = evas_gl_surface_create(evgl, cfg, 1, 1)));
fail_if(!evas_gl_make_current(evgl, sfc, ctx));
// FIXME
+ fail_if(!(gl = evas_gl_context_api_get(evgl, ctx)));
+
eexts = evas_gl_string_query(evgl, EVAS_GL_EXTENSIONS);
if (eexts && strstr(eexts, "EGL_KHR_surfaceless_context"))
{
fail_if(!evas_gl_make_current(evgl, NULL, ctx));
-fail_if(!(gl = evas_gl_context_api_get(evgl, ctx)));
fail_if(!gl->glGetString(GL_VERSION));
}
else printf("Surfaceless context not supported. Skipped.\n");
fail_if(!evas_gl_make_current(evgl, NULL, NULL));
evas_gl_context_destroy(evgl, ctx);
+ evas_gl_surface_destroy(evgl, sfc);
+ evas_gl_config_free(cfg);
+ evas_gl_free(evgl);
+ END_EVASGL_TEST();
+}
+
+static void
+_test_evasgl_glreadpixels(const char *engine)
+{
+ /* simple test verifying surface render works as expected */
+
+ START_EVASGL_TEST(engine, NULL);
+ Evas_GL_Context *ctx;
+ Evas_GL_Surface *sfc;
+ Evas_GL_Config *cfg;
+ Evas_GL_AP
[EGIT] [core/efl] master 02/02: Evas GL: SW engine CID fixes
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=561481f6ad0cf9c5c12ee5c6091625120ad4da11
commit 561481f6ad0cf9c5c12ee5c6091625120ad4da11
Author: Jean-Philippe Andre
Date: Fri Oct 16 10:48:40 2015 +0900
Evas GL: SW engine CID fixes
Following previous changes, there was unreachable code.
- CID 1327421
- CID 1327420
---
src/modules/evas/engines/software_generic/evas_engine.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 7002378..d9b8956 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3093,10 +3093,8 @@ eng_gl_make_current(void *data EINA_UNUSED, void
*surface, void *context)
}
// Unset surface/context
- if ((!sfc) || (!ctx))
+ if ((!sfc) && (!ctx))
{
-if (ctx) ctx->current_sfc = NULL;
-if (sfc) sfc->current_ctx = NULL;
eina_tls_set(gl_current_ctx_key, NULL);
eina_tls_set(gl_current_sfc_key, NULL);
return 1;
--
[EGIT] [core/efl] master 01/02: Evas: Fix image orientation with GL engine
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c927f6e4eafbc1eedec4cd512aa16effe4240299
commit c927f6e4eafbc1eedec4cd512aa16effe4240299
Author: Jean-Philippe Andre
Date: Thu Oct 15 20:09:11 2015 +0900
Evas: Fix image orientation with GL engine
Fixes T2738
Not sure what to do if yinvert is true. How to handle image
orientation then? Flip vertically on top of the current orientation?
---
src/modules/evas/engines/gl_common/evas_gl_context.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 bb0a754..17becda 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -2192,8 +2192,9 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context
*gc,
yinvert = tex->im->native.yinvert;
}
- if ((tex->im) && (tex->im->native.data) && (!yinvert))
+ if ((tex->im) && (!yinvert))
{
+// FIXME: What if yinvert is true? How to test that?
switch (tex->im->orient)
{
case EVAS_IMAGE_ORIENT_NONE:
--
[EGIT] [core/efl] master 01/01: Evas GL: Try to fix automated tests
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=83b91dfd097c58574313bc2da9bd7bb18ff277f0
commit 83b91dfd097c58574313bc2da9bd7bb18ff277f0
Author: Jean-Philippe Andre
Date: Mon Oct 19 19:31:10 2015 +0900
Evas GL: Try to fix automated tests
I forgot the #ifdef in the shaders. This might be it. @stefan,
try again please.
---
src/tests/evas/evas_test_evasgl.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/tests/evas/evas_test_evasgl.c
b/src/tests/evas/evas_test_evasgl.c
index cba2192..4d8d1c2 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -285,14 +285,18 @@ _test_evasgl_fbo(const char *engine)
GLint status;
static const char *vertex =
+ "#ifdef GL_ES\n"
"precision mediump float;\n"
+ "#endif\n"
"attribute vec4 vertex;\n"
"void main()\n"
"{\n"
" gl_Position = vertex;\n"
"}\n";
static const char *fragment =
+ "#ifdef GL_ES\n"
"precision mediump float;\n"
+ "#endif\n"
"uniform vec4 color;\n"
"void main()\n"
"{\n"
--
[EGIT] [core/efl] master 01/01: Evas render: Fix rendering of snapshot objects
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8937fd4fc9946600d8b93f8d07c2a13094d102d7
commit 8937fd4fc9946600d8b93f8d07c2a13094d102d7
Author: Jean-Philippe Andre
Date: Fri Oct 23 16:29:40 2015 +0900
Evas render: Fix rendering of snapshot objects
I added a quick check that the clip was not 0x0 but forgot
to check that we actually use the clip info.
Fixes T2792
---
src/lib/evas/canvas/evas_object_image.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index fdf31c7..e174353 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3372,8 +3372,8 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
o->proxyrendering = EINA_FALSE;
}
- ENFN->context_clip_get(ENDT, context, NULL, NULL, &cw, &ch);
- if (!cw || !ch) return;
+ if (ENFN->context_clip_get(ENDT, context, NULL, NULL, &cw, &ch) && (!cw ||
!ch))
+ return;
if (pixels)
{
--
[EGIT] [core/efl] master 01/03: Emile: Allow load of ETC images if region = whole image
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e5dbc2111931b367aac4329efa89914a3ec38619
commit e5dbc2111931b367aac4329efa89914a3ec38619
Author: Jean-Philippe Andre
Date: Thu Oct 29 16:12:09 2015 +0900
Emile: Allow load of ETC images if region = whole image
@fix
---
src/lib/emile/emile_image.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index ef343cc..58a37c5 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -335,7 +335,9 @@ _emile_tgv_head(Emile_Image *image,
0, 0,
image->size.width, image->size.height);
if (image->load_opts &&
- (image->opts.region.w > 0 && image->opts.region.h > 0))
+ ((image->opts.region.w > 0) && (image->opts.region.h > 0) &&
+(image->opts.region.w != (int) image->size.width) &&
+(image->opts.region.h != (int) image->size.height)))
{
/* ETC colorspace doesn't work with region for now */
prop->cspaces = NULL;
--
[EGIT] [core/efl] master 03/03: Eet: fix decoding of embedded ETC images
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cc5511a3823bf328772e7b7ef9cfa852af54
commit cc5511a3823bf328772e7b7ef9cfa852af54
Author: Jean-Philippe Andre
Date: Thu Oct 29 15:30:16 2015 +0900
Eet: fix decoding of embedded ETC images
Typos, lack of NULL check, excessive sizeof(type) not matching
the object type, no border set, etc... This all lead to a crash
and then no render (with an error message and then without...).
This also simplifies the implicit loading of ETC1 as ETC2 when
supported by the driver.
@fix
---
src/lib/eet/eet_image.c| 44 +-
src/lib/emile/emile_image.c| 13 ---
src/lib/evas/common/evas_image_load.c | 4 +-
.../evas/image_loaders/eet/evas_image_load_eet.c | 23 ++-
.../evas/image_loaders/jpeg/evas_image_load_jpeg.c | 4 +-
.../evas/image_loaders/tgv/evas_image_load_tgv.c | 4 +-
6 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index c8ce81b..95b9ee2 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -357,14 +357,14 @@ eet_data_image_jpeg_header_decode(const void *data,
bin = eina_binbuf_manage_new(data, size, EINA_TRUE);
if (!bin) return 0;
- memset(&opts, 0, sizeof (Emile_Image_Load_Opts));
+ memset(&opts, 0, sizeof (opts));
image = emile_image_jpeg_memory_open(bin, &opts, NULL, &error);
if (!image) goto on_error;
memset(&prop, 0, sizeof (prop));
- if (!emile_image_head(image, &prop, sizeof (Emile_Image_Property), &error))
+ if (!emile_image_head(image, &prop, sizeof (prop), &error))
goto on_error;
*w = prop.w;
@@ -410,7 +410,7 @@ eet_data_image_jpeg_rgb_decode(const void *data,
bin = eina_binbuf_manage_new(data, size, EINA_TRUE);
if (!bin) return 0;
- memset(&opts, 0, sizeof (Emile_Image_Load_Opts));
+ memset(&opts, 0, sizeof (opts));
opts.region.x = src_x;
opts.region.y = src_y;
opts.region.w = w;
@@ -421,12 +421,12 @@ eet_data_image_jpeg_rgb_decode(const void *data,
memset(&prop, 0, sizeof (prop));
- if (!emile_image_head(image, &prop, sizeof (Emile_Image_Property), &error))
+ if (!emile_image_head(image, &prop, sizeof (prop), &error))
goto on_error;
prop.cspace = cspace;
- if (!emile_image_data(image, &prop, sizeof (Emile_Image_Property), d,
&error))
+ if (!emile_image_data(image, &prop, sizeof (prop), d, &error))
goto on_error;
r = 1;
@@ -464,7 +464,7 @@ eet_data_image_jpeg_alpha_decode(const void *data,
bin = eina_binbuf_manage_new(data, size, EINA_TRUE);
if (!bin) return 0;
- memset(&opts, 0, sizeof (Emile_Image_Load_Opts));
+ memset(&opts, 0, sizeof (opts));
opts.region.x = src_x;
opts.region.y = src_y;
opts.region.w = w;
@@ -475,7 +475,7 @@ eet_data_image_jpeg_alpha_decode(const void *data,
memset(&prop, 0, sizeof (prop));
- if (!emile_image_head(image, &prop, sizeof (Emile_Image_Property), &error))
+ if (!emile_image_head(image, &prop, sizeof (prop), &error))
goto on_error;
remember = tmp = malloc(sizeof (unsigned char) * w * h);
@@ -484,7 +484,7 @@ eet_data_image_jpeg_alpha_decode(const void *data,
// Alpha should always be encoded as GRY8
prop.cspace = EMILE_COLORSPACE_GRY8;
- if (!emile_image_data(image, &prop, sizeof (Emile_Image_Property), tmp,
&error))
+ if (!emile_image_data(image, &prop, sizeof (prop), tmp, &error))
goto on_error;
if (cspace == EMILE_COLORSPACE_AGRY88)
@@ -584,6 +584,7 @@ eet_data_image_etc2_decode(const void *data,
Emile_Image *image;
Eina_Binbuf *bin;
Emile_Image_Load_Error error;
+ Eina_Bool found = EINA_FALSE;
int i;
int r = 0;
@@ -593,7 +594,7 @@ eet_data_image_etc2_decode(const void *data,
bin = eina_binbuf_manage_new(data, length, EINA_TRUE);
if (!bin) return 0;
- memset(&opts, 0, sizeof (Emile_Image_Load_Opts));
+ memset(&opts, 0, sizeof (opts));
opts.region.x = dst_x;
opts.region.y = dst_y;
opts.region.w = dst_w;
@@ -604,12 +605,20 @@ eet_data_image_etc2_decode(const void *data,
memset(&prop, 0, sizeof (prop));
- if (!emile_image_head(image, &prop, sizeof (Emile_Image_Property), &error))
+ if (!emile_image_head(image, &prop, sizeof (prop), &error))
goto on_error;
- for (i = 0; prop.cspaces[i] != EMILE_COLORSPACE_ARGB; i++)
+ if (prop.cspaces)
{
-if (prop.cspaces[i] == cspace) break;
+for (i = 0; prop.cspaces[i] != EMILE_COLORSPACE_ARGB; i++)
+ {
+ if (prop.cspaces[i] == cspace)
+ {
+ found = EINA_TRUE;
+ break;
+ }
+ }
+if (!found) goto on_error;
}
switch (cspace)
@@ -619,7 +628,7 @@ eet_data_image_etc2_decode(const void *data,
if
[EGIT] [core/efl] master 02/03: Evas: Fix error message on stride_get with ETC & S3TC
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e586b9debc22ff3257d9405cf0ed0ebf8cf919b8
commit e586b9debc22ff3257d9405cf0ed0ebf8cf919b8
Author: Jean-Philippe Andre
Date: Thu Oct 29 16:38:54 2015 +0900
Evas: Fix error message on stride_get with ETC & S3TC
---
src/modules/evas/engines/gl_generic/evas_engine.c | 16
1 file changed, 16 insertions(+)
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c
b/src/modules/evas/engines/gl_generic/evas_engine.c
index d59a132..dd1ca90 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1388,6 +1388,22 @@ eng_image_stride_get(void *data EINA_UNUSED, void
*image, int *stride)
case EVAS_COLORSPACE_YCBCR420TM12601_PL:
*stride = im->w * 1;
return;
+ /* the strides below are approximations, since stride doesn't
+ * really make sense for ETC & S3TC */
+ case EVAS_COLORSPACE_ETC1:
+ case EVAS_COLORSPACE_RGB8_ETC2:
+ case EVAS_COLORSPACE_RGB_S3TC_DXT1:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT1:
+ *stride = (im->w + 2 + 3) / 4 * (8 / 4);
+ return;
+ case EVAS_COLORSPACE_ETC1_ALPHA:
+ case EVAS_COLORSPACE_RGBA8_ETC2_EAC:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT2:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT3:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT4:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT5:
+ *stride = (im->w + 2 + 3) / 4 * (16 / 4);
+ return;
default:
ERR("Requested stride on an invalid format %d", im->cs.space);
*stride = 0;
--
[EGIT] [core/efl] master 02/02: Evas: Disable TGV save debugging and fix error log
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=509ee0f27573a5e3613069cea8c0bdaca12b9a84
commit 509ee0f27573a5e3613069cea8c0bdaca12b9a84
Author: Jean-Philippe Andre
Date: Thu Oct 29 21:13:00 2015 +0900
Evas: Disable TGV save debugging and fix error log
Disable time stats & quality check
Remove an invalid error message (was logged in case of success)
---
src/lib/eet/eet_image.c | 8
src/modules/evas/image_savers/tgv/evas_image_save_tgv.c | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 2702fcd..5578925 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -586,7 +586,6 @@ eet_data_image_etc2_decode(const void *data,
Emile_Image_Load_Error error;
Eina_Bool found = EINA_FALSE;
int i;
- int r = 0;
// Fix for ABI incompatibility between 1.10 and 1.11
if (cspace == 8) cspace = 9;
@@ -655,14 +654,15 @@ eet_data_image_etc2_decode(const void *data,
if ((cspace == EMILE_COLORSPACE_ARGB) && !prop.premul)
_eet_argb_premul(p, prop.w * prop.h);
- r = 1;
+ emile_image_close(image);
+ eina_binbuf_free(bin);
+ return 1;
on_error:
ERR("Failed to decode image inside Eet");
emile_image_close(image);
eina_binbuf_free(bin);
-
- return r;
+ return 0;
}
static void *
diff --git a/src/modules/evas/image_savers/tgv/evas_image_save_tgv.c
b/src/modules/evas/image_savers/tgv/evas_image_save_tgv.c
index c730b24..88b2069 100644
--- a/src/modules/evas/image_savers/tgv/evas_image_save_tgv.c
+++ b/src/modules/evas/image_savers/tgv/evas_image_save_tgv.c
@@ -20,9 +20,9 @@
#include "rg_etc1.h"
// FIXME: Remove DEBUG
-#ifndef DEBUG
-# define DEBUG
-#endif
+//#ifndef DEBUG
+//# define DEBUG
+//#endif
#if defined(DEBUG) && defined(HAVE_CLOCK_GETTIME) &&
defined(_POSIX_MONOTONIC_CLOCK)
# include
# define DEBUG_STATS
--
[EGIT] [core/efl] master 01/02: Eet: Another ETC decoding fix
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3f264677fbda54ad5e55996b1d9f5ad5bc3f4f8c commit 3f264677fbda54ad5e55996b1d9f5ad5bc3f4f8c Author: Jean-Philippe Andre Date: Thu Oct 29 21:05:03 2015 +0900 Eet: Another ETC decoding fix @fix --- src/lib/eet/eet_image.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c index 95b9ee2..2702fcd 100644 --- a/src/lib/eet/eet_image.c +++ b/src/lib/eet/eet_image.c @@ -618,7 +618,8 @@ eet_data_image_etc2_decode(const void *data, break; } } -if (!found) goto on_error; +if (!found && (cspace != EMILE_COLORSPACE_ARGB)) + goto on_error; } switch (cspace) @@ -639,7 +640,7 @@ eet_data_image_etc2_decode(const void *data, if (lossy != EET_IMAGE_ETC1_ALPHA) goto on_error; if (alpha != EINA_TRUE) goto on_error; break; - case EET_COLORSPACE_ARGB: + case EMILE_COLORSPACE_ARGB: break; default: goto on_error; @@ -651,7 +652,7 @@ eet_data_image_etc2_decode(const void *data, goto on_error; // TODO: Add support for more unpremultiplied modes (ETC2) - if ((cspace == EET_COLORSPACE_ARGB) && !prop.premul) + if ((cspace == EMILE_COLORSPACE_ARGB) && !prop.premul) _eet_argb_premul(p, prop.w * prop.h); r = 1; --
[EGIT] [core/efl] master 02/02: Evas render: Fix 'no_render' when object is proxy source
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b4fc15311c87250bf9b39ab9bbdedc02d32b2326
commit b4fc15311c87250bf9b39ab9bbdedc02d32b2326
Author: Jean-Philippe Andre
Date: Mon Nov 2 12:23:00 2015 +0900
Evas render: Fix 'no_render' when object is proxy source
When the no_render flag was set on a proxy source, the object would
not be visible, but it would also not render inside the proxy surface,
which completely beats the purpose of this flag. This patch makes
the objects render inside a proxy surface.
---
src/lib/evas/canvas/evas_render.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index 721a420..9347189 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1371,7 +1371,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object
*eo_obj,
else
{
/* can not trust cache.clip - evas is frozen */
- if (!obj->cur->visible || obj->clip.clipees ||
obj->no_render ||
+ if (!obj->cur->visible || obj->clip.clipees ||
(obj->no_render && !proxy_render_data) ||
(!obj->cur->color.a && (obj->cur->render_op ==
EVAS_RENDER_BLEND)))
{
IFRD(obj->no_render, level, " proxy_src_clip +
no_render\n");
--
[EGIT] [core/efl] master 01/02: ecore_evas_convert: Improve cmdline help a bit
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4da3e70301f00a7aecd24a952628e6eda3d2808a
commit 4da3e70301f00a7aecd24a952628e6eda3d2808a
Author: Jean-Philippe Andre
Date: Thu Oct 29 22:14:08 2015 +0900
ecore_evas_convert: Improve cmdline help a bit
---
src/bin/ecore_evas/ecore_evas_convert.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c
b/src/bin/ecore_evas/ecore_evas_convert.c
index 654668d..07d4632 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -27,7 +27,7 @@ const Ecore_Getopt optdesc = {
{
ECORE_GETOPT_STORE_INT('q', "quality", "define encoding quality in
percent."),
ECORE_GETOPT_STORE_TRUE('c', "compress", "define if data should be
compressed."),
-ECORE_GETOPT_STORE_STR('e', "encoding", "define the codec (for TGV files:
etc1, etc2)"),
+ECORE_GETOPT_STORE_STR('e', "encoding", "define the codec (for TGV files:
'etc1', 'etc2', 'etc1+alpha')"),
ECORE_GETOPT_LICENSE('L', "license"),
ECORE_GETOPT_COPYRIGHT('C', "copyright"),
ECORE_GETOPT_VERSION('V', "version"),
--
[EGIT] [core/efl] master 01/01: tests: Fix build warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a5b28eba8454a965c8c77a75513b549620457ef
commit 0a5b28eba8454a965c8c77a75513b549620457ef
Author: Jean-Philippe Andre
Date: Mon Nov 2 15:08:05 2015 +0900
tests: Fix build warning
---
src/tests/evas/evas_test_evasgl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/evas/evas_test_evasgl.c
b/src/tests/evas/evas_test_evasgl.c
index 4d8d1c2..8b75777 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -40,7 +40,7 @@ _detect_osmesa(void)
evas_init(); \
ecore_evas_init(); \
if (!options || !strcmp(engine, "buffer")) ee = ecore_evas_new(engine, 0,
0, 1, 1, NULL); \
- else ee = ecore_evas_gl_x11_options_new(NULL, NULL, 0, 0, 1, 1, options); \
+ else ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, options); \
if (!ee) { printf("Could not create ecore evas. Skipping Evas GL
tests.\n"); \
goto init_failed; } \
ecore_evas_show(ee); \
--
[EGIT] [core/efl] master 01/01: Evas: Remove dead code (cached surfaces)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6e96d75c7654fa43a20ffe681d6e02cb9c5b32bc
commit 6e96d75c7654fa43a20ffe681d6e02cb9c5b32bc
Author: Jean-Philippe Andre
Date: Mon Nov 2 16:03:48 2015 +0900
Evas: Remove dead code (cached surfaces)
While cached surfaces is a topic we're discussing recently,
this code is dead right now, and we will have to redesign the
buffer caching better to handle proxies, maps, smart objects, etc...
---
src/lib/evas/canvas/evas_object_main.c | 2 +-
src/lib/evas/canvas/evas_object_smart.c | 72 -
src/lib/evas/canvas/evas_render.c | 8
src/lib/evas/include/evas_private.h | 3 --
4 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 7ff20b8..3517bcd 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -30,7 +30,7 @@ static const Evas_Object_Protected_State default_state = {
NULL, { 0, 0, 0, 0 },
{ { 0, 0, 0, 0, 0, 0, 0, 0, EINA_FALSE, EINA_FALSE } },
{ 255, 255, 255, 255 },
- 1.0, 0, EVAS_RENDER_BLEND, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE,
EINA_FALSE, EINA_FALSE, EINA_FALSE
+ 1.0, 0, EVAS_RENDER_BLEND, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE,
EINA_FALSE
};
static const Evas_Object_Filter_Data default_filter = {
NULL, NULL, NULL, NULL, NULL, NULL, { { "default", 0.0 }, { "default", 0.0
}, 0.0 }, EINA_FALSE, EINA_FALSE, EINA_TRUE
diff --git a/src/lib/evas/canvas/evas_object_smart.c
b/src/lib/evas/canvas/evas_object_smart.c
index 1529f75..451c073 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1419,78 +1419,6 @@ evas_object_smart_render_pre(Evas_Object *eo_obj,
void *type_private_data EINA_UNUSED)
{
if (obj->pre_render_done) return;
- if (!obj->child_has_map && !obj->cur->cached_surface)
- {
-#if 0
- // REDO to handle smart move
-Evas_Smart_Data *o;
-
-fprintf(stderr, "");
-o = type_private_data;
-if (/* o->member_count > 1 && */
-o->cur.bounding_box.w == o->prev.bounding_box.w &&
-obj->cur->bounding_box.h == obj->prev->bounding_box.h &&
-(obj->cur->bounding_box.x != obj->prev->bounding_box.x ||
- obj->cur->bounding_box.y != obj->prev->bounding_box.y))
- {
- Eina_Bool cache_map = EINA_FALSE;
-
- /* Check parent speed */
- /* - same speed => do not map this object */
- /* - different speed => map this object */
- /* - if parent is mapped then map this object */
-
- if (!obj->smart.parent || obj->smart.parent->child_has_map)
- {
- cache_map = EINA_TRUE;
- }
- else
- {
- if (_evas_render_has_map(obj->smart.parent))
-{
- cache_map = EINA_TRUE;
-}
- else
-{
- int speed_x, speed_y;
- int speed_px, speed_py;
-
- speed_x = obj->cur->geometry.x - obj->prev->geometry.x;
- speed_y = obj->cur->geometry.y - obj->prev->geometry.y;
-
- speed_px = obj->smart.parent->cur.geometry.x -
obj->smart.parent->prev.geometry.x;
- speed_py = obj->smart.parent->cur.geometry.y -
obj->smart.parent->prev.geometry.y;
-
- /* speed_x = obj->cur->bounding_box.x -
obj->prev->bounding_box.x; */
- /* speed_y = obj->cur->bounding_box.y -
obj->prev->bounding_box.y; */
-
- /* speed_px = obj->smart.parent->cur.bounding_box.x -
obj->smart.parent->prev.bounding_box.x; */
- /* speed_py = obj->smart.parent->cur.bounding_box.y -
obj->smart.parent->prev.bounding_box.y; */
-
- fprintf(stderr, "speed: '%s',%p (%i, %i) vs '%s',%p
(%i, %i)\n",
- evas_object_type_get(eo_obj), obj, speed_x,
speed_y,
- evas_object_type_get(obj->smart.parent),
obj->smart.parent, speed_px, speed_py);
-
- if (speed_x != speed_px || speed_y != speed_py)
- cache_map = EINA_TRUE;
-}
- }
-
- if (cache_map)
- fprintf(stderr, "Wouhou, I can detect moving smart object (%s,
%p [%i, %i, %i, %i] < %s, %p [%i, %i, %i, %i])\n",
- evas_object_type_get(eo_obj), obj,
- obj->cur->bounding_box.x - obj->prev->bounding_box.x,
- obj->cur->bounding_box.y - obj->prev->bounding_box.y,
- obj->cur->bounding_box.w, obj->cur->bounding_box.h,
-
[EGIT] [core/efl] master 01/01: Evas: minor whitespace and debug changes
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a2b64d97723e506535425e942b36d78055c0ea8f
commit a2b64d97723e506535425e942b36d78055c0ea8f
Author: Jean-Philippe Andre
Date: Tue Nov 3 18:13:59 2015 +0900
Evas: minor whitespace and debug changes
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 15 ++--
src/modules/evas/engines/gl_x11/evas_engine.c | 86 +++---
src/modules/evas/engines/gl_x11/evas_x_main.c | 4 +-
.../evas/engines/software_x11/evas_xlib_swapper.c | 50 ++---
4 files changed, 77 insertions(+), 78 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 3bd0d1d..6a03ac3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -486,7 +486,7 @@ _fbo_surface_cap_test(GLint color_ifmt, GLenum color_fmt,
DBG("glGetError() returns %x ", err);
return 0;
- }
+ }
else
return 1;
}
@@ -2113,10 +2113,10 @@ evgl_context_create(void *eng_data, EVGL_Context
*share_ctx,
DBG("Creating context GLESv%d (eng = %p, shctx = %p)", version, eng_data,
share_ctx);
if (!(rsc = _evgl_tls_resource_get()))
-{
- ERR("Error creating resources in tls.");
- return NULL;
-}
+ {
+ERR("Error creating resources in tls.");
+return NULL;
+ }
// Allocate context object
ctx = calloc(1, sizeof(EVGL_Context));
@@ -2754,9 +2754,8 @@ evgl_native_surface_direct_opts_get(Evas_Native_Surface
*ns,
if (evgl_engine->api_debug_mode)
{
-DBG("Found native surface: texid:%u DR:%d CSR:%d",
-ns->data.opengl.texture_id, (int) sfc->direct_fb_opt,
-(int) sfc->client_side_rotation);
+DBG("Found native surface: DR:%d CSR:%d",
+(int) sfc->direct_fb_opt, (int) sfc->client_side_rotation);
}
if (direct_render) *direct_render = sfc->direct_fb_opt;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 59195e8..80fcc53 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -286,12 +286,12 @@ evgl_eng_native_window_create(void *data)
attr.win_gravity = NorthWestGravity;
attr.save_under = False;
attr.do_not_propagate_mask = NoEventMask;
- attr.event_mask = 0;
+ attr.event_mask = 0;
win = XCreateWindow(eng_get_ob(re)->info->info.display,
eng_get_ob(re)->win,
-20, -20, 2, 2, 0,
- CopyFromParent, InputOutput, CopyFromParent,
+ CopyFromParent, InputOutput, CopyFromParent,
CWBackingStore | CWOverrideRedirect |
CWBorderPixel | CWBackPixmap |
CWSaveUnder | CWDontPropagate |
@@ -336,7 +336,7 @@ evgl_eng_native_window_destroy(void *data, void
*native_window)
// Theoretically, we wouldn't need this functoin if the surfaceless context
-// is supported. But, until then...
+// is supported. But, until then...
static void *
evgl_eng_window_surface_create(void *data, void *native_window EINA_UNUSED)
{
@@ -2032,43 +2032,43 @@ _native_bind_cb(void *data EINA_UNUSED, void *image)
static void
_native_unbind_cb(void *data EINA_UNUSED, void *image)
{
- Evas_GL_Image *im = image;
- Native *n = im->native.data;
+ Evas_GL_Image *im = image;
+ Native *n = im->native.data;
- if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
-{
+ if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
+ {
#ifdef GL_GLES
- // nothing
+// nothing
#else
# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
- Render_Engine *re = data;
-
- if (glsym_glXReleaseTexImage)
- {
-glsym_glXReleaseTexImage(eng_get_ob(re)->disp, (XID)n->surface,
- GLX_FRONT_LEFT_EXT);
- }
- else
- ERR("Try glXReleaseTexImage on GLX with no support");
+Render_Engine *re = data;
+
+if (glsym_glXReleaseTexImage)
+ {
+ glsym_glXReleaseTexImage(eng_get_ob(re)->disp, (XID)n->surface,
+ GLX_FRONT_LEFT_EXT);
+ }
+else
+ ERR("Try glXReleaseTexImage on GLX with no support");
# endif
#endif
-}
- else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
-{
- glBindTexture(GL_TEXTURE_2D, 0);
-}
- else if (n->ns.type == EVAS_NATIVE_SURFACE_TBM)
-{
- // nothing
-}
- else if (n->ns.type == EVAS_NATIVE_SURFACE_EVASGL)
-{
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
+ {
+glBindTexture(GL_TEXTURE_2D, 0);
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_TBM)
+ {
+// nothing
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_EVASGL)
+
[EGIT] [core/elementary] master 01/01: notify: animate on hide
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=77ad8fa3c429edfc11ea233d80c918b2a0845e00
commit 77ad8fa3c429edfc11ea233d80c918b2a0845e00
Author: Jean-Philippe Andre
Date: Wed Oct 21 17:23:10 2015 +0900
notify: animate on hide
There was all the necessary code, except that the default
theme did not implement properly the signal & required data.
There is still a problem though, as the "timeout" smart callback
will be called at the start of the animation, so it's not possible
for an app to hide() or del() at this point (that would get
rid of the animation). But there's no other callback after
the animation ends.
elementary_test -to Notify > "Bottom" illustrates this issue.
---
data/themes/edc/elm/notify.edc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/themes/edc/elm/notify.edc b/data/themes/edc/elm/notify.edc
index 14f9ec1..533ecc7 100644
--- a/data/themes/edc/elm/notify.edc
+++ b/data/themes/edc/elm/notify.edc
@@ -14,6 +14,7 @@ group { name: "elm/notify/block_events/default";
group { name: "elm/notify/top/default";
images.image: "darken_rounded_square.png" COMP;
+ data.item: "hide_finished_signal" "on";
parts {
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
@@ -65,7 +66,7 @@ group { name: "elm/notify/top/default";
target: "base";
}
program {
- signal: "elm,hide"; source: "elm";
+ signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
target: "clip";
target: "base";
--
[EGIT] [core/efl] master 01/03: doc: Add EDC doc for desc.proxy, fix for desc.fill
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b52e9202cce08c08668e513cebe21375ef854cdb
commit b52e9202cce08c08668e513cebe21375ef854cdb
Author: Jean-Philippe Andre
Date: Mon Nov 9 15:47:42 2015 +0900
doc: Add EDC doc for desc.proxy, fix for desc.fill
---
src/bin/edje/edje_cc_handlers.c | 123 +++-
1 file changed, 85 insertions(+), 38 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index b96647a..4d118c6 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -94,12 +94,11 @@
*
* @ref sec_collections_group_parts_description_relatives
"Relatives (rel1/rel2)"
* @ref sec_collections_group_parts_description_image
"Image"
+ * @ref sec_collections_group_parts_description_proxy
"Proxy"
+ * @ref sec_collections_group_parts_description_fill
"Fill"
*
- *@ref sec_collections_group_parts_description_image_fill
"Fill"
- *
- * @ref
sec_collections_group_parts_description_image_fill_origin "Origin"
- * @ref
sec_collections_group_parts_description_image_fill_size "Size"
- *
+ *@ref sec_collections_group_parts_description_fill_origin
"Origin"
+ *@ref sec_collections_group_parts_description_fill_size
"Size"
*
* @ref sec_collections_group_parts_description_text
"Text"
* @ref sec_collections_group_parts_description_box "Box"
@@ -8408,27 +8407,30 @@
st_collections_group_parts_part_description_image_scale_hint(void)
NULL);
}
-/** @edcsubsection{collections_group_parts_description_image_fill,
- * Group.Parts.Part.Description.Image.Fill} */
+/** @edcsubsection{collections_group_parts_description_fill,
+ * Group.Parts.Part.Description.Fill} */
/**
@page edcref
@block
fill
@context
-image {
-..
-fill {
-type: SCALE;
-smooth: 0-1;
-origin { }
-size { }
+part { type: IMAGE or PROXY;
+description {
+..
+fill {
+type: SCALE;
+smooth: 0-1;
+origin { }
+size { }
+}
+..
}
..
}
@description
-The fill method is an optional block that defines the way an IMAGE part
-is going to be displayed inside its container.
+The fill method is an optional block that defines the way an IMAGE or
+PROXY part is going to be displayed inside its container.
It can be used for tiling (repeating the image) or displaying only
part of an image. See @ref evas_object_image_fill_set() documentation
for more details.
@@ -8592,8 +8594,8 @@
st_collections_group_parts_part_description_fill_type(void)
NULL);
}
-/** @edcsubsection{collections_group_parts_description_image_fill_origin,
- * Group.Parts.Part.Description.Image.Fill.Origin} */
+/** @edcsubsection{collections_group_parts_description_fill_origin,
+ * Group.Parts.Part.Description.Fill.Origin} */
/**
@page edcref
@@ -8716,8 +8718,8 @@
st_collections_group_parts_part_description_fill_origin_offset(void)
fill->pos_abs_y = parse_int(1);
}
-/** @edcsubsection{collections_group_parts_description_image_fill_size,
- * Group.Parts.Part.Description.Image.Fill.Size} */
+/** @edcsubsection{collections_group_parts_description_fill_size,
+ * Group.Parts.Part.Description.Fill.Size} */
/**
@page edcref
@@ -9680,6 +9682,51 @@ static void
st_collections_group_parts_part_description_table_padding(void)
ed->table.padding.y = parse_int_range(1, 0, 0x7fff);
}
+/**
+ @edcsubsection{collections_group_parts_description_proxy, Proxy}
+ */
+
+/**
+@page edcref
+
+@block
+proxy
+@context
+part { type: PROXY;
+description {
+..
+proxy {
+source_clip:1;
+source_visible: 1;
+}
+..
+}
+}
+@description
+State flags used for proxy objects.
+@endblock
+
+@property
+source_clip
+@parameters
+[0 or 1]
+@effect
+Sets the 'source_clip' property on this PROXY object. True by default,
+this means the proxy will be clipped by its source clipper. False
+means the source clipper is ignored when rendering the proxy.
+@endproperty
+
+@property
+source_visible
+@parameters
+[0 or 1]
+@effect
+
[EGIT] [core/efl] master 02/03: doc: Fixup EDC doc for Evas 3D stuff
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cb2530d921e027f884f1c811ca97a1268bea1c11
commit cb2530d921e027f884f1c811ca97a1268bea1c11
Author: Jean-Philippe Andre
Date: Mon Nov 9 16:08:10 2015 +0900
doc: Fixup EDC doc for Evas 3D stuff
Use same paragraph title format
---
src/bin/edje/edje_cc_handlers.c | 34 --
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 4d118c6..f82b020 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -8415,7 +8415,7 @@
st_collections_group_parts_part_description_image_scale_hint(void)
@block
fill
@context
-part { type: IMAGE or PROXY;
+part { type: [IMAGE or PROXY];
description {
..
fill {
@@ -9683,7 +9683,8 @@ static void
st_collections_group_parts_part_description_table_padding(void)
}
/**
- @edcsubsection{collections_group_parts_description_proxy, Proxy}
+ @edcsubsection{collections_group_parts_description_proxy,
+ Group.Parts.Part.Description.Proxy}
*/
/**
@@ -9764,7 +9765,8 @@
st_collections_group_parts_part_description_proxy_source_visible(void)
}
/**
- @edcsubsection{collections_group_parts_description_positon,Position}
+ @edcsubsection{collections_group_parts_description_positon,
+ Group.Parts.Part.Description.Position}
*/
/**
@@ -9912,7 +9914,8 @@
st_collections_group_parts_part_description_position_space(void)
}
/**
- @edcsubsection{collections_group_parts_description_camera,Properties}
+ @edcsubsection{collections_group_parts_description_camera,
+ Group.Parts.Part.Description.Properties}
*/
/**
@@ -9921,7 +9924,7 @@
st_collections_group_parts_part_description_position_space(void)
@block
properties
@context
-part {
+part { type: CAMERA;
description {
..
properties {
@@ -9964,7 +9967,8 @@
st_collections_group_parts_part_description_camera_properties(void)
}
/**
- @edcsubsection{collections_group_parts_description_properties,Properties}
+ @edcsubsection{collections_group_parts_description_properties,
+ Group.Parts.Part.Description.Properties}
*/
/**
@@ -9973,7 +9977,7 @@
st_collections_group_parts_part_description_camera_properties(void)
@block
properties
@context
-part {
+part { type: [LIGHT or MESH_NODE];
description {
..
properties {
@@ -10297,7 +10301,8 @@
st_collections_group_parts_part_description_properties_shade(void)
}
/**
- @edcsubsection{collections_group_parts_description_orientation,Orientation}
+ @edcsubsection{collections_group_parts_description_orientation,
+ Group.Parts.Part.Description.Orientation}
*/
/**
@@ -10306,7 +10311,7 @@
st_collections_group_parts_part_description_properties_shade(void)
@block
orientation
@context
-part {
+part { type: [CAMERA or MESH_NODE or LIGHT];
description {
..
orientation {
@@ -10328,7 +10333,7 @@
st_collections_group_parts_part_description_properties_shade(void)
@parameters
[x] [y] [z]
@effect
-Indicates a target point for CAMERA and MESH_NODE or for LIGHt to see
or
+Indicates a target point for CAMERA and MESH_NODE or for LIGHT to see
or
to illuminate.
@endproperty
*/
@@ -10522,7 +10527,8 @@
st_collections_group_parts_part_description_orientation_quaternion(void)
}
/**
- @edcsubsection{collections_group_parts_description_texture,Texture}
+ @edcsubsection{collections_group_parts_description_texture,
+ Group.Parts.Part.Description.Texture}
*/
/**
@@ -11296,7 +11302,7 @@
st_collections_group_parts_part_description_physics_backface_cull(void)
#endif
/**
@edcsubsection{collections_group_parts_description_physics_movement_freedom,
- * Group.Parts.Part.Description.Physics.Movement Freedom} */
+ * Group.Parts.Part.Description.Physics.Movement_Freedom} */
/**
@page edcref
@@ -11969,7 +11975,7 @@
st_collections_group_parts_part_description_perspective_focal(void)
filter
@context
part {
-type: [IMAGE or TEXT];
+type: [IMAGE or TEXT or PROXY or SNAPSHOT];
..
description {
..
@@ -11992,7 +11998,7 @@
st_collections_group_parts_part_description_perspective_focal(void)
}
}
@description
-Applies a series of image filters to a TEXT or IMAGE part.
+Applies a series of image filters to a TEXT, IMAGE, PROXY or SNAPSHOT
part.
For more information, please refer to the page
[EGIT] [core/efl] master 03/03: doc: Deprecate filter reference page and link to the wiki
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=16195d3100e2b5070b829f0a8d4956ca0cd01a5b commit 16195d3100e2b5070b829f0a8d4956ca0cd01a5b Author: Jean-Philippe Andre Date: Mon Nov 9 16:21:45 2015 +0900 doc: Deprecate filter reference page and link to the wiki --- src/lib/evas/filters/evas_filter_parser.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index fc333ad..46ba86e 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c @@ -35,9 +35,15 @@ /** @page evasfiltersref Evas filters reference + @warning A new online documentation is available on the Wiki under + https://www.enlightenment.org/docs/efl/advanced/eflgfxfilters";> + EFL Graphics Filters. The documentation below is mostly still valid + but incomplete. This page may be removed in the future. + The Evas filters are a combination of filters used to apply specific effects to an @ref Evas_Object "Evas Object". For the moment, these effects are - specific to the @ref Evas_Object_Text "Text Objects". + specific to the @ref Evas_Object_Text "Text" and @ref Evas_Object_Image + "Image Objects". The filters can be applied to an object using simple Lua scripts. A script will contain a series of buffer declarations and filter commands to apply --
[EGIT] [core/efl] master 11/13: edje_cc: Allow LOSSY compression without quality param
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6ad565a6afe3243b97cf0f22a17b532aa391c1e9
commit 6ad565a6afe3243b97cf0f22a17b532aa391c1e9
Author: Jean-Philippe Andre
Date: Fri Oct 30 14:30:03 2015 +0900
edje_cc: Allow LOSSY compression without quality param
LOSSY quality will then default to 90.
---
src/bin/edje/edje_cc_handlers.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index f82b020..e986291 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -1895,8 +1895,10 @@ st_images_image(void)
check_arg_count(2);
else
{
- img->source_param = parse_int_range(2, 0, 100);
- check_arg_count(3);
+if (check_range_arg_count(2, 3) > 2)
+ img->source_param = parse_int_range(2, 0, 100);
+else
+ img->source_param = 90;
}
}
--
[EGIT] [core/efl] master 10/13: Evas: Allow edje_decc to work with ETC images
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7974f674aa9ba18588576a373e1ec0c524bbde9f
commit 7974f674aa9ba18588576a373e1ec0c524bbde9f
Author: Jean-Philippe Andre
Date: Fri Oct 30 16:41:32 2015 +0900
Evas: Allow edje_decc to work with ETC images
This reuses the internal function data_get, data_put, image_save
respecting the border information and adding support for ETC
formats.
@fix
---
src/bin/edje/edje_decc.c | 2 +-
src/lib/evas/canvas/evas_object_image.c| 101 ++---
src/lib/evas/common/evas_image_data.c | 100
src/lib/evas/common/evas_image_main.c | 30 +++---
.../evas/engines/software_generic/evas_engine.c| 16
.../evas/image_savers/tgv/evas_image_save_tgv.c| 14 ++-
6 files changed, 186 insertions(+), 77 deletions(-)
diff --git a/src/bin/edje/edje_decc.c b/src/bin/edje/edje_decc.c
index 8c0dd3c..5eeb7ef 100644
--- a/src/bin/edje/edje_decc.c
+++ b/src/bin/edje/edje_decc.c
@@ -336,7 +336,7 @@ output(void)
}
ecore_file_mkpath(pp);
free(pp);
- if (!evas_object_image_save(im, out, NULL, "quality=100
compress=9"))
+ if (!evas_object_image_save(im, out, NULL, "quality=100
compress=9 encoding=auto"))
{
ERR("Cannot write file %s. Perhaps missing JPEG or PNG
saver modules for Evas.", out);
exit(-1);
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index e174353..b4a8f19 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1648,7 +1648,9 @@ _evas_image_efl_file_save(const Eo *eo_obj,
Evas_Image_Data *o, const char *file
int quality = 80, compress = 9, ok = 0;
char *encoding = NULL;
Image_Entry *ie;
- Eina_Bool putback = EINA_FALSE, tofree = EINA_FALSE;
+ Eina_Bool putback = EINA_FALSE, tofree = EINA_FALSE, no_convert =
EINA_FALSE;
+ Evas_Colorspace cspace = EVAS_COLORSPACE_ARGB;
+ int want_cspace = EVAS_COLORSPACE_ARGB;
int imagew, imageh;
void *pixels;
@@ -1698,16 +1700,9 @@ _evas_image_efl_file_save(const Eo *eo_obj,
Evas_Image_Data *o, const char *file
o->proxyrendering = EINA_FALSE;
}
- pixels = ENFN->image_data_get(ENDT, pixels, 0, &data, &o->load_error,
&tofree);
-
- if (!pixels)
- {
-WRN("Could not get image pixels.");
-return EINA_FALSE;
- }
-
if (flags)
{
+const char *ext = NULL;
char *p, *pp;
char *tflags;
@@ -1724,23 +1719,99 @@ _evas_image_efl_file_save(const Eo *eo_obj,
Evas_Image_Data *o, const char *file
if (pp) p = pp + 1;
else break;
}
+
+if (file) ext = strrchr(file, '.');
+if (encoding && ext && !strcasecmp(ext, ".tgv"))
+ {
+ if (!strcmp(encoding, "auto"))
+ want_cspace = -1;
+ else if (!strcmp(encoding, "etc1"))
+ want_cspace = EVAS_COLORSPACE_ETC1;
+ else if (!strcmp(encoding, "etc2"))
+ {
+ if (!ENFN->image_alpha_get(ENDT, pixels))
+want_cspace = EVAS_COLORSPACE_RGB8_ETC2;
+ else
+want_cspace = EVAS_COLORSPACE_RGBA8_ETC2_EAC;
+ }
+ else if (!strcmp(encoding, "etc1+alpha"))
+ want_cspace = EVAS_COLORSPACE_ETC1_ALPHA;
+ }
+else
+ {
+ free(encoding);
+ encoding = NULL;
+ }
+ }
+
+ if (!ENFN->image_data_has)
+ pixels = ENFN->image_data_get(ENDT, pixels, 0, &data, &o->load_error,
&tofree);
+ else
+ {
+if (ENFN->image_data_has(ENDT, pixels, &cspace))
+ {
+ if ((want_cspace != (int) cspace) && (want_cspace != -1))
+ cspace = EVAS_COLORSPACE_ARGB;
+ }
+else
+ {
+ cspace = ENFN->image_file_colorspace_get(ENDT, pixels);
+ if ((want_cspace != (int) cspace) && (want_cspace != -1))
+ cspace = EVAS_COLORSPACE_ARGB;
+ else
+ {
+ ENFN->image_colorspace_set(ENDT, pixels, cspace);
+ no_convert = EINA_TRUE;
+ }
+ }
+pixels = ENFN->image_data_get(ENDT, pixels, 0, &data, &o->load_error,
&tofree);
+ }
+
+ if (!pixels)
+ {
+WRN("Could not get image pixels.");
+return EINA_FALSE;
+ }
+
+ switch (cspace)
+ {
+ case EVAS_COLORSPACE_ARGB:
+break;
+ case EVAS_COLORSPACE_ETC1:
+ case EVAS_COLORSPACE_ETC1_ALPHA:
+ case EVAS_COLORSPACE_RGB8_ETC2:
+ case EVAS_COLORSPACE_RGBA8_ETC2_EAC:
+break;
+ default:
+DBG("Need to convert
[EGIT] [core/efl] master 03/13: Evas GL: Fix linking to 'context_restore_set'
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b80d7fa302cf73150235d0f3ff64af624daaa1a8
commit b80d7fa302cf73150235d0f3ff64af624daaa1a8
Author: Jean-Philippe Andre
Date: Fri Nov 6 15:28:12 2015 +0900
Evas GL: Fix linking to 'context_restore_set'
There was a terribly complex mechanism to call this function
from the gl_x11 engine to gl_common (evas gl core)... and it
simply didn't work because the function pointer would be NULL.
---
src/modules/evas/engines/gl_common/evas_gl_common.h | 1 -
src/modules/evas/engines/gl_common/evas_gl_core.c | 4 ++--
src/modules/evas/engines/gl_common/evas_gl_core.h | 1 +
src/modules/evas/engines/gl_x11/evas_engine.c | 2 --
src/modules/evas/engines/gl_x11/evas_engine.h | 2 --
src/modules/evas/engines/gl_x11/evas_x_main.c | 12 +++-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 118bf9f..115ca28 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -872,6 +872,5 @@ _comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y,
int w, int h, int fmt
extern Eina_Bool _need_context_restore;
extern void _context_restore(void);
-EAPI void evas_gl_context_restore_set(Eina_Bool enable);
#endif
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 6a03ac3..ef012cf 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -2954,8 +2954,8 @@ evgl_direct_partial_render_end()
}
}
-void
-evas_gl_context_restore_set(Eina_Bool enable)
+EAPI void
+evas_gl_common_context_restore_set(Eina_Bool enable)
{
_need_context_restore = enable;
}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.h
b/src/modules/evas/engines/gl_common/evas_gl_core.h
index 7c321e2..8939cdb 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.h
@@ -47,6 +47,7 @@ EAPI void evgl_engine_shutdown(void *eng_data);
EAPI void*evgl_native_surface_buffer_get(EVGL_Surface *sfc, Eina_Bool
*is_egl_image);
EAPI int evgl_native_surface_yinvert_get(EVGL_Surface *sfc);
EAPI void*evgl_current_native_context_get(EVGL_Context *ctx);
+EAPI void evas_gl_common_context_restore_set(Eina_Bool);
typedef void (*EVGL_Engine_Call)(void *eng_data);
typedef void *(*EVGL_Native_Surface_Call)(void *sfc, Eina_Bool *is_egl_image);
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index d0a7de7..9723e1f 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -75,7 +75,6 @@ glsym_func_void glsym_evas_gl_common_shaders_flush = NULL;
glsym_func_void glsym_evas_gl_common_error_set = NULL;
glsym_func_int glsym_evas_gl_common_error_get = NULL;
glsym_func_void_ptr glsym_evas_gl_common_current_context_get = NULL;
-void (*glsym_evas_gl_context_restore_set) (Eina_Bool enable) = NULL;
#ifdef GL_GLES
@@ -1233,7 +1232,6 @@ gl_symbols(void)
LINK2GENERIC(evas_gl_common_error_get);
LINK2GENERIC(evas_gl_common_error_set);
LINK2GENERIC(evas_gl_common_current_context_get);
- LINK2GENERIC(evas_gl_context_restore_set);
LINK2GENERIC(evas_gl_common_shaders_flush);
#ifdef GL_GLES
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h
b/src/modules/evas/engines/gl_x11/evas_engine.h
index 1c214ce..3ef4054 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -219,6 +219,4 @@ Eina_Bool __glXMakeContextCurrent(Display *disp,
GLXDrawable glxwin,
GLXContext context);
#endif
-extern void (*glsym_evas_gl_context_restore_set) (Eina_Bool enable);
-
#endif
diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
b/src/modules/evas/engines/gl_x11/evas_x_main.c
index d2a0617..d6073aa 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -1,11 +1,15 @@
#include "evas_engine.h"
#include "../gl_common/evas_gl_define.h"
+#include
-# define SET_RESTORE_CONTEXT() do { if (glsym_evas_gl_context_restore_set)
glsym_evas_gl_context_restore_set(EINA_TRUE); } while(0)
+# define SET_RESTORE_CONTEXT() do { if
(glsym_evas_gl_common_context_restore_set)
glsym_evas_gl_common_context_restore_set(EINA_TRUE); } while(0)
static Eina_TLS _outbuf_key = 0;
static Eina_TLS _context_key = 0;
+typedef void (*glsym_func_void) ();
+glsym_func_void glsym_evas_gl_common_context_restore_set = NULL;
+
#ifdef GL_GLES
typedef EGLContext GLContext;
typedef EGLConfig GLConfig;
@@ -38,6 +42,12 @@ eng_init(void)
if
[EGIT] [core/efl] master 12/13: Efl.h: Add minor comment (doc)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=35056500467355e32e886b1f2a95b040f11fe2f7 commit 35056500467355e32e886b1f2a95b040f11fe2f7 Author: Jean-Philippe Andre Date: Tue Nov 3 12:02:56 2015 +0900 Efl.h: Add minor comment (doc) --- src/lib/efl/Efl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 7a2ea8f..8358a1f 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -95,6 +95,7 @@ typedef enum _Efl_Gfx_Join /** * Type defining gradient stop. + * @note Describe the location and color of a transition point in a gradient. * @since 1.14 */ typedef struct _Efl_Gfx_Gradient_Stop Efl_Gfx_Gradient_Stop; --
[EGIT] [core/efl] master 06/13: Evas GL: Save all binary shaders during idle_flush
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c70ba9e13bd8dcdb892f666fbeb354e84b13eb31
commit c70ba9e13bd8dcdb892f666fbeb354e84b13eb31
Author: Jean-Philippe Andre
Date: Fri Nov 6 17:06:17 2015 +0900
Evas GL: Save all binary shaders during idle_flush
---
.../evas/engines/gl_common/evas_gl_common.h| 4 ++-
.../evas/engines/gl_common/evas_gl_shader.c| 37 ++
src/modules/evas/engines/gl_x11/evas_engine.c | 4 +--
3 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 342189a..307aa6a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -198,6 +198,8 @@ struct _Evas_GL_Shared
int foc, z0, px, py;
int ax, ay;
GLfloat proj[16];
+
+ Eina_Bool needs_shaders_flush : 1;
};
typedef enum _Shader_Sampling Shader_Sampling;
@@ -594,7 +596,7 @@ void
evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *g
int evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
void evas_gl_common_shader_program_shutdown(Evas_GL_Shared
*shared);
-EAPI void evas_gl_common_shaders_flush(void);
+EAPI void evas_gl_common_shaders_flush(Evas_GL_Shared *shared);
Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc,
Shader_Type type,
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 02c1a3f..08f04d4 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -515,6 +515,7 @@ evas_gl_common_shader_generate_and_compile(Evas_GL_Shared
*shared, unsigned int
p = evas_gl_common_shader_compile(flags, vertex, fragment);
if (p)
{
+shared->needs_shaders_flush = 1;
evas_gl_common_shader_textures_bind(p);
eina_hash_add(shared->shaders_hash, &flags, p);
}
@@ -584,23 +585,45 @@ evas_gl_common_shader_program_init(Evas_GL_Shared *shared)
p = eina_hash_find(shared->shaders_hash, &autoload[i]);
if (p) p->delete_me = 0;
}
-evas_gl_common_shaders_flush();
+evas_gl_common_shaders_flush(shared);
}
return 1;
}
EAPI void
-evas_gl_common_shaders_flush(void)
+evas_gl_common_shaders_flush(Evas_GL_Shared *shared)
{
- if (compiler_released) return;
- compiler_released = EINA_TRUE;
+
+ if (!shared) return;
+ if (!compiler_released)
+ {
+compiler_released = EINA_TRUE;
#ifdef GL_GLES
- glReleaseShaderCompiler();
+glReleaseShaderCompiler();
#else
- if (glsym_glReleaseShaderCompiler)
- glsym_glReleaseShaderCompiler();
+if (glsym_glReleaseShaderCompiler)
+ glsym_glReleaseShaderCompiler();
#endif
+ }
+ if (shared->needs_shaders_flush)
+ {
+Eina_List *to_delete = NULL;
+Eina_Iterator *it;
+Evas_GL_Program *p;
+
+_evas_gl_common_shader_binary_save(shared);
+
+it = eina_hash_iterator_data_new(shared->shaders_hash);
+EINA_ITERATOR_FOREACH(it, p)
+ {
+ if (p->delete_me)
+ to_delete = eina_list_append(to_delete, p);
+ }
+
+EINA_LIST_FREE(to_delete, p)
+ eina_hash_del(shared->shaders_hash, &p->flags, p);
+ }
}
void
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 9723e1f..75a3892 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1485,10 +1485,10 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
}
static void
-eng_outbuf_idle_flush(Outbuf *ob EINA_UNUSED)
+eng_outbuf_idle_flush(Outbuf *ob)
{
if (glsym_evas_gl_common_shaders_flush)
- glsym_evas_gl_common_shaders_flush();
+ glsym_evas_gl_common_shaders_flush(ob->gl_context->shared);
}
static void
--
[EGIT] [core/efl] master 04/13: Evas GL: Delete shaders after linking programs
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=31b8fd16499e7a71afe43b9859fe312e2706d15b
commit 31b8fd16499e7a71afe43b9859fe312e2706d15b
Author: Jean-Philippe Andre
Date: Fri Nov 6 15:33:08 2015 +0900
Evas GL: Delete shaders after linking programs
The shaders eat up some memory and we don't need them after linking
the shader program.
---
src/modules/evas/engines/gl_common/evas_gl_common.h | 5 ++---
src/modules/evas/engines/gl_common/evas_gl_shader.c | 11 +--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 115ca28..0d7b21e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -97,10 +97,9 @@ typedef Eina_Bool (*evas_gl_make_current_cb)(void
*engine_data, void *doit);
struct _Evas_GL_Program
{
- GLuint vert, frag, prog;
- unsigned int flags, hitcount;
+ unsigned int flags, hitcount, tex_count;
+ GLuint prog;
- int tex_count;
Eina_Bool reset : 1;
Eina_Bool bin_saved : 1;
};
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index df3d396..89ceff0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -163,13 +163,13 @@ _evas_gl_common_shader_program_binary_load(Eet_File *ef,
unsigned int flags)
p = calloc(1, sizeof(*p));
p->flags = flags;
p->prog = prg;
- p->vert = vtx;
- p->frag = frg;
p->reset = EINA_TRUE;
p->bin_saved = EINA_TRUE;
evas_gl_common_shader_textures_bind(p);
finish:
+ if (vtx) glDeleteShader(vtx);
+ if (frg) glDeleteShader(frg);
free(formats);
if (!direct) free(data);
return p;
@@ -330,8 +330,6 @@ static void
_shaders_hash_free_cb(void *data)
{
Evas_GL_Program *p = data;
- if (p->vert) glDeleteShader(p->vert);
- if (p->frag) glDeleteShader(p->frag);
if (p->prog) glDeleteProgram(p->prog);
free(p);
}
@@ -613,10 +611,11 @@ evas_gl_common_shader_compile(unsigned int flags, const
char *vertex,
p = calloc(1, sizeof(*p));
p->flags = flags;
p->prog = prg;
- p->vert = vtx;
- p->frag = frg;
p->reset = EINA_TRUE;
+ glDeleteShader(vtx);
+ glDeleteShader(frg);
+
return p;
}
--
[EGIT] [core/efl] master 09/13: Edje: Directly embed TGV files inside EDJ when possible
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a5d02848202475d87621fb61ce7a3e8dcecc11f5
commit a5d02848202475d87621fb61ce7a3e8dcecc11f5
Author: Jean-Philippe Andre
Date: Fri Oct 30 16:41:03 2015 +0900
Edje: Directly embed TGV files inside EDJ when possible
This checks that the ETC format is the same, and then proceeds
to simply stuff in the TGV file inside the EDJ as an "edje/image/n"
This will save a huge amount of time since now you just need
to encode an image once to TGV (ETC1 or ETC2) and you can reuse it
directly without re-encoding.
To use this, convert images with ecore_evas_convert and then
add them to EDC with the ".tgv" extension and the proper LOSSY format.
The quality argument will then be ignored.
@feature
---
src/bin/edje/edje_cc_out.c | 252 ++---
1 file changed, 193 insertions(+), 59 deletions(-)
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 2a31b3f..fb7a9ee 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -151,6 +151,9 @@ struct _Image_Write
Eet_File *ef;
Edje_Image_Directory_Entry *img;
Evas_Object *im;
+ Emile_Image_Property prop;
+ Eina_File *f;
+ Emile_Image *emi;
int w, h;
int alpha;
unsigned int *data;
@@ -1061,7 +1064,7 @@ data_thread_image_end(void *data, Ecore_Thread *thread
EINA_UNUSED)
error_and_abort(iw->ef, iw->errstr);
free(iw->errstr);
}
- if (iw->path) free(iw->path);
+ free(iw->path);
evas_object_del(iw->im);
free(iw);
}
@@ -1084,6 +1087,127 @@ data_image_preload_done(void *data, Evas *e
EINA_UNUSED, Evas_Object *o, void *e
}
static void
+tgv_file_thread(void *data, Ecore_Thread *thread EINA_UNUSED)
+{
+ Image_Write *iw = data;
+ char buf[256];
+ size_t len;
+
+ snprintf(buf, sizeof(buf), "edje/images/%i", iw->img->id);
+
+ len = eina_file_size_get(iw->f);
+ eet_write_cipher(iw->ef, buf, iw->data, len, EINA_FALSE /*!no_comp*/, NULL);
+}
+
+static void
+tgv_file_thread_end(void *data, Ecore_Thread *thread EINA_UNUSED)
+{
+ Image_Write *iw = data;
+
+ pending_threads--;
+ if (pending_threads <= 0) ecore_main_loop_quit();
+ if (iw->errstr)
+ {
+error_and_abort(iw->ef, iw->errstr);
+free(iw->errstr);
+ }
+ free(iw->path);
+ emile_image_close(iw->emi);
+ eina_file_map_free(iw->f, iw->data);
+ eina_file_close(iw->f);
+ free(iw);
+}
+
+static Eina_Bool
+tgv_file_check_and_add(Eet_File *ef, Edje_Image_Directory_Entry *img, int
*image_num)
+{
+ Emile_Image_Load_Error err;
+ Emile_Image *emi = NULL;
+ Image_Write *iw = NULL;
+ Eina_List *li;
+ const char *s;
+ Eina_File *f;
+ void *data;
+
+ EINA_LIST_FOREACH(img_dirs, li, s)
+ {
+char buf[PATH_MAX];
+snprintf(buf, sizeof(buf), "%s/%s", s, img->entry);
+f = eina_file_open(buf, EINA_FALSE);
+if (f) break;
+ }
+ if (!f) return EINA_FALSE;
+
+ data = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
+ if (!data) goto on_error;
+
+ using_file(img->entry, 'I');
+
+ emi = emile_image_tgv_file_open(f, NULL, NULL, &err);
+ if (!emi || (err != EMILE_IMAGE_LOAD_ERROR_NONE)) goto on_error;
+
+ iw = calloc(1, sizeof(*iw));
+
+ if (!emile_image_head(emi, &iw->prop, sizeof(iw->prop), &err) ||
+ (err != EMILE_IMAGE_LOAD_ERROR_NONE))
+ goto on_error;
+
+ if (!iw->prop.cspaces || !iw->prop.w || !iw->prop.h)
+ goto on_error;
+
+ iw->f = f;
+ iw->ef = ef;
+ iw->img = img;
+ iw->emi = emi;
+ iw->data = (unsigned int *) data;
+ iw->w = iw->prop.w;
+ iw->h = iw->prop.h;
+
+ iw->prop.cspace = iw->prop.cspaces[0];
+ if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1)
+ {
+if (no_etc1) goto on_error;
+if (iw->prop.cspace == EMILE_COLORSPACE_ETC1)
+ iw->alpha = 0;
+else if (iw->prop.cspace == EMILE_COLORSPACE_ETC1_ALPHA)
+ iw->alpha = 1;
+else
+ goto on_error;
+ }
+ else if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2)
+ {
+if (no_etc2) goto on_error;
+if (iw->prop.cspace == EMILE_COLORSPACE_RGB8_ETC2)
+ iw->alpha = 0;
+else if (iw->prop.cspace == EMILE_COLORSPACE_RGBA8_ETC2_EAC)
+ iw->alpha = 1;
+else
+ goto on_error;
+ }
+
+ *image_num += 1;
+ iw->path = strdup(img->entry);
+
+ pending_threads++;
+ if (threads)
+ ecore_thread_run(tgv_file_thread, tgv_file_thread_end, NULL, iw);
+ else
+ {
+tgv_file_thread(iw, NULL);
+tgv_file_thread_end(iw, NULL);
+ }
+
+ return EINA_TRUE;
+
+on_error:
+ free(iw);
+ emile_image_close(emi);
+ if (data) eina_file_map_free(f, data);
+ eina_file_close(f);
+ return EINA_FALSE;
+}
+
+static void
data_write_images(Eet_File *ef, int *image_num)
{
int i;
@@ -1101,73 +1225,83 @@ data_
[EGIT] [core/efl] master 13/13: Eina: Micro-optimize eina_main_loop_is
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d99ca361de44136bc105c11bc089ec9dbf420279
commit d99ca361de44136bc105c11bc089ec9dbf420279
Author: Jean-Philippe Andre
Date: Fri Nov 6 18:34:50 2015 +0900
Eina: Micro-optimize eina_main_loop_is
This is useful when Eo calls it to get the current frame stack.
This improves the performance of this function by ~50% which meant
from ~3% total CPU time to ~1.5% CPU time (if called at each eo_do).
Now this patch is a bit irrelevant since eo uses __thread instead.
This optimization is still useful for evas_eglGetCurrentXXX.
---
src/lib/eina/eina_main.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 1daa795..ffb0177 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -416,7 +416,13 @@ EAPI Eina_Bool
eina_main_loop_is(void)
{
#ifdef EFL_HAVE_THREADS
- if (pthread_equal(_eina_main_loop, pthread_self()))
+# ifdef __GNUC__
+ /* pthread_self() can't be optimized, it's a single asm "movl" */
+ if (__builtin_types_compatible_p(pthread_t, unsigned long int))
+ return (pthread_self() == _eina_main_loop);
+ else
+# endif
+ if (pthread_equal(_eina_main_loop, pthread_self()))
return EINA_TRUE;
#endif
return EINA_FALSE;
--
[EGIT] [core/efl] master 05/13: Evas GL: Precompile common shaders
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0ba13ae7a245b269378b3bc6c12abc78c5929362
commit 0ba13ae7a245b269378b3bc6c12abc78c5929362
Author: Jean-Philippe Andre
Date: Fri Nov 6 16:35:41 2015 +0900
Evas GL: Precompile common shaders
The whole list contains 238 shaders. That's a bit too many, but they
really just take up only ~270K on disk (24Mb of uncompressed data).
---
.../evas/engines/gl_common/evas_gl_common.h| 1 +
.../evas/engines/gl_common/evas_gl_shader.c| 356 ++---
2 files changed, 240 insertions(+), 117 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 0d7b21e..342189a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -102,6 +102,7 @@ struct _Evas_GL_Program
Eina_Bool reset : 1;
Eina_Bool bin_saved : 1;
+ Eina_Bool delete_me : 1;
};
struct _Evas_GL_Shared
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 89ceff0..02c1a3f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -4,9 +4,12 @@
#define SHADER_FLAG_SAM_BITSHIFT 3
#define SHADER_FLAG_MASKSAM_BITSHIFT 6
-#define SHADER_PROG_NAME_FMT "prog_%08x"
+#define SHADER_PROG_NAME_FMT "/shader/%08x"
#define SHADER_BINARY_EET_COMPRESS 1
+#define P(i) ((void*)(intptr_t)i)
+#define I(p) ((int)(intptr_t)p)
+
#ifdef WORDS_BIGENDIAN
# define BASEFLAG SHADER_FLAG_BIGENDIAN;
#else
@@ -326,14 +329,226 @@ error:
return 0;
}
-static void
-_shaders_hash_free_cb(void *data)
+static inline void
+_program_del(Evas_GL_Program *p)
{
- Evas_GL_Program *p = data;
if (p->prog) glDeleteProgram(p->prog);
free(p);
}
+static void
+_shaders_hash_free_cb(void *data)
+{
+ _program_del(data);
+}
+
+static char *
+evas_gl_common_shader_glsl_get(unsigned int flags, const char *base)
+{
+ Eina_Strbuf *s = eina_strbuf_new();
+ unsigned int k;
+ char *str;
+
+ for (k = 0; k < SHADER_FLAG_COUNT; k++)
+ {
+if (flags & (1 << k))
+ eina_strbuf_append_printf(s, "#define SHD_%s\n", _shader_flags[k]);
+ }
+
+ eina_strbuf_append(s, base);
+ str = eina_strbuf_string_steal(s);
+ eina_strbuf_free(s);
+ return str;
+}
+
+static Evas_GL_Program *
+evas_gl_common_shader_compile(unsigned int flags, const char *vertex,
+ const char *fragment)
+{
+ Evas_GL_Program *p;
+ GLuint vtx, frg, prg;
+ GLint ok = 0;
+
+ compiler_released = EINA_FALSE;
+ vtx = glCreateShader(GL_VERTEX_SHADER);
+ frg = glCreateShader(GL_FRAGMENT_SHADER);
+
+ glShaderSource(vtx, 1, &vertex, NULL);
+ glCompileShader(vtx);
+ glGetShaderiv(vtx, GL_COMPILE_STATUS, &ok);
+ if (!ok)
+ {
+gl_compile_link_error(vtx, "compile vertex shader");
+ERR("Abort compile of vertex shader:\n%s", vertex);
+glDeleteShader(vtx);
+return NULL;
+ }
+ ok = 0;
+
+ glShaderSource(frg, 1, &fragment, NULL);
+ glCompileShader(frg);
+ glGetShaderiv(frg, GL_COMPILE_STATUS, &ok);
+ if (!ok)
+ {
+gl_compile_link_error(frg, "compile fragment shader");
+ERR("Abort compile of fragment shader:\n%s", fragment);
+glDeleteShader(vtx);
+glDeleteShader(frg);
+return NULL;
+ }
+ ok = 0;
+
+ prg = glCreateProgram();
+#ifndef GL_GLES
+ if ((glsym_glGetProgramBinary) && (glsym_glProgramParameteri))
+ glsym_glProgramParameteri(prg, GL_PROGRAM_BINARY_RETRIEVABLE_HINT,
GL_TRUE);
+#endif
+ glAttachShader(prg, vtx);
+ glAttachShader(prg, frg);
+
+ glBindAttribLocation(prg, SHAD_VERTEX, "vertex");
+ glBindAttribLocation(prg, SHAD_COLOR, "color");
+ glBindAttribLocation(prg, SHAD_TEXUV, "tex_coord");
+ glBindAttribLocation(prg, SHAD_TEXUV2, "tex_coord2");
+ glBindAttribLocation(prg, SHAD_TEXUV3, "tex_coord3");
+ glBindAttribLocation(prg, SHAD_TEXA,"tex_coorda");
+ glBindAttribLocation(prg, SHAD_TEXSAM, "tex_sample");
+ glBindAttribLocation(prg, SHAD_MASK,"mask_coord");
+ glBindAttribLocation(prg, SHAD_MASKSAM, "tex_masksample");
+
+ glLinkProgram(prg);
+ glGetProgramiv(prg, GL_LINK_STATUS, &ok);
+ if (!ok)
+ {
+gl_compile_link_error(prg, "link fragment and vertex shaders");
+ERR("Abort compile of shader (flags: %08x)", flags);
+glDeleteShader(vtx);
+glDeleteShader(frg);
+glDeleteProgram(prg);
+return 0;
+ }
+
+ p = calloc(1, sizeof(*p));
+ p->flags = flags;
+ p->prog = prg;
+ p->reset = EINA_TRUE;
+
+ glDeleteShader(vtx);
+ glDeleteShader(frg);
+
+ return p;
+}
+
+static Eina_List *
+evas_gl_common_shader_precompile_list(Evas_GL_Shared *shared)
+{
+ int bgra, mask, sam, masksam, img, nomul, afill, yuv;
+ Eina_
[EGIT] [core/efl] master 07/13: Evas GL: Optimize out calls to eglGetCurrent from the main loop
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c55c7c0a0d3330c9a8a555b1001465df593f0017
commit c55c7c0a0d3330c9a8a555b1001465df593f0017
Author: Jean-Philippe Andre
Date: Fri Nov 6 17:50:22 2015 +0900
Evas GL: Optimize out calls to eglGetCurrent from the main loop
This is an optimization for EGL only and for the main loop only.
eglGetCurrent{Display,Context,Surface} are expensive calls (they
shouldn't be, but they are). eglMakeCurrent is also very expensive,
so we want as much as possible to avoid calling those functions.
Store the pointers for the main loop as static variables.
Valgrind stats for a quick scrolling session in elm_test:
Before this patch:
- eglGetCurrentContext ~ 0.4%
- eglGetCurrentDisplay ~ 0.4%
After this patch:
- evas_eglGetCurrentContext ~ 0.02%
- evas_eglGetCurrentDisplay ~ 0.02%
---
src/modules/evas/engines/gl_x11/evas_engine.c | 88 +--
src/modules/evas/engines/gl_x11/evas_engine.h | 7 ++-
src/modules/evas/engines/gl_x11/evas_x_main.c | 34 +--
3 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 75a3892..0d12b74 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -158,6 +158,65 @@ evgl_eng_evas_surface_get(void *data)
return NULL;
}
+#ifdef GL_GLES
+static EGLDisplay main_dpy = EGL_NO_DISPLAY;
+static EGLSurface main_draw = EGL_NO_SURFACE;
+static EGLSurface main_read = EGL_NO_SURFACE;
+static EGLContext main_ctx = EGL_NO_CONTEXT;
+
+EGLContext
+evas_eglGetCurrentContext(void)
+{
+ if (eina_main_loop_is())
+ return main_ctx;
+ else
+ return eglGetCurrentContext();
+}
+
+EGLSurface
+evas_eglGetCurrentSurface(EGLint readdraw)
+{
+ if (eina_main_loop_is())
+ return (readdraw == EGL_READ) ? main_read : main_draw;
+ else
+ return eglGetCurrentSurface(readdraw);
+}
+
+EGLDisplay
+evas_eglGetCurrentDisplay(void)
+{
+ if (eina_main_loop_is())
+ return main_dpy;
+ else
+ return eglGetCurrentDisplay();
+}
+
+EGLBoolean
+evas_eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read,
EGLContext ctx)
+{
+ if (eina_main_loop_is())
+ {
+EGLBoolean ret;
+
+if ((dpy == main_dpy) && (draw == main_draw) &&
+(read == main_read) && (ctx == main_ctx))
+ return 1;
+
+ret = eglMakeCurrent(dpy, draw, read, ctx);
+if (ret)
+ {
+ main_dpy = dpy;
+ main_draw = draw;
+ main_read = read;
+ main_ctx = ctx;
+ }
+return ret;
+ }
+ else
+ return eglMakeCurrent(dpy, draw, read, ctx);
+}
+#endif
+
static int
evgl_eng_make_current(void *data, void *surface, void *context, int flush)
{
@@ -172,7 +231,6 @@ evgl_eng_make_current(void *data, void *surface, void
*context, int flush)
return 0;
}
-
#ifdef GL_GLES
EGLContext ctx = (EGLContext)context;
EGLSurface sfc = (EGLSurface)surface;
@@ -180,25 +238,21 @@ evgl_eng_make_current(void *data, void *surface, void
*context, int flush)
if ((!context) && (!surface))
{
-if (!eglGetCurrentContext() &&
-!eglGetCurrentSurface(EGL_READ) &&
-!eglGetCurrentSurface(EGL_DRAW))
- return 1;
-ret = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
+ret = evas_eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
if (!ret)
{
int err = eglGetError();
glsym_evas_gl_common_error_set(err - EGL_SUCCESS);
- ERR("eglMakeCurrent() failed! Error Code=%#x", err);
+ ERR("evas_eglMakeCurrent() failed! Error Code=%#x", err);
return 0;
}
return 1;
}
// FIXME: Check (eglGetCurrentDisplay() != dpy) ?
- if ((eglGetCurrentContext() != ctx) ||
- (eglGetCurrentSurface(EGL_READ) != sfc) ||
- (eglGetCurrentSurface(EGL_DRAW) != sfc) )
+ if ((evas_eglGetCurrentContext() != ctx) ||
+ (evas_eglGetCurrentSurface(EGL_READ) != sfc) ||
+ (evas_eglGetCurrentSurface(EGL_DRAW) != sfc) )
{
// Does it need to be flushed with it's set to NULL above??
@@ -206,13 +260,13 @@ evgl_eng_make_current(void *data, void *surface, void
*context, int flush)
if (flush) eng_window_use(NULL);
// Do a make current
-ret = eglMakeCurrent(dpy, sfc, sfc, ctx);
+ret = evas_eglMakeCurrent(dpy, sfc, sfc, ctx);
if (!ret)
{
int err = eglGetError();
glsym_evas_gl_common_error_set(err - EGL_SUCCESS);
- ERR("eglMakeCurrent() failed! Error Code=%#x", err);
+ ERR("evas_eglMakeCurrent() failed! Error Code=%#x", err);
[EGIT] [core/efl] master 02/13: Evas GL: Release shader compiler during evas_render_idle_flush
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c22c25c9efd6eac5bfc4929dc25eb0b08c3b1ff0
commit c22c25c9efd6eac5bfc4929dc25eb0b08c3b1ff0
Author: Jean-Philippe Andre
Date: Fri Nov 6 14:53:33 2015 +0900
Evas GL: Release shader compiler during evas_render_idle_flush
It is safe to release the compiler at any time since the next
call to glCompileShader will restore it. This may even be a no-op
for all we know (this is driver-dependent).
---
src/modules/evas/engines/gl_cocoa/evas_engine.c | 5 -
src/modules/evas/engines/gl_common/evas_gl_common.h | 2 +-
src/modules/evas/engines/gl_common/evas_gl_context.c | 1 -
src/modules/evas/engines/gl_common/evas_gl_shader.c | 12 +++-
src/modules/evas/engines/gl_x11/evas_engine.c| 15 ---
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 8597b05..56d41eb 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -309,11 +309,6 @@ eng_output_flush(void *data, Evas_Render_Mode render_mode)
}
static void
-eng_output_idle_flush(void *data EINA_UNUSED)
-{
-}
-
-static void
eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y,
int w, int h)
{
evas_common_draw_context_add_cutout(context, x, y, w, h);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index c143584..118bf9f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -593,8 +593,8 @@ void
evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *g
Evas_Colorspace cspace);
int evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
-void evas_gl_common_shader_program_init_done(void);
void evas_gl_common_shader_program_shutdown(Evas_GL_Shared
*shared);
+EAPI void evas_gl_common_shaders_flush(void);
Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc,
Shader_Type type,
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 58ec6fe..d39be5a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -933,7 +933,6 @@ evas_gl_common_context_new(void)
if (gc->state.current.prog)
glUseProgram(gc->state.current.prog->prog);
-evas_gl_common_shader_program_init_done();
// in shader:
// uniform sampler2D tex[8];
//
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 715a045..df3d396 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -60,7 +60,8 @@ static const char *_shader_flags[SHADER_FLAG_COUNT] = {
"RGB_A_PAIR"
};
-/
+static Eina_Bool compiler_released = EINA_FALSE;
+
static void
gl_compile_link_error(GLuint target, const char *action)
{
@@ -363,11 +364,11 @@ evas_gl_common_shader_program_init(Evas_GL_Shared *shared)
return 1;
}
-void
-evas_gl_common_shader_program_init_done(void)
+EAPI void
+evas_gl_common_shaders_flush(void)
{
-#warning FIXME: Disabled compiler unload for now.
- return;
+ if (compiler_released) return;
+ compiler_released = EINA_TRUE;
#ifdef GL_GLES
glReleaseShaderCompiler();
#else
@@ -550,6 +551,7 @@ evas_gl_common_shader_compile(unsigned int flags, const
char *vertex,
GLuint vtx, frg, prg;
GLint ok = 0;
+ compiler_released = EINA_FALSE;
vtx = glCreateShader(GL_VERTEX_SHADER);
frg = glCreateShader(GL_FRAGMENT_SHADER);
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 7713c21..d0a7de7 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -71,6 +71,7 @@ Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock
= NULL;
Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock = NULL;
Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_relax = NULL;
+glsym_func_void glsym_evas_gl_common_shaders_flush = NULL;
glsym_func_void glsym_evas_gl_common_error_set = NULL;
glsym_func_int glsym_evas_gl_common_error_get = NULL;
glsym_func_void_ptr glsym_evas_gl_common_current_context_get = NULL;
@@ -1200,7 +1201,8 @@ gl_symbols(void)
if (done) return;
#define LINK2GENERIC(sym) \
- glsym_##sym = dlsym(RTLD_DEFAULT, #sym);
+ glsym_##sym = dlsym(RTLD_DEFAULT
[EGIT] [core/efl] master 08/13: Evas: Add some internal engine APIs
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=64de2f6ce505283ee3de8d69297b7f39e7e5a2d6
commit 64de2f6ce505283ee3de8d69297b7f39e7e5a2d6
Author: Jean-Philippe Andre
Date: Thu Oct 29 21:46:08 2015 +0900
Evas: Add some internal engine APIs
- image_file_colorspace_get
This will be used to determine the best loading format, especially
targeted at edje_cc / edje_decc so we can avoid ETC re-encoding.
- image_data_has
Checks whether the image is currently loaded in (CPU) memory,
and also returns the current colorspace.
---
src/lib/evas/include/evas_private.h| 3 +-
src/modules/evas/engines/gl_cocoa/evas_engine.c| 45 --
src/modules/evas/engines/gl_generic/evas_engine.c | 28 --
.../evas/engines/software_generic/evas_engine.c| 28 --
4 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 6d2019f..f237a2e 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1311,6 +1311,7 @@ struct _Evas_Func
void *(*image_dirty_region) (void *data, void *image, int x,
int y, int w, int h);
void *(*image_data_get) (void *data, void *image, int
to_write, DATA32 **image_data, int *err, Eina_Bool *tofree);
void *(*image_data_put) (void *data, void *image, DATA32
*image_data);
+ Eina_Bool (*image_data_has) (void *data, void *image,
Evas_Colorspace *cspace);
void (*image_data_preload_request) (void *data, void *image, const Eo
*target);
void (*image_data_preload_cancel) (void *data, void *image, const Eo
*target);
void *(*image_alpha_set)(void *data, void *image, int
has_alpha);
@@ -1321,9 +1322,9 @@ struct _Evas_Func
void (*image_border_get) (void *data, void *image, int *l,
int *r, int *t, int *b);
Eina_Bool (*image_draw) (void *data, void *context, void
*surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x,
int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async);
char *(*image_comment_get) (void *data, void *image, char
*key);
- char *(*image_format_get) (void *data, void *image);
void (*image_colorspace_set)(void *data, void *image,
Evas_Colorspace cspace);
Evas_Colorspace (*image_colorspace_get) (void *data, void *image);
+ Evas_Colorspace (*image_file_colorspace_get)(void *data, void *image);
Eina_Bool (*image_can_region_get) (void *data, void *image);
void *(*image_native_set) (void *data, void *image, void
*native);
void *(*image_native_get) (void *data, void *image);
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 56d41eb..9c35280 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -377,10 +377,8 @@ eng_polygon_draw(void *data, void *context, void *surface
EINA_UNUSED, void *pol
static int
eng_image_alpha_get(void *data EINA_UNUSED, void *image)
{
- // Render_Engine *re;
Evas_GL_Image *im;
- // re = (Render_Engine *)data;
if (!image) return 1;
im = image;
return im->alpha;
@@ -389,10 +387,8 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image)
static Evas_Colorspace
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
{
- // Render_Engine *re;
Evas_GL_Image *im;
- // re = (Render_Engine *)data;
if (!image) return EVAS_COLORSPACE_ARGB;
im = image;
return im->cs.space;
@@ -450,42 +446,48 @@ eng_image_alpha_set(void *data, void *image, int
has_alpha)
static void *
eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED,
int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED)
{
- // Render_Engine *re;
- //
- // re = (Render_Engine *)data;
return image;
}
static void
eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l
EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED)
{
- // Render_Engine *re;
- //
- // re = (Render_Engine *)data;
}
static char *
eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key
EINA_UNUSED)
{
- // Render_Engine *re;
Evas_GL_Image *im;
- // re = (Render_Engine *)data;
if (!image) return NULL;
im = image;
if (!im->im) return NULL;
return im->im->info.comment;
}
-static char *
-eng_image_format_get(void *data EINA_UNUSED, void *image)
+static Evas_Colorspace
+eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image)
{
- // Render_Engine *re;
- Evas_GL_Image *im;
+ Evas_GL_Image *im = image;
- // re = (Render_Engine *)data;
- im = image;
[EGIT] [core/efl] master 01/01: Evas GL: Fix oopsie in the shaders selection
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9f7fc377ea06ecc91b2d98d72297a3d943da646a commit 9f7fc377ea06ecc91b2d98d72297a3d943da646a Author: Jean-Philippe Andre Date: Tue Nov 10 20:07:46 2015 +0900 Evas GL: Fix oopsie in the shaders selection Thanks @raster --- src/modules/evas/engines/gl_common/evas_gl_shader.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c index 08f04d4..c5ef0b9 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_shader.c +++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c @@ -668,7 +668,8 @@ evas_gl_common_shader_flags_get(Evas_GL_Shared *shared, Shader_Type type, sam = SHD_SAM21; else if (sh >= (h * 2)) sam = SHD_SAM12; -flags |= (1 << (SHADER_FLAG_SAM_BITSHIFT + sam - 1)); +if (sam) + flags |= (1 << (SHADER_FLAG_SAM_BITSHIFT + sam - 1)); } // mask downscale sampling @@ -680,7 +681,8 @@ evas_gl_common_shader_flags_get(Evas_GL_Shared *shared, Shader_Type type, masksam = SHD_SAM21; else if (mtex->h >= (mh * 2)) masksam = SHD_SAM12; -flags |= (1 << (SHADER_FLAG_MASKSAM_BITSHIFT + masksam - 1)); +if (masksam) + flags |= (1 << (SHADER_FLAG_MASKSAM_BITSHIFT + masksam - 1)); } switch (type) --
[EGIT] [core/efl] master 01/01: Revert "efl: Fix configure help message for cserve"
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4a2aa63894a0e111016697429b175533a424b82
commit c4a2aa63894a0e111016697429b175533a424b82
Author: Jean-Philippe Andre
Date: Fri Nov 13 11:45:42 2015 +0900
Revert "efl: Fix configure help message for cserve"
This reverts commit e83fae696056fb3e4b08484224cf215faa6274a5.
cserve2 is enabled by default at build time. It's disabled by
default at runtime. Basically it's always built but never used.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2b19fa3..0f7c83a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2120,7 +2120,7 @@ AC_CHECK_LIB([m], [lround],
# Evas cserve2
AC_ARG_ENABLE([cserve],
- [AS_HELP_STRING([--enable-cserve],[enable shared cache server (cserve2).
@<:@default=disabled@:>@])],
+ [AS_HELP_STRING([--enable-cserve],[enable shared cache server (cserve2).
@<:@default=enabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
want_evas_cserve2="yes"
--
[EGIT] [core/efl] master 01/01: Evas GL: Fix failing make check test case
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cc4b54ec0a69c43f5163addbb6a4f4a6615cb8c0
commit cc4b54ec0a69c43f5163addbb6a4f4a6615cb8c0
Author: Jean-Philippe Andre
Date: Mon Nov 16 19:43:16 2015 +0900
Evas GL: Fix failing make check test case
The version field was not properly set for GLES 1 and 3 (but not tested),
double free() could happen on the API structs, and empty API structs
could be returned.
---
src/modules/evas/engines/gl_common/evas_gl_api.c| 5 +
src/modules/evas/engines/gl_common/evas_gl_api_gles1.c | 2 ++
src/modules/evas/engines/gl_common/evas_gl_core.c | 6 +-
src/modules/evas/engines/software_generic/evas_engine.c | 13 -
4 files changed, 24 insertions(+), 2 deletions(-)
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 2c96a6c..e469fb3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -2467,6 +2467,9 @@ _evgl_api_gles2_get(Evas_GL_API *funcs, Eina_Bool debug)
static void
_normal_gles3_api_get(Evas_GL_API *funcs)
{
+ if (!funcs) return;
+ funcs->version = EVAS_GL_API_VERSION;
+
#define ORD(f) EVAS_API_OVERRIDE(f, funcs, evgl_)
// GLES 3.0 APIs that are same as GLES 2.0
ORD(glActiveTexture);
@@ -2727,6 +2730,8 @@ _normal_gles3_api_get(Evas_GL_API *funcs)
static void
_debug_gles3_api_get(Evas_GL_API *funcs)
{
+ if (!funcs) return;
+ funcs->version = EVAS_GL_API_VERSION;
#define ORD(f) EVAS_API_OVERRIDE(f, funcs, _evgld_)
// GLES 3.0 APIs that are same as GLES 2.0
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
index 4a2f7dd..28d4784 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
@@ -4018,6 +4018,7 @@ static void
_debug_gles1_api_get(Evas_GL_API *funcs)
{
if (!funcs) return;
+ funcs->version = EVAS_GL_API_VERSION;
#define ORD(name) EVAS_API_OVERRIDE(name, funcs, _evgld_gles1_)
/* Available only in Common profile */
@@ -4174,6 +4175,7 @@ static void
_normal_gles1_api_get(Evas_GL_API *funcs)
{
if (!funcs) return;
+ funcs->version = EVAS_GL_API_VERSION;
#define ORD(name) EVAS_API_OVERRIDE(name, funcs, _evgl_gles1_)
/* Available only in Common profile */
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 75b1b98..bf179bc 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1881,6 +1881,9 @@ evgl_engine_shutdown(void *eng_data)
if (gles1_funcs) free(gles1_funcs);
if (gles2_funcs) free(gles2_funcs);
if (gles3_funcs) free(gles3_funcs);
+ gles1_funcs = NULL;
+ gles2_funcs = NULL;
+ gles3_funcs = NULL;
// Destroy internal resources
_evgl_tls_resource_destroy(eng_data);
@@ -3053,7 +3056,8 @@ evgl_api_get(void *eng_data, Evas_GL_Context_Version
version, Eina_Bool alloc_on
api = gles3_funcs;
}
else return NULL;
- if (alloc_only) return api;
+ if (alloc_only && (api->version == EVAS_GL_API_VERSION))
+ return api;
#ifdef GL_GLES
if (!evgl_api_egl_ext_init(evgl_engine->funcs->proc_address_get,
evgl_engine->funcs->ext_string_get(eng_data)))
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index ecd96f18..3d26fc6 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -286,6 +286,8 @@ static void (*_sym_glViewport)
(GLint x, GLint
/* static void (*_sym_glGetProgramBinary)(GLuint a,
GLsizei b, GLsizei* c, GLenum* d, void* e) = NULL; */
/* static void (*_sym_glProgramBinary) (GLuint a,
GLenum b, const void* c, GLint d) = NULL; */
/* static void (*_sym_glProgramParameteri) (GLuint a,
GLuint b, GLint d) = NULL; */
+
+static int gl_lib_init(void);
#endif
// Threaded Render
@@ -3055,6 +3057,12 @@ eng_gl_context_create(void *data EINA_UNUSED, void
*share_context, int version,
Render_Engine_GL_Context *ctx;
Render_Engine_GL_Context *share_ctx;
+ if (!_tls_check() && !gl_lib_init())
+ {
+WRN("Failed to initialize Evas GL (with OSMesa)");
+return NULL;
+ }
+
if (version != EVAS_GL_GLES_2_X)
{
ERR("This engine only supports OpenGL-ES 2.0 contexts for now!");
@@ -3251,6 +3259,9 @@ eng_gl_api_get(void *data EINA_UNUSED, int version)
return NULL;
#ifdef EVAS_GL
+ if (!_tls_init)
+ gl_lib_init();
+
return &gl_funcs;
#else
return NULL;
@@ -4990,7 +5001,7 @@ evgl_glGetString(GLenum name)
static void
overr
[EGIT] [core/efl] master 01/03: Evas GL: Fix BadMatch with pbuffer make current
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f7aa6b33b059d11c6c41ec3c339e972dfb9ef415
commit f7aa6b33b059d11c6c41ec3c339e972dfb9ef415
Author: Jean-Philippe Andre
Date: Tue Nov 17 17:18:57 2015 +0900
Evas GL: Fix BadMatch with pbuffer make current
This is the kind of horrible things you'll encounter when working
with GL. The surface and context need to have matching configuration
otherwise make current will fail, and the only way to get a matching
config is to reuse the config selected to create the context. Gah.
This is the same fix as for EGL. More a hack than a fix, to be honest.
@fix
---
src/modules/evas/engines/gl_common/evas_gl_common.h | 3 +++
src/modules/evas/engines/gl_x11/evas_engine.c | 12 +++-
src/modules/evas/engines/gl_x11/evas_x_main.c | 3 +++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 202e81b..378a806 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -334,6 +334,9 @@ struct _Evas_Engine_GL_Context
// FIXME: hack. expose egl display to gl core for egl image sec extn.
void *egldisp;
void *eglctxt;
+#else
+ int glxcfg_rgb;
+ int glxcfg_rgba;
#endif
GLuint preserve_bit;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index ab45b76..84db094 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -767,19 +767,22 @@ evgl_eng_pbuffer_surface_create(void *data, EVGL_Surface
*sfc,
return egl_sfc;
#else
+ Evas_Engine_GL_Context *evasglctx;
GLXPbuffer pbuf;
GLXFBConfig *cfgs;
int config_attrs[20];
int surface_attrs[20];
int ncfg = 0, i;
- // TODO: Check all required config attributes
+ evasglctx = re->window_gl_context_get(re->software.ob);
#ifndef GLX_VISUAL_ID
# define GLX_VISUAL_ID 0x800b
#endif
i = 0;
+#if 0
+ // DISABLED BECAUSE BadMatch HAPPENS
if (sfc->pbuffer.color_fmt != EVAS_GL_NO_FBO)
{
config_attrs[i++] = GLX_BUFFER_SIZE;
@@ -808,6 +811,13 @@ evgl_eng_pbuffer_surface_create(void *data, EVGL_Surface
*sfc,
}
//config_attrs[i++] = GLX_VISUAL_ID;
//config_attrs[i++] = XVisualIDFromVisual(vis);
+#else
+ config_attrs[i++] = GLX_FBCONFIG_ID;
+ if (sfc->pbuffer.color_fmt == EVAS_GL_RGB_888)
+ config_attrs[i++] = evasglctx->glxcfg_rgb;
+ else
+ config_attrs[i++] = evasglctx->glxcfg_rgba;
+#endif
config_attrs[i++] = 0;
cfgs = glXChooseFBConfig(re->software.ob->disp, re->software.ob->screen,
diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
b/src/modules/evas/engines/gl_x11/evas_x_main.c
index 8ee32d2..d00b4ff 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -564,6 +564,9 @@ try_gles2:
#ifdef GL_GLES
gw->gl_context->egldisp = gw->egl_disp;
gw->gl_context->eglctxt = gw->egl_context[0];
+#else
+ glXGetFBConfigAttrib(gw->disp, evis->config, GLX_FBCONFIG_ID,
&gw->gl_context->glxcfg_rgb);
+ glXGetFBConfigAttrib(gw->disp, evis2->config, GLX_FBCONFIG_ID,
&gw->gl_context->glxcfg_rgba);
#endif
eng_window_use(gw);
glsym_evas_gl_common_context_resize(gw->gl_context, w, h, rot);
--
[EGIT] [core/efl] master 02/03: Evas GL: Ignore compilation warning
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=12292183d04648cf0d56710b5aeea7cad02eebc4 commit 12292183d04648cf0d56710b5aeea7cad02eebc4 Author: Jean-Philippe Andre Date: Tue Nov 17 17:34:23 2015 +0900 Evas GL: Ignore compilation warning Desktop OpenGL doesn't care about the version here (GLES 2 or 3) --- src/modules/evas/engines/gl_common/evas_gl_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c index bf179bc..25985cf 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_core.c +++ b/src/modules/evas/engines/gl_common/evas_gl_core.c @@ -1280,6 +1280,7 @@ _surface_buffers_allocate(void *eng_data EINA_UNUSED, EVGL_Surface *sfc, int w, w, h); } #else +(void) version; _renderbuffer_allocate(sfc->depth_stencil_buf, sfc->depth_stencil_fmt, w, h, sfc->msaa_samples); #endif --
[EGIT] [core/efl] master 03/03: Evas GL: Remove invalid call inside make current pbuffer
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e11bdbafa26e00cbfc3210fd6a1614c0180dfa05
commit e11bdbafa26e00cbfc3210fd6a1614c0180dfa05
Author: Jean-Philippe Andre
Date: Tue Nov 17 17:57:18 2015 +0900
Evas GL: Remove invalid call inside make current pbuffer
There was some confusion as color_buf is a texture but it was used
as an fbo. Not sure was this call was for.
@fix
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 25985cf..e6f8460 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -2683,12 +2683,6 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc,
EVGL_Context *ctx)
if (rsc->direct.partial.enabled)
evgl_direct_partial_render_end();
- if (sfc->color_buf)
- {
- if (!_surface_buffers_fbo_set(sfc, sfc->color_buf,
ctx->version))
-ERR("Could not detach current FBO");
- }
-
// Bind to the previously bound buffer (may be 0)
if (ctx->version == EVAS_GL_GLES_3_X)
{
--
[EGIT] [core/efl] master 02/04: Edje data: Fix memory leak in nested data descriptors
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b54fe3fe617710832b0d7bfe361f3bcb3bfd0ad3
commit b54fe3fe617710832b0d7bfe361f3bcb3bfd0ad3
Author: Jean-Philippe Andre
Date: Wed Nov 18 11:32:37 2015 +0900
Edje data: Fix memory leak in nested data descriptors
---
src/lib/eet/eet_data.c | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index a0c5864..ad2fe47 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -191,6 +191,7 @@ struct _Eet_Data_Element
int counter_offset; /* for a variable array we need the
offset of the count variable */
unsigned chartype; /* EET_T_XXX */
unsigned chargroup_type; /* EET_G_XXX */
+ Eina_Boolsubtype_free : 1;
};
struct _Eet_Data_Encode_Hash_Info
@@ -2108,7 +2109,15 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd)
_eet_descriptor_hash_free(edd);
if (edd->elements.set)
- free(edd->elements.set);
+ {
+int i;
+for (i = 0; i < edd->elements.num; i++)
+ {
+ if (edd->elements.set[i].subtype_free)
+ eet_data_descriptor_free(edd->elements.set[i].subtype);
+ }
+free(edd->elements.set);
+ }
free(edd);
}
@@ -2200,6 +2209,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
ede = &(edd->elements.set[edd->elements.num - 1]);
ede->name = name;
ede->directory_name_ptr = NULL;
+ ede->subtype_free = EINA_FALSE;
/*
* We do a special case when we do list,hash or whatever group of simple
type.
@@ -2229,6 +2239,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
/* 0, */ NULL,
NULL);
type = EET_T_UNKNOW;
+ede->subtype_free = EINA_TRUE;
}
ede->type = type;
--
[EGIT] [core/efl] master 04/04: Edje data: Remove redondant array in Evas 3D edd
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fb4f81b119ee8ec085630e4ab018a9022d4ca448
commit fb4f81b119ee8ec085630e4ab018a9022d4ca448
Author: Jean-Philippe Andre
Date: Wed Nov 18 12:06:00 2015 +0900
Edje data: Remove redondant array in Evas 3D edd
Since I just broke EDJ ABI, as well clean it up. The same array
was saved twice under two different names.
---
src/lib/edje/edje_data.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c
index 218a416..8406878 100644
--- a/src/lib/edje/edje_data.c
+++ b/src/lib/edje/edje_data.c
@@ -853,8 +853,7 @@ _edje_edd_init(void)
#define EET_DATA_DESCRIPTOR_ADD_SUB_NESTED_LOOK(Edd, Type, Dec)
\
{
\
- EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, #Dec ".orientation.look1",
Dec.orientation.data, EDJE_T_FLOAT); \
- EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, #Dec ".orientation.look2",
Dec.orientation.data, EDJE_T_FLOAT); \
+ EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, #Dec ".orientation.look",
Dec.orientation.data, EDJE_T_FLOAT); \
EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, #Dec ".orientation.look_to",
Dec.orientation.look_to, EET_T_INT); \
}
--
[EGIT] [core/efl] master 03/04: Edje: Fix Evas 3D eet data descriptors
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fc3cbaca67537bf2cf77ee7bd41ddd8c5e333c09
commit fc3cbaca67537bf2cf77ee7bd41ddd8c5e333c09
Author: Jean-Philippe Andre
Date: Wed Nov 18 11:17:27 2015 +0900
Edje: Fix Evas 3D eet data descriptors
Memleak found with valgrind points to this line, where clearly the
edd field name is incorrect. It looks like this feature has no example,
no test case either.
This breaks EDJ ABI!
I do this because I believe there are zero users of this API
at this point, as Evas 3D is still not ready yet.
See also https://phab.enlightenment.org/D2544
@fix
---
src/lib/edje/edje_data.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c
index f499181..218a416 100644
--- a/src/lib/edje/edje_data.c
+++ b/src/lib/edje/edje_data.c
@@ -853,9 +853,9 @@ _edje_edd_init(void)
#define EET_DATA_DESCRIPTOR_ADD_SUB_NESTED_LOOK(Edd, Type, Dec)
\
{
\
- EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, "Dec##.orientation.look1",
Dec.orientation.data, EDJE_T_FLOAT); \
- EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, "Dec##.orientation.look2",
Dec.orientation.data, EDJE_T_FLOAT); \
- EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "Dec##.orientation.look_to",
Dec.orientation.look_to, EET_T_INT); \
+ EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, #Dec ".orientation.look1",
Dec.orientation.data, EDJE_T_FLOAT); \
+ EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(Edd, Type, #Dec ".orientation.look2",
Dec.orientation.data, EDJE_T_FLOAT); \
+ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, #Dec ".orientation.look_to",
Dec.orientation.look_to, EET_T_INT); \
}
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc,
Edje_Part_Description_Common);
--
[EGIT] [core/efl] master 01/01: Efl: eo-ify enum Efl.Gfx.Fill
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=618558f8ecba4d78f230245f2853523e95e12dfc
commit 618558f8ecba4d78f230245f2853523e95e12dfc
Author: Jean-Philippe Andre
Date: Thu Nov 19 16:10:41 2015 +0900
Efl: eo-ify enum Efl.Gfx.Fill
---
src/Makefile_Efl.am| 17 +
src/lib/efl/Efl.h | 19 ++-
src/lib/efl/interfaces/efl_gfx_fill.eo | 13 +
3 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index b64223e..ea0809d 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,3 +1,8 @@
+# Even though libefl is new, it contains definitions used by legacy APIs
+efl_eolian_legacy_files = \
+ lib/efl/interfaces/efl_gfx_fill.eo \
+ $(NULL)
+
efl_eolian_files = \
lib/efl/interfaces/efl_control.eo \
lib/efl/interfaces/efl_file.eo \
@@ -7,7 +12,6 @@ efl_eolian_files = \
lib/efl/interfaces/efl_text_properties.eo \
lib/efl/interfaces/efl_gfx_base.eo \
lib/efl/interfaces/efl_gfx_stack.eo \
- lib/efl/interfaces/efl_gfx_fill.eo \
lib/efl/interfaces/efl_gfx_view.eo \
lib/efl/interfaces/efl_gfx_shape.eo \
lib/efl/interfaces/efl_gfx_gradient_base.eo \
@@ -15,18 +19,22 @@ efl_eolian_files = \
lib/efl/interfaces/efl_gfx_gradient_radial.eo \
lib/efl/interfaces/efl_gfx_filter.eo \
lib/efl/interfaces/efl_model_base.eo \
+ $(efl_eolian_legacy_files) \
$(NULL)
efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h)
efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c)
+efl_eolian_legacy_files_h = $(efl_eolian_legacy_files:%.eo=%.eo.legacy.h)
BUILT_SOURCES += \
$(efl_eolian_files_c) \
- $(efl_eolian_files_h)
+ $(efl_eolian_files_h) \
+ $(efl_eolian_legacy_files_h)
CLEANFILES += \
$(efl_eolian_files_c) \
- $(efl_eolian_files_h)
+ $(efl_eolian_files_h) \
+ $(efl_eolian_legacy_files_h)
EXTRA_DIST += \
lib/efl/Efl_Config.h \
@@ -55,7 +63,8 @@ dist_installed_eflheaders_DATA = \
installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
nodist_installed_eflinterfaces_DATA = \
-$(efl_eolian_files_h)
+ $(efl_eolian_files_h) \
+ $(efl_eolian_legacy_files_h)
if HAVE_ELUA
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8358a1f..b525a18 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -123,19 +123,6 @@ typedef enum _Efl_Gfx_Gradient_Spread
EFL_GFX_GRADIENT_SPREAD_LAST /**< End of enum value */
} Efl_Gfx_Gradient_Spread;
-/**
- * Type defining how an image content get filled.
- * @since 1.14
- */
-typedef enum _Efl_Gfx_Fill_Spread
-{
- EFL_GFX_FILL_REFLECT = 0, /**< image fill tiling mode - tiling reflects */
- EFL_GFX_FILL_REPEAT = 1, /**< tiling repeats */
- EFL_GFX_FILL_RESTRICT = 2, /**< tiling clamps - range offset ignored */
- EFL_GFX_FILL_RESTRICT_REFLECT = 3, /**< tiling clamps and any range offset
reflects */
- EFL_GFX_FILL_RESTRICT_REPEAT = 4, /**< tiling clamps and any range offset
repeats */
- EFL_GFX_FILL_PAD = 5 /**< tiling extends with end values */
-} Efl_Gfx_Fill_Spread;
#ifdef EFL_BETA_API_SUPPORT
@@ -166,6 +153,12 @@ EAPI extern const Eo_Event_Description
_EFL_GFX_PATH_CHANGED;
#include "interfaces/efl_gfx_gradient_radial.eo.h"
#include "interfaces/efl_gfx_filter.eo.h"
+#else
+
+#ifndef EFL_NOLEGACY_API_SUPPORT
+#include "interfaces/efl_gfx_fill.eo.legacy.h"
+#endif
+
#endif
#if defined ( __cplusplus )
diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo
b/src/lib/efl/interfaces/efl_gfx_fill.eo
index cffaf82..51078bb 100644
--- a/src/lib/efl/interfaces/efl_gfx_fill.eo
+++ b/src/lib/efl/interfaces/efl_gfx_fill.eo
@@ -1,3 +1,16 @@
+enum Efl.Gfx.Fill.Spread {
+ [[Type defining how an image content gets filled.
+ @since 1.14
+ ]]
+ legacy: Efl_Gfx_Fill;
+ reflect = 0, [[Image fill tiling mode - tiling reflects]]
+ repeat = 1, [[Tiling repeats]]
+ restrict = 2, [[Tiling clamps, range offset ignored]]
+ restrict_reflect = 3, [[Tiling clamps and any range offset reflects]]
+ restrict_repeat = 4, [[Tiling clamps and any range offset repeats]]
+ pad = 5, [[Tiling extends with end values]]
+}
+
interface Efl.Gfx.Fill {
legacy_prefix: null;
methods {
--
[EGIT] [core/efl] master 01/01: Ector: Simplify confusing code
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ec92726ca981806a2eb6f9c153af8f7dd46d6a03
commit ec92726ca981806a2eb6f9c153af8f7dd46d6a03
Author: Jean-Philippe Andre
Date: Fri Nov 20 12:07:01 2015 +0900
Ector: Simplify confusing code
The base class data was already stored, no need to figure it out again
---
src/examples/evas/evas-vg-simple.c | 2 +-
src/lib/ector/software/ector_renderer_software_shape.c | 13 ++---
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/examples/evas/evas-vg-simple.c
b/src/examples/evas/evas-vg-simple.c
index 5e0b0e4..96afcb1 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -5,7 +5,7 @@
* one). See stdout/stderr for output.
*
* @verbatim
- * gcc -o evas_vg_simple evas-vg-simple.c `pkg-config --libs --cflags evas
ecore ecore-evas eina ector eo efl`
+ * gcc -o evas_vg_simple evas-vg-simple.c `pkg-config --libs --cflags evas
ecore ecore-evas eina ector eo efl` -lm
* @endverbatim
*/
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c
b/src/lib/ector/software/ector_renderer_software_shape.c
index 0cbc9ee..71c2898 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -577,12 +577,7 @@
_ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj,
// shouldn't that be moved to the software base object
if (!pd->surface)
- {
-Ector_Renderer_Generic_Base_Data *base;
-
-base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS);
-pd->surface = eo_data_xref(base->surface,
ECTOR_SOFTWARE_SURFACE_CLASS, obj);
- }
+ pd->surface = eo_data_xref(pd->base->surface,
ECTOR_SOFTWARE_SURFACE_CLASS, obj);
return EINA_TRUE;
}
@@ -710,8 +705,6 @@ _ector_renderer_software_shape_eo_base_constructor(Eo *obj,
Ector_Renderer_Softw
static void
_ector_renderer_software_shape_eo_base_destructor(Eo *obj,
Ector_Renderer_Software_Shape_Data *pd)
{
- Ector_Renderer_Generic_Base_Data *base;
-
//FIXME, As base class destructor can't call destructor of mixin class.
// call explicit API to free shape data.
eo_do(obj, efl_gfx_shape_reset());
@@ -719,9 +712,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj,
Ector_Renderer_Softwa
if (pd->shape_data)
ector_software_rasterizer_destroy_rle_data(pd->shape_data);
if (pd->outline_data)
ector_software_rasterizer_destroy_rle_data(pd->outline_data);
- base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS);
- eo_data_xunref(base->surface, pd->surface, obj);
-
+ eo_data_xunref(pd->base->surface, pd->surface, obj);
eo_data_xunref(obj, pd->shape, obj);
eo_data_xunref(obj, pd->base, obj);
eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, eo_destructor());
--
[EGIT] [core/efl] master 01/01: Evas render: Fix another map clip render issue
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=58a1b2767ed5983130b7a79d456ec71786a17a7d
commit 58a1b2767ed5983130b7a79d456ec71786a17a7d
Author: Jean-Philippe Andre
Date: Fri Nov 20 14:23:29 2015 +0900
Evas render: Fix another map clip render issue
This time it's only about performance. We seem to be setting the
changed flag too often, which might trigger unnecessary redraws.
- map flag is set if there is currently a map AND it's not an image
object (because images can map themselves)
- hmap flag is set if there was a map before
So, map != hmap does not imply a transition between a mapped and
non-mapped state. Add an extra check before marking the clip
as dirty and changed.
---
src/lib/evas/canvas/evas_render.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index bdac680..63749e8 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -630,7 +630,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e,
Evas_Object *eo_obj,
*redraw_all = 1;
}
}
-if (obj->cur->clipper)
+if (!map && obj->cur->clipper)
{
// Fix some bad clipping issues after an evas_map animation
finishes
evas_object_change(obj->cur->clipper->object, obj->cur->clipper);
--
[EGIT] [core/efl] master 04/04: Evas 3d: Remove left over debug message from recent commit
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=51a65c970f58af7d62e73e1cd509e15162456fbf
commit 51a65c970f58af7d62e73e1cd509e15162456fbf
Author: Jean-Philippe Andre
Date: Mon Nov 23 19:44:04 2015 +0900
Evas 3d: Remove left over debug message from recent commit
---
src/modules/evas/model_loaders/ply/evas_model_load_ply.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
index 78b2918..1beef18 100644
--- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
+++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
@@ -102,8 +102,6 @@ _read_header(char *map)//Check properties of mesh in .ply
file.
}
sscanf(helping_pointer[1], "%d", &header.vertices_count);
-
-ERR("\n HEADER %d", header.vertices_count);
free(helping_pointer);
helping_pointer = eina_str_split(map, "end_header\n", 0);
--
[EGIT] [core/efl] master 03/04: Edje edit: Free textblock styles with the proper function
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1ab1b24e4e1d3af8400c37ff2c2f8e48523b81ed
commit 1ab1b24e4e1d3af8400c37ff2c2f8e48523b81ed
Author: Jean-Philippe Andre
Date: Mon Nov 23 19:40:59 2015 +0900
Edje edit: Free textblock styles with the proper function
---
src/lib/edje/edje_edit.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 7922d78..f714fc3 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2689,7 +2689,7 @@ edje_edit_style_del(Evas_Object *obj, const char *style)
ed->file->styles = eina_list_remove(ed->file->styles, s);
_edje_if_string_free(ed, (const char **)&s->name);
- //~ //s->style HOWTO FREE ???
+ evas_textblock_style_free(s->style);
while (s->tags)
{
Edje_Style_Tag *t;
@@ -2702,7 +2702,6 @@ edje_edit_style_del(Evas_Object *obj, const char *style)
_edje_if_string_free(ed, &t->font);
_edje_if_string_free(ed, &t->text_class);
free(t);
-t = NULL;
}
free(s);
return EINA_TRUE;
--
[EGIT] [core/efl] master 01/01: Evas: Temporarily hack OT_SUPPORT to fix textgrid
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8ccea8233c144f723470da09a01487484c269440 commit 8ccea8233c144f723470da09a01487484c269440 Author: Jean-Philippe Andre Date: Wed Nov 25 15:42:29 2015 +0900 Evas: Temporarily hack OT_SUPPORT to fix textgrid See T2865. Since Harfbuzz 1.1.0, terminology displays fonts funnily aligned to the top. This is apparently because until 1.0.6 the y_offset was always 0 for all glyphs, but since 1.1.1 the offset is actually set. This is a TEMPORARY fix. There might be an underlying issue left here. Harfbuzz changed behaviour in this commit: commit 44f82750807475aa5b16099d917d488df703 Author: Behdad Esfahbod Date: Wed Nov 4 20:40:05 2015 -0800 [ft] Remove font funcs that do nothing --- src/lib/evas/common/evas_font_ot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c index a5fe5b2..f24009e 100644 --- a/src/lib/evas/common/evas_font_ot.c +++ b/src/lib/evas/common/evas_font_ot.c @@ -318,7 +318,7 @@ evas_common_font_ot_populate_text_props(const Eina_Unicode *text, Evas_Coord adv; ot_itr->source_cluster = infos->cluster; ot_itr->x_offset = positions->x_offset; -ot_itr->y_offset = positions->y_offset; +ot_itr->y_offset = 0; // FIXME positions->y_offset; FIXME// gl_itr->index = infos->codepoint; adv = positions->x_advance; --
[EGIT] [core/efl] master 05/08: Ector: Rename C files to match their EO counterparts
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=52ec3d2d7ecb7cdcf3310fba8cff5ed7d2accdbf
commit 52ec3d2d7ecb7cdcf3310fba8cff5ed7d2accdbf
Author: Jean-Philippe Andre
Date: Thu Dec 3 15:04:26 2015 +0900
Ector: Rename C files to match their EO counterparts
---
src/Makefile_Ector.am | 10 +-
src/Makefile_Evas.am | 4 ++--
.../{ector_renderer_base.c => ector_renderer_generic_base.c} | 0
...r_renderer_gradient.c => ector_renderer_generic_gradient.c} | 0
...dient_linear.c => ector_renderer_generic_gradient_linear.c} | 0
...dient_radial.c => ector_renderer_generic_gradient_radial.c} | 0
.../{ector_renderer_shape.c => ector_renderer_generic_shape.c} | 0
.../ector_cairo_software_surface.c}| 0
.../ector_cairo_software_surface.c}| 0
9 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 404dbb2..0f50260 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -69,12 +69,12 @@ lib/ector/software/Ector_Software.h
lib_ector_libector_la_SOURCES = \
lib/ector/ector_main.c \
lib/ector/ector_generic_buffer.c \
-lib/ector/ector_renderer_shape.c \
-lib/ector/ector_renderer_base.c \
+lib/ector/ector_renderer_generic_shape.c \
+lib/ector/ector_renderer_generic_base.c \
lib/ector/ector_renderer_generic_buffer.c \
-lib/ector/ector_renderer_gradient.c \
-lib/ector/ector_renderer_gradient_radial.c \
-lib/ector/ector_renderer_gradient_linear.c
+lib/ector/ector_renderer_generic_gradient.c \
+lib/ector/ector_renderer_generic_gradient_radial.c \
+lib/ector/ector_renderer_generic_gradient_linear.c
installed_ectorgenericheadersdir = $(includedir)/ector-@VMAJ@/generic
nodist_installed_ectorgenericheaders_DATA = $(ector_eolian_generic_h)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 0db38f6..2f04c3c 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -567,7 +567,7 @@ if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
BUILT_SOURCES += \
modules/evas/engines/software_generic/ector_cairo_software_surface.eo.c \
modules/evas/engines/software_generic/ector_cairo_software_surface.eo.h
-lib_evas_libevas_la_SOURCES +=
modules/evas/engines/software_generic/evas_engine.c
modules/evas/engines/software_generic/ector_surface.c
modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
+lib_evas_libevas_la_SOURCES +=
modules/evas/engines/software_generic/evas_engine.c
modules/evas/engines/software_generic/ector_cairo_software_surface.c
modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
lib_evas_libevas_la_LIBADD +=
else
enginesoftwaregenericpkgdir =
$(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
@@ -740,7 +740,7 @@
modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engi
GL_GENERIC_SOURCES = \
modules/evas/engines/gl_generic/evas_engine.c \
-modules/evas/engines/gl_generic/ector_surface.c \
+modules/evas/engines/gl_generic/ector_cairo_software_surface.c \
modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
if EVAS_STATIC_BUILD_GL_COMMON
diff --git a/src/lib/ector/ector_renderer_base.c
b/src/lib/ector/ector_renderer_generic_base.c
similarity index 100%
rename from src/lib/ector/ector_renderer_base.c
rename to src/lib/ector/ector_renderer_generic_base.c
diff --git a/src/lib/ector/ector_renderer_gradient.c
b/src/lib/ector/ector_renderer_generic_gradient.c
similarity index 100%
rename from src/lib/ector/ector_renderer_gradient.c
rename to src/lib/ector/ector_renderer_generic_gradient.c
diff --git a/src/lib/ector/ector_renderer_gradient_linear.c
b/src/lib/ector/ector_renderer_generic_gradient_linear.c
similarity index 100%
rename from src/lib/ector/ector_renderer_gradient_linear.c
rename to src/lib/ector/ector_renderer_generic_gradient_linear.c
diff --git a/src/lib/ector/ector_renderer_gradient_radial.c
b/src/lib/ector/ector_renderer_generic_gradient_radial.c
similarity index 100%
rename from src/lib/ector/ector_renderer_gradient_radial.c
rename to src/lib/ector/ector_renderer_generic_gradient_radial.c
diff --git a/src/lib/ector/ector_renderer_shape.c
b/src/lib/ector/ector_renderer_generic_shape.c
similarity index 100%
rename from src/lib/ector/ector_renderer_shape.c
rename to src/lib/ector/ector_renderer_generic_shape.c
diff --git a/src/modules/evas/engines/software_generic/ector_surface.c
b/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.c
similarity index 100%
rename from src/modules/evas/engines/software_generic/ector_surface.c
rename to src/modules/evas/engines/gl_generic/ector_cairo_software_surface.c
diff --git a/src/modules/evas/engines/gl_generic/ector_surface.c
b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.c
similarity index 100%
rename from src/modules/evas/engines/gl_generic/ector_surface.c
rename
[EGIT] [core/efl] master 07/08: Evas: Move alpha functions to static_libs/draw
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b5500a864434f53240cb774c92731341b21ff3ad
commit b5500a864434f53240cb774c92731341b21ff3ad
Author: Jean-Philippe Andre
Date: Thu Dec 3 15:29:32 2015 +0900
Evas: Move alpha functions to static_libs/draw
This is a pretty simple code refactor, moving pixel handling
to the new draw lib.
---
src/Makefile_Evas.am | 5 +-
src/lib/evas/common/evas_alpha_main.c | 81 --
src/lib/evas/common/evas_blend_private.h | 4 --
src/lib/evas/common/evas_font_compress.c | 3 +-
src/lib/evas/filters/evas_filter_blend.c | 3 +-
src/lib/evas/filters/evas_filter_mask.c| 6 +--
src/lib/evas/include/evas_common_private.h | 1 -
src/static_libs/draw/draw.h| 6 ++-
src/static_libs/draw/draw_alpha_main.c | 59 ++
9 files changed, 74 insertions(+), 94 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 8f234af..1f52b28 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -259,6 +259,10 @@ lib/evas/canvas/evas_vg_gradient_radial.c \
lib/evas/canvas/evas_vg_utils.c \
lib/evas/canvas/evas_vg_shape.c
+# Static draw lib
+lib_evas_libevas_la_SOURCES += \
+static_libs/draw/draw_alpha_main.c
+
# Engine
lib_evas_libevas_la_SOURCES += \
lib/evas/common/evas_op_copy_main_.c \
@@ -267,7 +271,6 @@ lib/evas/common/evas_op_add_main_.c \
lib/evas/common/evas_op_sub_main_.c \
lib/evas/common/evas_op_mask_main_.c \
lib/evas/common/evas_op_mul_main_.c \
-lib/evas/common/evas_alpha_main.c \
lib/evas/common/evas_blend_main.c \
lib/evas/common/evas_blit_main.c \
lib/evas/common/evas_convert_color.c \
diff --git a/src/lib/evas/common/evas_alpha_main.c
b/src/lib/evas/common/evas_alpha_main.c
deleted file mode 100644
index 74bc75b..000
--- a/src/lib/evas/common/evas_alpha_main.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "evas_common_private.h"
-#include "evas_blend_private.h"
-
-/** default op: d = d*(1-sa) + s */
-static void
-_alpha_func_blend(DATA8 *src, DATA8 *dst, int len)
-{
- int k;
-
- EINA_SAFETY_ON_NULL_RETURN(src);
- EINA_SAFETY_ON_NULL_RETURN(dst);
-
- for (k = len; k; k--)
- {
-int val = (*dst * (255 - *src)) / 255 + *src;
-*dst++ = val;
-src++;
- }
-}
-
-/** d = s */
-static void
-_alpha_func_copy(DATA8 *src, DATA8 *dst, int len)
-{
- EINA_SAFETY_ON_NULL_RETURN(src);
- EINA_SAFETY_ON_NULL_RETURN(dst);
-
- memcpy(dst, src, len);
-}
-
-/** d = d*s */
-static void
-_alpha_func_mul(DATA8 *src, DATA8 *dst, int len)
-{
- int k;
-
- EINA_SAFETY_ON_NULL_RETURN(src);
- EINA_SAFETY_ON_NULL_RETURN(dst);
-
- for (k = len; k; k--)
- {
-int val = (*dst * *src) / 255;
-*dst++ = val;
-src++;
- }
-}
-
-
-#if 0
-// Reference ops. In case of alpha, s == sa.
-EVAS_RENDER_BLEND = 0, /**< default op: d = d*(1-sa) + s */
-EVAS_RENDER_BLEND_REL = 1, /**< d = d*(1 - sa) + s*da */
-EVAS_RENDER_COPY = 2, /**< d = s */
-EVAS_RENDER_COPY_REL = 3, /**< d = s*da */
-EVAS_RENDER_ADD = 4, /* d = d + s */
-EVAS_RENDER_ADD_REL = 5, /**< d = d + s*da */
-EVAS_RENDER_SUB = 6, /**< d = d - s */
-EVAS_RENDER_SUB_REL = 7, /* d = d - s*da */
-EVAS_RENDER_TINT = 8, /**< d = d*s + d*(1 - sa) + s*(1 - da) */
-EVAS_RENDER_TINT_REL = 9, /**< d = d*(1 - sa + s) */
-EVAS_RENDER_MASK = 10, /**< d = d*sa */
-EVAS_RENDER_MUL = 11, /**< d = d*s */
-#endif
-
-Alpha_Gfx_Func
-evas_common_alpha_func_get(int op)
-{
- switch (op)
- {
- case EVAS_RENDER_BLEND:
-return _alpha_func_blend;
- case EVAS_RENDER_COPY:
-return _alpha_func_copy;
- case EVAS_RENDER_MASK:
- case EVAS_RENDER_MUL:
-return _alpha_func_mul;
- default:
-ERR("Not implemented yet.");
-return NULL;
- }
-}
diff --git a/src/lib/evas/common/evas_blend_private.h
b/src/lib/evas/common/evas_blend_private.h
index f96e004..5b17993 100644
--- a/src/lib/evas/common/evas_blend_private.h
+++ b/src/lib/evas/common/evas_blend_private.h
@@ -27,8 +27,4 @@ RGBA_Gfx_Pt_Func
evas_common_gfx_func_composite_pixel_color_pt_get (Eina_B
RGBA_Gfx_Pt_Func evas_common_gfx_func_composite_mask_color_pt_get
(DATA32 col, Eina_Bool dst_alpha, int op);
RGBA_Gfx_Pt_Func evas_common_gfx_func_composite_pixel_mask_pt_get
(Eina_Bool src_alpha, Eina_Bool dst_alpha, int op);
-/* Alpha/mask functions */
-Alpha_Gfx_Func evas_common_alpha_func_get (int op);
-
-
#endif /* _EVAS_BLEND_PRIVATE_H */
diff --git a/src/lib/evas/common/evas_font_compress.c
b/src/lib/evas/common/evas_font_compress.c
index 1e13e53..7788ba5 100644
--- a/src/lib/evas/common/evas_font_compress.c
+++ b/src/lib/evas/common/evas_font_compress.c
@@ -9,6 +9,7 @@
#include "evas_font_private.h"
#include "evas_blend_private.h"
+#include "draw.h"
#ifdef EVAS_CSERVE2
# include "../cserve2/evas_cs2_private.h"
@@ -512,7 +513,7 @@ evas_common_font_g
[EGIT] [core/efl] master 04/08: Ector: Another minor code cleanup
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33cd26a4b24a5b04fcd27d9050a0e6c3ff09b331
commit 33cd26a4b24a5b04fcd27d9050a0e6c3ff09b331
Author: Jean-Philippe Andre
Date: Thu Dec 3 14:41:06 2015 +0900
Ector: Another minor code cleanup
Remove DATA8, DATA16, DATA32
Remove empty data structure
Remove unnecessary typedef
---
src/lib/ector/ector_private.h | 9 -
src/lib/ector/software/Ector_Software.h| 9 -
.../ector/software/ector_renderer_software_base.eo | 1 +
src/lib/ector/software/ector_software_buffer.c | 2 +-
src/lib/ector/software/ector_software_private.h| 23 --
src/lib/ector/software/ector_software_rasterizer.c | 6 +++---
6 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index f212a5f..598559e 100644
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -40,15 +40,6 @@ extern int _ector_log_dom_global;
/* The following macro are internal to Ector only at this stage */
-typedef unsigned char DATA8;
-typedef unsigned short DATA16;
-
-#define RGB_JOIN(r,g,b) \
- (((r) << 16) + ((g) << 8) + (b))
-
-#define ARGB_JOIN(a,r,g,b) \
- (((a) << 24) + ((r) << 16) + ((g) << 8) + (b))
-
static inline Eo *
_eo_refplace(Eo **d, const Eo *s)
{
diff --git a/src/lib/ector/software/Ector_Software.h
b/src/lib/ector/software/Ector_Software.h
index 430315a..bb134c6 100644
--- a/src/lib/ector/software/Ector_Software.h
+++ b/src/lib/ector/software/Ector_Software.h
@@ -3,15 +3,6 @@
#include
-#ifndef _ECTOR_SOFTWARE_SURFACE_EO_CLASS_TYPE
-#define _ECTOR_SOFTWARE_SURFACE_EO_CLASS_TYPE
-
-typedef Eo Ector_Software_Surface;
-
-#endif
-
-typedef struct _Software_Rasterizer Software_Rasterizer;
-
#include "software/ector_software_surface.eo.h"
#include "software/ector_software_buffer.eo.h"
#include "software/ector_software_buffer_base.eo.h"
diff --git a/src/lib/ector/software/ector_renderer_software_base.eo
b/src/lib/ector/software/ector_renderer_software_base.eo
index 6055be5..19061e3 100644
--- a/src/lib/ector/software/ector_renderer_software_base.eo
+++ b/src/lib/ector/software/ector_renderer_software_base.eo
@@ -1,6 +1,7 @@
class Ector.Renderer.Software.Base (Ector.Renderer.Generic.Base)
{
legacy_prefix: null;
+ data: null;
methods {
fill {
return: bool;
diff --git a/src/lib/ector/software/ector_software_buffer.c
b/src/lib/ector/software/ector_software_buffer.c
index 1f754aa..cd558ec 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -46,7 +46,7 @@ _pixels_gry8_to_argb_convert(uint32_t *dst, const uint8_t
*src, int len)
for (k = 0; k < len; k++)
{
uint8_t s = *src++;
-*dst++ = ARGB_JOIN(s, s, s, s);
+*dst++ = DRAW_ARGB_JOIN(s, s, s, s);
}
}
diff --git a/src/lib/ector/software/ector_software_private.h
b/src/lib/ector/software/ector_software_private.h
index fadadba..5a05aa5 100644
--- a/src/lib/ector/software/ector_software_private.h
+++ b/src/lib/ector/software/ector_software_private.h
@@ -6,22 +6,7 @@
#include "sw_ft_stroker.h"
#include "../ector_private.h"
-#ifndef DATA32
-typedef unsigned int DATA32;
-#endif
-
-#ifndef uint
-typedef unsigned int uint;
-#endif
-
typedef struct _Ector_Software_Surface_Data Ector_Software_Surface_Data;
-typedef struct _Ector_Renderer_Software_Base_Data
Ector_Renderer_Software_Base_Data;
-
-#define CHECK_SOFTWARE(Parent) (!(Parent && Parent->software))
-
-struct _Ector_Renderer_Software_Base_Data
-{
-};
// Gradient related structure
typedef struct _Software_Gradient_Linear_Data
@@ -90,16 +75,16 @@ typedef struct _Span_Data
Eina_Matrix3 inv;
Span_Data_Type type;
Eina_Boolfast_matrix ;
- DATA32 mul_col;
+ uint32_t mul_col;
Efl_Gfx_Render_Opop;
union {
- DATA32 color;
+ uint32_t color;
Ector_Renderer_Software_Gradient_Data *gradient;
Ector_Software_Buffer_Base_Data *buffer;
};
} Span_Data;
-struct _Software_Rasterizer
+typedef struct _Software_Rasterizer
{
SW_FT_Raster raster;
SW_FT_Strokerstroker;
@@ -108,7 +93,7 @@ struct _Software_Rasterizer
Eina_Matrix3*transform;
Eina_Rectangle system_clip;
-};
+} Software_Rasterizer;
struct _Ector_Software_Surface_Data
{
diff --git a/src/lib/ector/software/ector_software_rasterizer.c
b/src/lib/ector/software/ector_software_rasterizer.c
index 5990792..8224c6c 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -94,8 +94,8 @@ _blend_image_argb(int count, const SW_FT_Span *spans, void
*user_data)
{
Span_Data *data = user_data;
RGBA_Comp_Func comp_func;
- DATA32 *buffer, *target;
- DATA8 *src8;
+ uint32_t *buffer, *target;
+ uin
[EGIT] [core/efl] master 03/08: Ector: Move drawhelper to static_libs
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=615b2442b76acc3e386ca5fd322047009761 commit 615b2442b76acc3e386ca5fd322047009761 Author: Jean-Philippe Andre Date: Wed Dec 2 18:46:29 2015 +0900 Ector: Move drawhelper to static_libs Rename a few things: - draw helper -> efl_draw - Ector_Rop -> Efl.Gfx.Render_Op - ECTOR_ bla bla -> DRAW_ bla bla (base pixel ops) - ector_memfill -> draw_memset32 (and invert arg order to match memset) The main rasterizer file is now draw.h in static_libs/draw This is a non functional change, simple code refactor. --- src/Makefile_Ector.am | 16 ++- src/Makefile_Efl.am| 2 +- src/Makefile_Evas.am | 1 + src/lib/ector/Ector.h | 10 -- src/lib/ector/cairo/ector_cairo_private.h | 2 + src/lib/ector/cairo/ector_renderer_cairo_base.c| 6 +- .../cairo/ector_renderer_cairo_gradient_linear.c | 2 +- .../cairo/ector_renderer_cairo_gradient_radial.c | 2 +- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 2 +- src/lib/ector/ector_private.h | 18 src/lib/ector/ector_renderer_generic_base.eo | 2 +- .../ector_renderer_software_gradient_linear.c | 4 +- .../ector_renderer_software_gradient_radial.c | 4 +- .../ector/software/ector_renderer_software_shape.c | 26 ++--- src/lib/ector/software/ector_software_buffer.c | 1 + src/lib/ector/software/ector_software_gradient.c | 35 --- src/lib/ector/software/ector_software_private.h| 7 +- src/lib/ector/software/ector_software_rasterizer.c | 17 ++-- src/lib/ector/software/ector_software_surface.c| 14 +-- src/lib/efl/Efl.h | 1 + src/lib/efl/interfaces/efl_gfx_base.eo | 6 ++ src/lib/evas/include/evas_common_private.h | 3 +- src/modules/evas/engines/gl_generic/evas_engine.c | 8 +- .../evas/engines/software_generic/evas_engine.c| 10 +- .../draw/draw.h} | 112 + .../draw/draw_main.c} | 49 + .../draw/draw_main_neon.c} | 17 ++-- .../draw/draw_main_sse2.c} | 32 +++--- src/static_libs/draw/draw_private.h| 41 29 files changed, 240 insertions(+), 210 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 3dc4c73..404dbb2 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -90,6 +90,13 @@ lib/ector/cairo/ector_cairo_surface.c installed_ectorcairoheadersdir = $(includedir)/ector-@VMAJ@/cairo nodist_installed_ectorcairoheaders_DATA = $(ector_eolian_cairo_h) +# SW draw static lib +draw_sources = \ +static_libs/draw/draw_main_sse2.c \ +static_libs/draw/draw_main.c \ +static_libs/draw/draw_main_neon.c \ +$(NULL) + # And the default software backend lib_ector_libector_la_SOURCES += \ lib/ector/software/ector_renderer_software_gradient_linear.c \ @@ -103,9 +110,7 @@ lib/ector/software/ector_software_buffer.c \ static_libs/freetype/sw_ft_math.c \ static_libs/freetype/sw_ft_raster.c \ static_libs/freetype/sw_ft_stroker.c \ -lib/ector/software/ector_drawhelper.c \ -lib/ector/software/ector_drawhelper_sse2.c \ -lib/ector/software/ector_drawhelper_neon.c +$(draw_sources) installed_ectorsoftwareheadersdir = $(includedir)/ector-@VMAJ@/software nodist_installed_ectorsoftwareheaders_DATA = $(ector_eolian_software_h) @@ -115,6 +120,7 @@ lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/lib/ector/cairo \ -I$(top_builddir)/src/lib/ector/software \ -I$(top_srcdir)/src/static_libs/freetype \ +-I$(top_srcdir)/src/static_libs/draw \ @ECTOR_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -165,4 +171,6 @@ lib/ector/software/ector_software_private.h \ static_libs/freetype/sw_ft_math.h \ static_libs/freetype/sw_ft_raster.h \ static_libs/freetype/sw_ft_stroker.h \ -static_libs/freetype/sw_ft_types.h +static_libs/freetype/sw_ft_types.h \ +static_libs/draw/draw.h \ +static_libs/draw/draw_private.h diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index aad9686..c79cde2 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -1,6 +1,7 @@ # Even though libefl is new, it contains definitions used by legacy APIs efl_eolian_legacy_files = \ lib/efl/interfaces/efl_gfx_fill.eo \ + lib/efl/interfaces/efl_gfx_base.eo \ $(NULL) efl_eolian_files = \ @@ -10,7 +11,6 @@ efl_eolian_files = \ lib/efl/interfaces/efl_player.eo \ lib/efl/interfaces/efl_text.eo \ lib/efl/interfaces/efl_text_properties.eo \ - lib/efl/interfaces/efl_gfx_base.eo \ lib/efl/interfaces/efl_gfx_stack.eo \ lib/efl/interfaces/efl_gfx_view.eo \ lib/e
[EGIT] [core/efl] master 01/08: Ector: Implement pixel buffer support
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0cf5719e526b17bb6ad03f05643a760edf389e98 commit 0cf5719e526b17bb6ad03f05643a760edf389e98 Author: Jean-Philippe Andre Date: Wed Nov 18 19:29:23 2015 +0900 Ector: Implement pixel buffer support The objective of this patch is to propose a standardized format for pixel buffers to use within Ector and Evas. The basic EO API provided here is not meant to be the fastest path for all operations, simply the most convenient to generalize. Performance will be achieved by implementing (or porting) custom draw functions. This implements support for: - Generic pixel buffers - Generic buffer renderer to draw images with ector - Software engine pixel buffers, ie. malloc buffers - Software buffer renderer Cairo support has not been implemented yet. The only renderer is still extremely limited, as it does not support Fill modes, Scaling, etc... yet. Not a single line from this patch has been tested yet. It compiles. That's pretty damn good for a start! @feature --- src/Makefile_Ector.am | 9 + src/lib/ector/ector_generic_buffer.c | 50 + src/lib/ector/ector_generic_buffer.eo | 132 +++ src/lib/ector/ector_private.h | 40 +++- src/lib/ector/ector_renderer.h | 1 + src/lib/ector/ector_renderer_base.c| 2 +- src/lib/ector/ector_renderer_generic_buffer.c | 68 ++ src/lib/ector/ector_renderer_generic_buffer.eo | 22 ++ src/lib/ector/ector_renderer_shape.c | 6 +- src/lib/ector/ector_surface.h | 1 + src/lib/ector/software/Ector_Software.h| 2 + .../software/ector_renderer_software_buffer.c | 72 ++ .../software/ector_renderer_software_buffer.eo | 19 ++ src/lib/ector/software/ector_software_buffer.c | 248 + src/lib/ector/software/ector_software_buffer.eo| 19 ++ src/lib/ector/software/ector_software_private.h| 19 +- src/lib/ector/software/ector_software_rasterizer.c | 60 - src/lib/ector/software/ector_software_surface.c| 3 + src/lib/efl/interfaces/efl_gfx_base.eo | 5 + 19 files changed, 767 insertions(+), 11 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index f6fe1e1..b6cda51 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -2,8 +2,10 @@ ### Library ector_eolian_files_generic = \ lib/ector/ector_generic_surface.eo \ + lib/ector/ector_generic_buffer.eo \ lib/ector/ector_renderer_generic_base.eo \ lib/ector/ector_renderer_generic_shape.eo \ + lib/ector/ector_renderer_generic_buffer.eo \ lib/ector/ector_renderer_generic_gradient.eo \ lib/ector/ector_renderer_generic_gradient_radial.eo \ lib/ector/ector_renderer_generic_gradient_linear.eo @@ -21,8 +23,10 @@ ector_eolian_cairo_h = $(ector_eolian_files_cairo:%.eo=%.eo.h) # Handle default software backend ector_eolian_files_software = \ lib/ector/software/ector_software_surface.eo \ + lib/ector/software/ector_software_buffer.eo \ lib/ector/software/ector_renderer_software_base.eo \ lib/ector/software/ector_renderer_software_shape.eo \ + lib/ector/software/ector_renderer_software_buffer.eo \ lib/ector/software/ector_renderer_software_gradient_radial.eo \ lib/ector/software/ector_renderer_software_gradient_linear.eo ector_eolian_software_h = $(ector_eolian_files_software:%.eo=%.eo.h) @@ -64,8 +68,10 @@ lib/ector/software/Ector_Software.h lib_ector_libector_la_SOURCES = \ lib/ector/ector_main.c \ lib/ector/ector_surface.c \ +lib/ector/ector_generic_buffer.c \ lib/ector/ector_renderer_shape.c \ lib/ector/ector_renderer_base.c \ +lib/ector/ector_renderer_generic_buffer.c \ lib/ector/ector_renderer_gradient.c \ lib/ector/ector_renderer_gradient_radial.c \ lib/ector/ector_renderer_gradient_linear.c @@ -89,9 +95,11 @@ lib_ector_libector_la_SOURCES += \ lib/ector/software/ector_renderer_software_gradient_linear.c \ lib/ector/software/ector_renderer_software_gradient_radial.c \ lib/ector/software/ector_renderer_software_shape.c \ +lib/ector/software/ector_renderer_software_buffer.c \ lib/ector/software/ector_software_gradient.c \ lib/ector/software/ector_software_rasterizer.c \ lib/ector/software/ector_software_surface.c \ +lib/ector/software/ector_software_buffer.c \ static_libs/freetype/sw_ft_math.c \ static_libs/freetype/sw_ft_raster.c \ static_libs/freetype/sw_ft_stroker.c \ @@ -150,6 +158,7 @@ endif EXTRA_DIST += \ lib/ector/ector_private.h \ +lib/ector/ector_buffer.h \ lib/ector/cairo/ector_cairo_private.h \ lib/ector/software/ector_drawhelper_private.h \ lib/ector/software/ector_software_private.h \ diff --git a/src/lib/ector/ect
[EGIT] [core/efl] master 08/08: Ector: Kill compilation warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dc621e23161d80f7f1a5b16b5dc4f5a666af53f0
commit dc621e23161d80f7f1a5b16b5dc4f5a666af53f0
Author: Jean-Philippe Andre
Date: Thu Dec 3 16:19:27 2015 +0900
Ector: Kill compilation warnings
Remove unimplemented function (no test case yet).
Convert #warning into comments.
---
src/lib/ector/software/ector_software_gradient.c | 2 +-
src/lib/ector/software/ector_software_rasterizer.c | 26 +-
src/static_libs/draw/draw.h| 8 +--
src/static_libs/draw/draw_main.c | 7 +++---
src/static_libs/draw/draw_main_sse2.c | 4 ++--
5 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/src/lib/ector/software/ector_software_gradient.c
b/src/lib/ector/software/ector_software_gradient.c
index bbe675e..f840f73 100644
--- a/src/lib/ector/software/ector_software_gradient.c
+++ b/src/lib/ector/software/ector_software_gradient.c
@@ -329,7 +329,7 @@ _generate_gradient_color_table(Efl_Gfx_Gradient_Stop
*gradient_stops, int stop_c
t = func((fpos - curr->offset) * delta);
dist = (int)(256 * t);
idist = 256 - dist;
- color_table[pos] = INTERPOLATE_PIXEL_256(current_color, idist,
next_color, dist);
+ color_table[pos] = draw_interpolate_256(current_color, idist,
next_color, dist);
++pos;
fpos += incr;
}
diff --git a/src/lib/ector/software/ector_software_rasterizer.c
b/src/lib/ector/software/ector_software_rasterizer.c
index 8224c6c..7282144 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -77,19 +77,6 @@ _blend_gradient(int count, const SW_FT_Span *spans, void
*user_data)
}
static void
-_blend_image_gry8(int count, const SW_FT_Span *spans, void *user_data)
-{
- Span_Data *data = user_data;
-
-#warning Need drawhelper here (no alpha support yet)
-
- while (count--)
- {
-spans++;
- }
-}
-
-static void
_blend_image_argb(int count, const SW_FT_Span *spans, void *user_data)
{
Span_Data *data = user_data;
@@ -99,11 +86,13 @@ _blend_image_argb(int count, const SW_FT_Span *spans, void
*user_data)
unsigned int l, length, sy = 0;
const int pix_stride = data->raster_buffer->stride / 4;
-#warning FIXME: Image scaling, anyone?
-#warning FIXME: Optimize eo call with early call resolution
+ /* FIXME:
+* optimize eo call
+* implement image scaling
+* tile and repeat image properly
+*/
comp_func = efl_draw_func_span_get(data->op, data->mul_col, EINA_TRUE);
-
buffer = data->raster_buffer->pixels.u32 + ((pix_stride * data->offy) +
data->offx);
while (count--)
@@ -330,10 +319,7 @@ _adjust_span_fill_methods(Span_Data *spdata)
spdata->unclipped_blend = &_blend_gradient;
break;
case Image:
- if (spdata->buffer->generic->cspace == EFL_GFX_COLORSPACE_GRY8)
-spdata->unclipped_blend = &_blend_image_gry8;
- else
-spdata->unclipped_blend = &_blend_image_argb;
+ spdata->unclipped_blend = &_blend_image_argb;
break;
}
diff --git a/src/static_libs/draw/draw.h b/src/static_libs/draw/draw.h
index c2f2370..ae00cc2 100644
--- a/src/static_libs/draw/draw.h
+++ b/src/static_libs/draw/draw.h
@@ -13,8 +13,8 @@ typedef void (*Alpha_Gfx_Func) (uint8_t *src, uint8_t
*dst, int len);
int efl_draw_init(void);
-RGBA_Comp_Func_Solid efl_draw_func_solid_span_get(Efl_Gfx_Render_Op op, uint
color);
RGBA_Comp_Func efl_draw_func_span_get(Efl_Gfx_Render_Op op, uint color,
Eina_Bool src_alpha);
+RGBA_Comp_Func_Solid efl_draw_func_solid_span_get(Efl_Gfx_Render_Op op, uint
color);
Alpha_Gfx_Func efl_draw_alpha_func_get(Efl_Gfx_Render_Op op, Eina_Bool
has_mask);
@@ -57,8 +57,12 @@ Alpha_Gfx_Func efl_draw_alpha_func_get(Efl_Gfx_Render_Op op,
Eina_Bool has_mask)
((x) & 0xff00) * ((y) & 0xff00)) + 0xff) >> 16) & 0xff00) + \
(x) & 0xff) * ((y) & 0xff)) + 0xff) >> 8) )
+#define DRAW_MUL_256(a, c) \
+ ( (c) >> 8) & 0x00ff00ff) * (a)) & 0xff00ff00) + \
+ (c) & 0x00ff00ff) * (a)) >> 8) & 0x00ff00ff) )
+
static inline uint
-INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b)
+draw_interpolate_256(uint x, uint a, uint y, uint b)
{
uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
t >>= 8;
diff --git a/src/static_libs/draw/draw_main.c b/src/static_libs/draw/draw_main.c
index 5d67602..8db3d20 100644
--- a/src/static_libs/draw/draw_main.c
+++ b/src/static_libs/draw/draw_main.c
@@ -106,7 +106,7 @@ _comp_func_source(uint *dest, const uint *src, int length,
uint color, uint cons
{
ialpha = 255 - const_alpha;
for (i = 0; i < length; ++i)
- dest[i] = INTERPOLATE_PIXEL_256(src[i], const_alpha, dest[i],
ialpha);
+ dest[i]
[EGIT] [core/efl] master 02/08: Ector: Use Ector Buffer inside SW and Cairo renderers
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bad7911cd0f9d7eaa51c0c7b67ff3ed8d7da5599
commit bad7911cd0f9d7eaa51c0c7b67ff3ed8d7da5599
Author: Jean-Philippe Andre
Date: Tue Dec 1 15:22:20 2015 +0900
Ector: Use Ector Buffer inside SW and Cairo renderers
Ector Surface now inherits from Ector Buffer, and the current
two renderers (SW and Cairo SW) use Ector.Software.Buffer
implementations for pixel surfaces.
Basic pixel handling is merged and will allow easy extension
(color conversion, etc...).
Buffer classes are Mixins to be fully implemented by the final
class, such as: Ector.Software.Buffer, Ector.Software.Surface
or Ector.Cairo.Surface.
This is a large ugly commit. Sorry.
The code is quite a mess right now.
---
src/Makefile_Ector.am | 2 +-
src/lib/ector/cairo/ector_cairo_surface.eo | 2 +-
src/lib/ector/ector_buffer.h | 27 +
src/lib/ector/ector_generic_buffer.c | 12 +--
src/lib/ector/ector_generic_buffer.eo | 3 +-
src/lib/ector/ector_generic_surface.eo | 16 +--
src/lib/ector/ector_private.h | 14 +--
src/lib/ector/ector_renderer_base.c| 21 +++-
src/lib/ector/ector_renderer_generic_base.eo | 1 +
src/lib/ector/ector_renderer_generic_buffer.eo | 6 +-
src/lib/ector/ector_surface.c | 34 ---
src/lib/ector/software/Ector_Software.h| 1 +
.../software/ector_renderer_software_buffer.c | 4 +-
src/lib/ector/software/ector_software_buffer.c | 111 -
src/lib/ector/software/ector_software_buffer.eo| 16 +--
...are_buffer.eo => ector_software_buffer_base.eo} | 6 +-
src/lib/ector/software/ector_software_private.h| 35 ++-
src/lib/ector/software/ector_software_rasterizer.c | 28 +++---
src/lib/ector/software/ector_software_surface.c| 52 ++
src/lib/ector/software/ector_software_surface.eo | 26 +
.../gl_generic/ector_cairo_software_surface.eo | 19 ++--
.../evas/engines/gl_generic/ector_surface.c| 90 +++--
src/modules/evas/engines/gl_generic/evas_engine.c | 28 +-
.../ector_cairo_software_surface.eo| 19 ++--
.../evas/engines/software_generic/ector_surface.c | 78 +--
.../evas/engines/software_generic/evas_engine.c| 52 +++---
26 files changed, 306 insertions(+), 397 deletions(-)
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index b6cda51..3dc4c73 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -24,6 +24,7 @@ ector_eolian_cairo_h = $(ector_eolian_files_cairo:%.eo=%.eo.h)
ector_eolian_files_software = \
lib/ector/software/ector_software_surface.eo \
lib/ector/software/ector_software_buffer.eo \
+ lib/ector/software/ector_software_buffer_base.eo \
lib/ector/software/ector_renderer_software_base.eo \
lib/ector/software/ector_renderer_software_shape.eo \
lib/ector/software/ector_renderer_software_buffer.eo \
@@ -67,7 +68,6 @@ lib/ector/software/Ector_Software.h
lib_ector_libector_la_SOURCES = \
lib/ector/ector_main.c \
-lib/ector/ector_surface.c \
lib/ector/ector_generic_buffer.c \
lib/ector/ector_renderer_shape.c \
lib/ector/ector_renderer_base.c \
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo
b/src/lib/ector/cairo/ector_cairo_surface.eo
index 78dbe15..001d73a 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,4 +1,4 @@
-class Ector.Cairo.Surface (Ector.Generic.Surface)
+class Ector.Cairo.Surface (Eo.Base, Ector.Generic.Surface)
{
eo_prefix: ector_cairo_surface;
legacy_prefix: null;
diff --git a/src/lib/ector/ector_buffer.h b/src/lib/ector/ector_buffer.h
new file mode 100644
index 000..41a75cb
--- /dev/null
+++ b/src/lib/ector/ector_buffer.h
@@ -0,0 +1,27 @@
+#include
+
+#include "ector_generic_buffer.eo.h"
+#include "software/ector_software_buffer_base.eo.h"
+
+typedef struct _Ector_Generic_Buffer_Data
+{
+ Eo *eo;
+ unsigned intw, h;
+ unsigned char l, r, t, b;
+ Efl_Gfx_Colorspace cspace;
+} Ector_Generic_Buffer_Data;
+
+typedef struct _Ector_Software_Buffer_Base_Data
+{
+ Ector_Generic_Buffer_Data *generic; /* ugly */
+ union {
+ unsigned int *u32;
+ unsigned char*u8;
+ } pixels;
+ unsigned int stride;
+ unsigned int pixel_size; // in bytes
+ unsigned int map_count;
+ Eina_Boolwritable : 1;
+ Eina_Boolnofree : 1; // pixel data should not be free()'ed
+ Eina_Boolspan_free : 1;
+} Ector_Software_Buffer_Base_Data;
diff --git a/src/lib/ector/ector_generic_buffer.c
b/src/lib/ector/ector_generic_buffer.c
index ba5955b..9c97ff8 100644
--- a/src/lib/ector/ector_g
[EGIT] [core/efl] master 06/08: Ector: Move cairo surface back to ector
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4bcea3eada67332b61e175adabbcbe6dd07563f8 commit 4bcea3eada67332b61e175adabbcbe6dd07563f8 Author: Jean-Philippe Andre Date: Thu Dec 3 15:10:18 2015 +0900 Ector: Move cairo surface back to ector The original plan was to have two different surfaces for GL and SW, but this is probably not going to happen anytime soon. So, move the implementation back to lib/ector. This avoid a file duplication. --- src/Makefile_Ector.am | 3 +- src/Makefile_Evas.am | 16 +-- src/lib/ector/cairo/Ector_Cairo.h | 1 + .../ector/cairo}/ector_cairo_software_surface.c| 11 +- .../ector/cairo}/ector_cairo_software_surface.eo | 0 src/lib/ector/ector_buffer.h | 5 + .../gl_generic/ector_cairo_software_surface.eo | 11 -- src/modules/evas/engines/gl_generic/evas_engine.c | 3 +- .../ector_cairo_software_surface.c | 127 - .../evas/engines/software_generic/evas_engine.c| 3 +- 10 files changed, 14 insertions(+), 166 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 0f50260..1855b17 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -14,6 +14,7 @@ ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h) # Handle cairo backend ector_eolian_files_cairo = \ lib/ector/cairo/ector_cairo_surface.eo \ + lib/ector/cairo/ector_cairo_software_surface.eo \ lib/ector/cairo/ector_renderer_cairo_base.eo \ lib/ector/cairo/ector_renderer_cairo_shape.eo \ lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo \ @@ -85,6 +86,7 @@ lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \ lib/ector/cairo/ector_renderer_cairo_gradient_radial.c \ lib/ector/cairo/ector_renderer_cairo_shape.c \ lib/ector/cairo/ector_renderer_cairo_base.c \ +lib/ector/cairo/ector_cairo_software_surface.c \ lib/ector/cairo/ector_cairo_surface.c installed_ectorcairoheadersdir = $(includedir)/ector-@VMAJ@/cairo @@ -166,7 +168,6 @@ EXTRA_DIST += \ lib/ector/ector_private.h \ lib/ector/ector_buffer.h \ lib/ector/cairo/ector_cairo_private.h \ -lib/ector/software/ector_drawhelper_private.h \ lib/ector/software/ector_software_private.h \ static_libs/freetype/sw_ft_math.h \ static_libs/freetype/sw_ft_raster.h \ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 2f04c3c..8f234af 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -555,19 +555,10 @@ lib/evas/filters/blur/blur_box_rgba_i386.c \ lib/evas/filters/blur/blur_box_rgba_sse3.c \ lib/evas/filters/blur/blur_box_rgba_neon.c -### Vector surface helper - -EXTRA_DIST += \ -modules/evas/engines/software_generic/ector_cairo_software_surface.eo \ -modules/evas/engines/gl_generic/ector_cairo_software_surface.eo - ### Engines if EVAS_STATIC_BUILD_SOFTWARE_GENERIC -BUILT_SOURCES += \ -modules/evas/engines/software_generic/ector_cairo_software_surface.eo.c \ -modules/evas/engines/software_generic/ector_cairo_software_surface.eo.h -lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/ector_cairo_software_surface.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h +lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h lib_evas_libevas_la_LIBADD += else enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) @@ -656,10 +647,6 @@ endif endif if BUILD_ENGINE_GL_COMMON -BUILT_SOURCES += \ -modules/evas/engines/gl_generic/ector_cairo_software_surface.eo.c \ -modules/evas/engines/gl_generic/ector_cairo_software_surface.eo.h - GL_COMMON_SOURCES = \ modules/evas/engines/gl_common/evas_gl_private.h \ modules/evas/engines/gl_common/evas_gl_common.h \ @@ -740,7 +727,6 @@ modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engi GL_GENERIC_SOURCES = \ modules/evas/engines/gl_generic/evas_engine.c \ -modules/evas/engines/gl_generic/ector_cairo_software_surface.c \ modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h if EVAS_STATIC_BUILD_GL_COMMON diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h index 351a2f5..f45dfd0 100644 --- a/src/lib/ector/cairo/Ector_Cairo.h +++ b/src/lib/ector/cairo/Ector_Cairo.h @@ -13,6 +13,7 @@ typedef Eo Ector_Cairo_Surface; typedef struct _cairo_t cairo_t; #include "cairo/ector_cairo_surface.eo.h" +#include "cairo/ector_cairo_software_surface.eo.h" #include "cairo/ector_renderer_cairo_base.eo.h" #include "cairo/ector_renderer_cairo_shape.eo.h" #include "cairo/ector_renderer_cairo_gradient_linear.eo.h" diff --git a/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.c b/src/lib/ector/cairo/ec
[EGIT] [core/efl] master 01/01: Ector: use uint32_t instead of uint
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c09199f0e036a4abb806dbc9fca4960316ecdd08
commit c09199f0e036a4abb806dbc9fca4960316ecdd08
Author: Jean-Philippe Andre
Date: Thu Dec 3 20:15:17 2015 +0900
Ector: use uint32_t instead of uint
This fixes the build for Windows. Thanks @vtorri for the report.
I'm not using "unsigned int" as uint was mostly used like DATA32,
ie. color data (one pixel color or a pixel buffer).
---
src/lib/ector/software/ector_software_gradient.c | 30 +++---
src/lib/ector/software/ector_software_private.h| 8 +++---
src/lib/ector/software/ector_software_rasterizer.c | 6 ++---
.../evas/engines/gl_common/evas_gl_api_ext_def.h | 2 +-
src/static_libs/draw/draw.h| 16 ++--
src/static_libs/draw/draw_main.c | 18 ++---
src/static_libs/draw/draw_main_neon.c | 4 +--
src/static_libs/draw/draw_main_sse2.c | 16 ++--
8 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/lib/ector/software/ector_software_gradient.c
b/src/lib/ector/software/ector_software_gradient.c
index f840f73..5472bec 100644
--- a/src/lib/ector/software/ector_software_gradient.c
+++ b/src/lib/ector/software/ector_software_gradient.c
@@ -15,10 +15,10 @@
#define FIXPT_BITS 8
#define FIXPT_SIZE (1<> FIXPT_BITS;
@@ -58,7 +58,7 @@ _gradient_pixel_fixed(const
Ector_Renderer_Software_Gradient_Data *data, int fix
return data->color_table[_gradient_clamp(data, ipos)];
}
-static inline uint
+static inline uint32_t
_gradient_pixel(const Ector_Renderer_Software_Gradient_Data *data, float pos)
{
int ipos = (int)(pos * (GRADIENT_STOPTABLE_SIZE - 1) + (float)(0.5));
@@ -127,7 +127,7 @@ loop_break(unsigned int *buffer, int length, int
*lprealign, int *lby4 , int *lr
}
static void
-_radial_helper_sse3(uint *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data,
+_radial_helper_sse3(uint32_t *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data,
float det, float delta_det, float delta_delta_det, float
b, float delta_b)
{
int lprealign, lby4, lremaining, i;
@@ -198,7 +198,7 @@ _radial_helper_sse3(uint *buffer, int length,
Ector_Renderer_Software_Gradient_D
}
static void
-_linear_helper_sse3(uint *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data, int t, int inc)
+_linear_helper_sse3(uint32_t *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data, int t, int inc)
{
int lprealign, lby4, lremaining, i;
vec4_i t_vec;
@@ -232,8 +232,8 @@ _linear_helper_sse3(uint *buffer, int length,
Ector_Renderer_Software_Gradient_D
v_min = _mm_set1_epi32(0);
v_max = _mm_set1_epi32((GRADIENT_STOPTABLE_SIZE - 1));
- v_repeat_mask = _mm_set1_epi32(~((uint)(0xff) <<
GRADIENT_STOPTABLE_SIZE_SHIFT));
- v_reflect_mask = _mm_set1_epi32(~((uint)(0xff) <<
(GRADIENT_STOPTABLE_SIZE_SHIFT + 1)));
+ v_repeat_mask = _mm_set1_epi32(~((uint32_t)(0xff) <<
GRADIENT_STOPTABLE_SIZE_SHIFT));
+ v_reflect_mask = _mm_set1_epi32(~((uint32_t)(0xff) <<
(GRADIENT_STOPTABLE_SIZE_SHIFT + 1)));
v_reflect_limit = _mm_set1_epi32(2 * GRADIENT_STOPTABLE_SIZE - 1);
@@ -289,12 +289,12 @@ _ease_linear(double t)
}
static Eina_Bool
-_generate_gradient_color_table(Efl_Gfx_Gradient_Stop *gradient_stops, int
stop_count, uint *color_table, int size)
+_generate_gradient_color_table(Efl_Gfx_Gradient_Stop *gradient_stops, int
stop_count, uint32_t *color_table, int size)
{
int dist, idist, pos = 0, i;
Eina_Bool alpha = EINA_FALSE;
Efl_Gfx_Gradient_Stop *curr, *next;
- uint current_color, next_color;
+ uint32_t current_color, next_color;
double delta, t, incr, fpos;
assert(stop_count > 0);
@@ -366,7 +366,7 @@ destroy_color_table(Ector_Renderer_Software_Gradient_Data
*gdata)
}
static void
-_linear_helper_generic(uint *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data,
+_linear_helper_generic(uint32_t *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data,
int t_fixed, int inc_fixed)
{
int i;
@@ -379,11 +379,11 @@ _linear_helper_generic(uint *buffer, int length,
Ector_Renderer_Software_Gradien
}
void
-fetch_linear_gradient(uint *buffer, Span_Data *data, int y, int x, int length)
+fetch_linear_gradient(uint32_t *buffer, Span_Data *data, int y, int x, int
length)
{
Ector_Renderer_Software_Gradient_Data *g_data = data->gradient;
float t, inc, rx=0, ry=0;
- uint *end;
+ uint32_t *end;
int t_fixed, inc_fixed;
if (g_data->linear.l == 0)
@@ -429,7 +429,7 @@ fetch_linear_gradient(uint *buffer, Span_Data *data, int y,
int x, int length)
}
static void
-_radial_helper_generic(uint *buffer, int length,
Ector_Renderer_Software_Gradient_Data *g_data, float det,
+_radial_helper_generic(uint32_t *buffer, int length,
Ector_Rend
[EGIT] [core/efl] master 01/01: Ector: Fix Windows build (missed in previous patch)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f8826ff397647882959c60fb50456ee18799
commit f8826ff397647882959c60fb50456ee18799
Author: Jean-Philippe Andre
Date: Thu Dec 3 20:52:50 2015 +0900
Ector: Fix Windows build (missed in previous patch)
---
src/lib/ector/software/ector_software_gradient.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/ector/software/ector_software_gradient.c
b/src/lib/ector/software/ector_software_gradient.c
index 5472bec..ea1b4a2 100644
--- a/src/lib/ector/software/ector_software_gradient.c
+++ b/src/lib/ector/software/ector_software_gradient.c
@@ -78,8 +78,8 @@ typedef union { __m128 v; float f[4];} vec4_f;
__m128 v_min = _mm_set1_ps(0.0f); \
__m128 v_max = _mm_set1_ps((float)(GRADIENT_STOPTABLE_SIZE-1)); \
__m128 v_halff = _mm_set1_ps(0.5f); \
- __m128i v_repeat_mask = _mm_set1_epi32(~((uint)(0xff) <<
GRADIENT_STOPTABLE_SIZE_SHIFT)); \
- __m128i v_reflect_mask = _mm_set1_epi32(~((uint)(0xff) <<
(GRADIENT_STOPTABLE_SIZE_SHIFT+1))); \
+ __m128i v_repeat_mask = _mm_set1_epi32(~((uint32_t)(0xff) <<
GRADIENT_STOPTABLE_SIZE_SHIFT)); \
+ __m128i v_reflect_mask = _mm_set1_epi32(~((uint32_t)(0xff) <<
(GRADIENT_STOPTABLE_SIZE_SHIFT+1))); \
__m128i v_reflect_limit = _mm_set1_epi32(2 * GRADIENT_STOPTABLE_SIZE - 1);
#define FETCH_CLAMP_REPEAT_F \
--
[EGIT] [core/efl] master 01/03: Draw: Add new mask functions
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9457411861077d4d286a92a0e02266dfe6c9f668
commit 9457411861077d4d286a92a0e02266dfe6c9f668
Author: Jean-Philippe Andre
Date: Fri Dec 4 14:05:20 2015 +0900
Draw: Add new mask functions
Copy & blend to uint32 with a uint8 mask + color.
---
src/static_libs/draw/draw.h | 20 ---
src/static_libs/draw/draw_main.c| 39 +
src/static_libs/draw/draw_private.h | 1 +
3 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/static_libs/draw/draw.h b/src/static_libs/draw/draw.h
index c25517d..1c15a0d 100644
--- a/src/static_libs/draw/draw.h
+++ b/src/static_libs/draw/draw.h
@@ -9,13 +9,15 @@
typedef void (*RGBA_Comp_Func) (uint32_t *dest, const uint32_t *src, int
length, uint32_t mul_col, uint32_t const_alpha);
typedef void (*RGBA_Comp_Func_Solid) (uint32_t *dest, int length, uint32_t
color, uint32_t const_alpha);
+typedef void (*RGBA_Comp_Func_Mask) (uint32_t *dest, uint8_t *mask, int
length, uint32_t color);
typedef void (*Alpha_Gfx_Func) (uint8_t *src, uint8_t *dst, int len);
int efl_draw_init(void);
-RGBA_Comp_Func efl_draw_func_span_get(Efl_Gfx_Render_Op op, uint32_t color,
Eina_Bool src_alpha);
-RGBA_Comp_Func_Solid efl_draw_func_solid_span_get(Efl_Gfx_Render_Op op,
uint32_t color);
-Alpha_Gfx_Func efl_draw_alpha_func_get(Efl_Gfx_Render_Op op, Eina_Bool
has_mask);
+RGBA_Comp_Func efl_draw_func_span_get (Efl_Gfx_Render_Op op,
uint32_t color, Eina_Bool src_alpha);
+RGBA_Comp_Func_Solid efl_draw_func_solid_span_get (Efl_Gfx_Render_Op op,
uint32_t color);
+RGBA_Comp_Func_Mask efl_draw_func_mask_span_get(Efl_Gfx_Render_Op op,
uint32_t color);
+Alpha_Gfx_Func efl_draw_alpha_func_get(Efl_Gfx_Render_Op op,
Eina_Bool has_mask);
/* common sw draw helpers */
@@ -57,12 +59,16 @@ Alpha_Gfx_Func efl_draw_alpha_func_get(Efl_Gfx_Render_Op
op, Eina_Bool has_mask)
((x) & 0xff00) * ((y) & 0xff00)) + 0xff) >> 16) & 0xff00) + \
(x) & 0xff) * ((y) & 0xff)) + 0xff) >> 8) )
-#define DRAW_MUL_256(a, c) \
- ( (c) >> 8) & 0x00ff00ff) * (a)) & 0xff00ff00) + \
- (c) & 0x00ff00ff) * (a)) >> 8) & 0x00ff00ff) )
+/* alpha from 1 to 256 */
+static inline uint32_t
+draw_mul_256(int a, uint32_t c)
+{
+ return (c) >> 8) & 0x00ff00ff) * (a)) & 0xff00ff00) |
+ (c) & 0x00ff00ff) * (a)) >> 8) & 0x00ff00ff);
+}
static inline uint32_t
-draw_interpolate_256(uint32_t x, uint32_t a, uint32_t y, uint32_t b)
+draw_interpolate_256(uint32_t x, int a, uint32_t y, int b)
{
uint32_t t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
t >>= 8;
diff --git a/src/static_libs/draw/draw_main.c b/src/static_libs/draw/draw_main.c
index 1d19de3..915adf1 100644
--- a/src/static_libs/draw/draw_main.c
+++ b/src/static_libs/draw/draw_main.c
@@ -128,6 +128,39 @@ _comp_func_source(uint32_t *dest, const uint32_t *src, int
length, uint32_t colo
}
}
+/* s = m * color
+ * d = d * (1-sa) + s * sa
+ */
+static void
+_comp_func_mask_blend(uint32_t *dest, uint8_t *mask, int length, uint32_t
color)
+{
+ int k;
+
+ for (k = 0; k < length; k++, dest++, mask++)
+ {
+uint32_t c = draw_mul_256(*mask, color);
+int a = 256 - (c >> 24);
+*dest = c + draw_mul_256(a, *dest);
+ }
+}
+
+static void
+_comp_func_mask_copy(uint32_t *dest, uint8_t *mask, int length, uint32_t color)
+{
+ int k;
+
+ for (k = 0; k < length; k++, dest++, mask++)
+ {
+int a = (*mask & 0x80) ? *mask + 1 : *mask;
+*dest = draw_mul_256(a, color);
+ }
+}
+
+RGBA_Comp_Func_Mask func_for_mode_mask[EFL_GFX_RENDER_OP_LAST] = {
+ _comp_func_mask_blend,
+ _comp_func_mask_copy
+};
+
RGBA_Comp_Func_Solid func_for_mode_solid[EFL_GFX_RENDER_OP_LAST] = {
_comp_func_solid_source_over,
_comp_func_solid_source
@@ -138,6 +171,12 @@ RGBA_Comp_Func func_for_mode[EFL_GFX_RENDER_OP_LAST] = {
_comp_func_source
};
+RGBA_Comp_Func_Mask
+efl_draw_func_mask_span_get(Efl_Gfx_Render_Op op, uint32_t color EINA_UNUSED)
+{
+ return func_for_mode_mask[op];
+}
+
RGBA_Comp_Func_Solid
efl_draw_func_solid_span_get(Efl_Gfx_Render_Op op, uint32_t color)
{
diff --git a/src/static_libs/draw/draw_private.h
b/src/static_libs/draw/draw_private.h
index 8d056a8..cae3b19 100644
--- a/src/static_libs/draw/draw_private.h
+++ b/src/static_libs/draw/draw_private.h
@@ -25,6 +25,7 @@
} \
}
+/* 255 - alpha */
static inline int
alpha_inverse(uint32_t color)
{
--
[EGIT] [core/efl] master 02/03: Evas filters: Use Efl.Gfx.Render_Op
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ecc7da9cbacaeda9d8bc414855e970cfc73d4612
commit ecc7da9cbacaeda9d8bc414855e970cfc73d4612
Author: Jean-Philippe Andre
Date: Fri Dec 4 15:09:56 2015 +0900
Evas filters: Use Efl.Gfx.Render_Op
Some filters are now broken. Yay for refactoring! Will be fixed
in the following commit.
---
src/lib/evas/filters/evas_filter.c | 11 ++-
src/lib/evas/filters/evas_filter_blend.c| 14 +++---
src/lib/evas/filters/evas_filter_displace.c | 4 ++--
src/lib/evas/filters/evas_filter_mask.c | 28 +---
src/lib/evas/filters/evas_filter_private.h | 2 +-
src/lib/evas/include/evas_private.h | 16
src/static_libs/draw/draw.h | 1 +
7 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index 484f44d..42f2da8 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -1017,7 +1017,7 @@ evas_filter_command_blend_add(Evas_Filter_Context *ctx,
void *drawctx,
DRAW_FILL_SET(fillmode);
cmd->draw.ox = ox;
cmd->draw.oy = oy;
- cmd->draw.render_op = ENFN->context_render_op_get(ENDT, drawctx);
+ cmd->draw.rop = _evas_to_gfx_render_op(ENFN->context_render_op_get(ENDT,
drawctx));
cmd->draw.clip_use =
ENFN->context_clip_get(ENDT, drawctx,
&cmd->draw.clip.x, &cmd->draw.clip.y,
@@ -1213,7 +1213,7 @@
evas_filter_command_displacement_map_add(Evas_Filter_Context *ctx,
DRAW_FILL_SET(fillmode);
cmd->displacement.flags = flags & EVAS_FILTER_DISPLACE_BITMASK;
cmd->displacement.intensity = intensity;
- cmd->draw.render_op = ENFN->context_render_op_get(ENDT, draw_context);
+ cmd->draw.rop = _evas_to_gfx_render_op(ENFN->context_render_op_get(ENDT,
draw_context));
cmdid = cmd->id;
if (tmp)
@@ -1241,12 +1241,13 @@ evas_filter_command_mask_add(Evas_Filter_Context *ctx,
void *draw_context,
{
Evas_Filter_Command *cmd;
Evas_Filter_Buffer *in, *out, *mask;
- int cmdid = -1, render_op;
+ Efl_Gfx_Render_Op render_op;
+ int cmdid = -1;
int R, G, B, A;
EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, -1);
- render_op = ENFN->context_render_op_get(ENDT, draw_context);
+ render_op = _evas_to_gfx_render_op(ENFN->context_render_op_get(ENDT,
draw_context));
ENFN->context_color_get(ENDT, draw_context, &R, &G, &B, &A);
in = _filter_buffer_get(ctx, inbuf);
@@ -1262,7 +1263,7 @@ evas_filter_command_mask_add(Evas_Filter_Context *ctx,
void *draw_context,
cmd = _command_new(ctx, EVAS_FILTER_MODE_MASK, in, mask, out);
if (!cmd) goto end;
- cmd->draw.render_op = render_op;
+ cmd->draw.rop = render_op;
DRAW_COLOR_SET(R, G, B, A);
DRAW_FILL_SET(fillmode);
diff --git a/src/lib/evas/filters/evas_filter_blend.c
b/src/lib/evas/filters/evas_filter_blend.c
index 407563a..0c7c548 100644
--- a/src/lib/evas/filters/evas_filter_blend.c
+++ b/src/lib/evas/filters/evas_filter_blend.c
@@ -11,7 +11,7 @@ static Eina_Bool _mapped_blend(void *data, void *drawctx,
void *in, void *out, E
struct Filter_Blend_Draw_Context
{
- int render_op;
+ Efl_Gfx_Render_Op rop;
DATA32 color;
};
@@ -33,7 +33,7 @@ _image_draw_cpu_alpha2alpha(void *data EINA_UNUSED, void
*context,
EINA_SAFETY_ON_FALSE_RETURN_VAL((src_w == dst_w) && (src_h == dst_h),
EINA_FALSE);
- func = efl_draw_alpha_func_get(dc->render_op, EINA_FALSE);
+ func = efl_draw_alpha_func_get(dc->rop, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(func, EINA_FALSE);
sw = src->cache_entry.w;
@@ -70,7 +70,7 @@ _image_draw_cpu_alpha2rgba(void *data EINA_UNUSED, void
*context,
EINA_SAFETY_ON_FALSE_RETURN_VAL((src_w == dst_w) && (src_h == dst_h),
EINA_FALSE);
func = evas_common_gfx_func_composite_mask_color_span_get
- (dc->color, dst->cache_entry.flags.alpha, 1, dc->render_op);
+ (dc->color, dst->cache_entry.flags.alpha, 1, dc->rop);
EINA_SAFETY_ON_NULL_RETURN_VAL(func, EINA_FALSE);
sw = src->cache_entry.w;
@@ -141,7 +141,7 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd,
in = fb->backing;
}
- dc.render_op = cmd->draw.render_op;
+ dc.rop = cmd->draw.rop;
dc.color = ARGB_JOIN(cmd->draw.A, cmd->draw.R, cmd->draw.G, cmd->draw.B);
return _mapped_blend(cmd->ENDT, &dc, in, out, cmd->draw.fillmode,
sx, sy, sw, sh, dx, dy, dw, dh, image_draw);
@@ -212,9 +212,9 @@ _image_draw_cpu_rgba2rgba(void *data EINA_UNUSED, void
*context,
if (!dc->color)
return EINA_TRUE;
else if (dc->color == 0x)
- func =
evas_common_gfx_func_composite_pixel_span_get(src->cache_entry.flags.alpha,
src->cache_entry.flags.alpha_sparse, dst->cache_entry.flags.alpha, 1,
dc->render_op);
+ func =
evas_common_gfx_func_composite_pixel_span_get(src->cache_entry.flags.alpha,
[EGIT] [core/efl] master 01/01: Cocoa: Fix make dist
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5411e23a0f0f17172cef3ad32658799a9174d4a3 commit 5411e23a0f0f17172cef3ad32658799a9174d4a3 Author: Jean-Philippe Andre Date: Fri Dec 4 16:22:20 2015 +0900 Cocoa: Fix make dist See 967d2fe7fa5327675f830dbc3a --- src/Makefile_Ecore_Cocoa.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am index eaaad48..66dc4f7 100644 --- a/src/Makefile_Ecore_Cocoa.am +++ b/src/Makefile_Ecore_Cocoa.am @@ -7,8 +7,7 @@ lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@ dist_installed_ecorecocoamainheaders_DATA = \ lib/ecore_cocoa/Ecore_Cocoa.h \ -lib/ecore_cocoa/Ecore_Cocoa_Cursor.h \ -lib/ecore_cocoa/Ecore_Cocoa_Keys.h +lib/ecore_cocoa/Ecore_Cocoa_Cursor.h lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \ lib/ecore_cocoa/ecore_cocoa.m \ --
[EGIT] [core/efl] master 03/03: Evas filters: Implement mix3 func for rgba masking
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8f4018b690de4e052c7ac74c4d5933f6a0ccd9ee
commit 8f4018b690de4e052c7ac74c4d5933f6a0ccd9ee
Author: Jean-Philippe Andre
Date: Fri Dec 4 15:43:27 2015 +0900
Evas filters: Implement mix3 func for rgba masking
This operation was faked by running a mul and a blend ops. Now
they are combined into one. A GL shader should also be able
to do this in a single pass.
---
src/Makefile_Evas.am| 3 +-
src/lib/evas/filters/evas_filter_mask.c | 124 +---
src/static_libs/draw/draw.h | 3 +
src/static_libs/draw/draw_main.c| 82 -
4 files changed, 151 insertions(+), 61 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 1f52b28..01ac756 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -261,7 +261,8 @@ lib/evas/canvas/evas_vg_shape.c
# Static draw lib
lib_evas_libevas_la_SOURCES += \
-static_libs/draw/draw_alpha_main.c
+static_libs/draw/draw_alpha_main.c \
+static_libs/draw/draw_main.c
# Engine
lib_evas_libevas_la_SOURCES += \
diff --git a/src/lib/evas/filters/evas_filter_mask.c
b/src/lib/evas/filters/evas_filter_mask.c
index 2ae84b7..135d0df 100644
--- a/src/lib/evas/filters/evas_filter_mask.c
+++ b/src/lib/evas/filters/evas_filter_mask.c
@@ -349,71 +349,81 @@ _mask_cpu_alpha_alpha_rgba(Evas_Filter_Command *cmd)
static Eina_Bool
_mask_cpu_rgba_rgba_rgba(Evas_Filter_Command *cmd)
{
- //Evas_Filter_Command fake_cmd;
- Evas_Filter_Fill_Mode fillmode;
- //Evas_Filter_Apply_Func blend;
- Evas_Filter_Buffer *fb;
- Eina_Bool ret = EINA_FALSE;
- int w, h;
+ Draw_Func_ARGB_Mix3 func;
+ RGBA_Image *in, *out, *mask;
+ DATA32 *dst, *msk, *src;
+ int w, h, mw, mh, y, my, r;
+ int stepsize, stepcount, step;
+ DATA32 color;
+
+ /* Mechanism:
+* 1. Stretch mask as requested in fillmode
+* 2. Mix 3 colors
+*/
+
+ in = (RGBA_Image *) cmd->input->backing;
+ out = (RGBA_Image *) cmd->output->backing;
+ mask = (RGBA_Image *) cmd->mask->backing;
- fake_cmd = *cmd;
w = cmd->input->w;
h = cmd->input->h;
+ mw = cmd->mask->w;
+ mh = cmd->mask->h;
+ src = in->image.data;
+ dst = out->image.data;
- // FIXME: do a single pass
- /* Blend 2 rgba images into rgba destination.
-* Mechanism:
-* 1. Copy input to temp (COPY)
-* 2. Blend mask to temp (MUL)
-* 3. Blend temp to output (render_op)
-*/
+ // Stretch if necessary.
+ if ((mw != w || mh != h) && (cmd->draw.fillmode &
EVAS_FILTER_FILL_MODE_STRETCH_XY))
+ {
+Evas_Filter_Buffer *fb;
+
+if (cmd->draw.fillmode & EVAS_FILTER_FILL_MODE_STRETCH_X)
+ mw = w;
+if (cmd->draw.fillmode & EVAS_FILTER_FILL_MODE_STRETCH_Y)
+ mh = h;
- // Copy
- BUFFERS_LOCK();
- fb = evas_filter_buffer_scaled_get(cmd->ctx, cmd->input, w, h);
- BUFFERS_UNLOCK();
- EINA_SAFETY_ON_NULL_RETURN_VAL(fb, EINA_FALSE);
- fb->locked = EINA_TRUE;
+BUFFERS_LOCK();
+fb = evas_filter_buffer_scaled_get(cmd->ctx, cmd->mask, mw, mh);
+BUFFERS_UNLOCK();
- // Repeat mask if unspecified - NONE is not possible
- fillmode = cmd->draw.fillmode;
- if ((fillmode & (EVAS_FILTER_FILL_MODE_REPEAT_X |
EVAS_FILTER_FILL_MODE_STRETCH_X)) == 0)
- {
-DBG("X fillmode not specified: defaults to repeat");
-fillmode |= EVAS_FILTER_FILL_MODE_REPEAT_X;
+EINA_SAFETY_ON_NULL_RETURN_VAL(fb, EINA_FALSE);
+fb->locked = EINA_FALSE;
+mask = fb->backing;
}
- if ((fillmode & (EVAS_FILTER_FILL_MODE_REPEAT_Y |
EVAS_FILTER_FILL_MODE_STRETCH_Y)) == 0)
+
+ color = ARGB_JOIN(cmd->draw.A, cmd->draw.R, cmd->draw.G, cmd->draw.B);
+ msk = mask->image.data;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(src, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(dst, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(msk, EINA_FALSE);
+ EINA_SAFETY_ON_FALSE_RETURN_VAL((w > 0) && (mw > 0), EINA_FALSE);
+
+ stepsize = MIN(mw, w);
+ stepcount = w / stepsize;
+
+ func = efl_draw_func_argb_mix3_get(cmd->draw.rop, color);
+
+ // Apply mask using Gfx functions
+ for (y = 0, my = 0; y < h; y++, my++, msk += mw)
{
-DBG("Y fillmode not specified: defaults to repeat");
-fillmode |= EVAS_FILTER_FILL_MODE_REPEAT_Y;
+if (my >= mh)
+ {
+ my = 0;
+ msk = mask->image.data;
+ }
+
+for (step = 0; step < stepcount; step++, dst += stepsize, src +=
stepsize)
+ func(dst, src, msk, stepsize, color);
+
+r = w - (stepsize * stepcount);
+if (r > 0)
+ {
+ func(dst, src, msk, r, color);
+ dst += r;
+ src += r;
+ }
}
-#warning FIXME: filter full RGBA masking is now broken
- goto finish;
-
-#if 0
- // Mask --> Temp
- fake_cmd.input = cmd->mask;
- fake_cmd.mask
[EGIT] [core/efl] master 01/04: Evas GL: Detect GLES 3 support for OpenGL
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4de3caee9daf2ccc0736d79e38c3e6627021f07
commit c4de3caee9daf2ccc0736d79e38c3e6627021f07
Author: Jean-Philippe Andre
Date: Mon Dec 7 17:27:45 2015 +0900
Evas GL: Detect GLES 3 support for OpenGL
As @zmike mentionned in T2396 there is an extension string
declaring full support for GLES 3 when using OpenGL.
Note: I can't really test myself since I have recent drivers.
Hopefully this is correct.
Fixes T2396
---
src/modules/evas/engines/gl_common/evas_gl_context.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
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 440d345..04de885 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -481,8 +481,16 @@ _evas_gl_common_version_check(int *gles_ver)
/* Map GL to GLES version: Refer
http://en.wikipedia.org/wiki/OpenGL_ES */
if ((major >= 4) && (minor >= 3))
*gles_ver = 3;
+else if ((major > 3) || ((major == 3) && (minor >= 3))) /* >= 3.3 */
+ {
+ const char *exts = (const char *) glGetString(GL_EXTENSIONS);
+ if (exts && strstr(exts, "GL_ARB_ES3_compatibility"))
+ *gles_ver = 3;
+ else
+ *gles_ver = 2;
+ }
else
- *gles_ver = 2;
+ *gles_ver = 2; /* emulated support */
return 1;
}
--
[EGIT] [core/efl] master 01/01: Evas GL: Fix build for bigendian
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7a0103d01fe1cf45bf61fd5d60c608269be37484 commit 7a0103d01fe1cf45bf61fd5d60c608269be37484 Author: Jean-Philippe ANDRE Date: Tue Dec 8 01:03:40 2015 +0900 Evas GL: Fix build for bigendian Fixes T2918 --- src/modules/evas/engines/gl_common/evas_gl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c index 53f045b..dc2449d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_shader.c +++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c @@ -11,7 +11,7 @@ #define I(p) ((int)(intptr_t)p) #ifdef WORDS_BIGENDIAN -# define BASEFLAG SHADER_FLAG_BIGENDIAN; +# define BASEFLAG SHADER_FLAG_BIGENDIAN #else # define BASEFLAG 0 #endif --
[EGIT] [core/efl] master 01/01: Evas: Remove unwanted file added by accident
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d8b5e5da7b21ab7cefdd02187ef2d12990bbc3f8 commit d8b5e5da7b21ab7cefdd02187ef2d12990bbc3f8 Author: Jean-Philippe Andre Date: Tue Dec 8 14:54:21 2015 +0900 Evas: Remove unwanted file added by accident From commit 82504d9d77f761f2575f63095459011eba02a594 --- src/lib/evas/#Evas_# | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/evas/#Evas_# b/src/lib/evas/#Evas_# deleted file mode 100644 index 96d80cd..000 --- a/src/lib/evas/#Evas_# +++ /dev/null @@ -1 +0,0 @@ -C \ No newline at end of file --
[EGIT] [core/efl] master 01/01: Evas filters: Remove unused variable
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=15d5125d6ede35cfd73e31941a4642e4823f5198 commit 15d5125d6ede35cfd73e31941a4642e4823f5198 Author: Jean-Philippe Andre Date: Fri Dec 4 16:30:54 2015 +0900 Evas filters: Remove unused variable --- src/lib/evas/filters/evas_filter_parser.c | 1 - src/lib/evas/filters/evas_filter_private.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index 46ba86e..1122bef 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c @@ -2870,7 +2870,6 @@ _buffers_update(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm) buf->cid = evas_filter_buffer_empty_new(ctx, buf->alpha); fb = _filter_buffer_get(ctx, buf->cid); - fb->proxy = pb->eo_proxy; fb->source = pb->eo_source; fb->source_name = eina_stringshare_ref(pb->name); fb->ctx->has_proxies = EINA_TRUE; diff --git a/src/lib/evas/filters/evas_filter_private.h b/src/lib/evas/filters/evas_filter_private.h index d48a177..02dd977 100644 --- a/src/lib/evas/filters/evas_filter_private.h +++ b/src/lib/evas/filters/evas_filter_private.h @@ -234,8 +234,6 @@ struct _Evas_Filter_Buffer void *glimage; int w, h; - Evas_Object *proxy; - Eina_Bool alpha_only : 1; // 1 channel (A) instead of 4 (RGBA) Eina_Bool transient : 1; // temporary buffer (automatic allocation) Eina_Bool locked : 1; // internal flag --
[EGIT] [core/efl] master 01/01: Evas: Add all 'draw' files to evas static lib
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=75fed54f0e4d72b20860cae5a85aacf01ab3b9cf commit 75fed54f0e4d72b20860cae5a85aacf01ab3b9cf Author: Jean-Philippe Andre Date: Wed Dec 9 10:20:01 2015 +0900 Evas: Add all 'draw' files to evas static lib This should fix the build on old Ubuntu. I didn't get this error myself, but apparently the following issue happened: CCLD lib/ecore_evas/libecore_evas.la lib/evas/.libs/libevas.so: undefined reference to `efl_draw_neon_init' lib/evas/.libs/libevas.so: undefined reference to `efl_draw_sse2_init' collect2: ld returned 1 exit status Thanks @mer.kim for the report --- src/Makefile_Evas.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 07ff7c7..c942d21 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -262,6 +262,8 @@ lib/evas/canvas/evas_vg_shape.c # Static draw lib lib_evas_libevas_la_SOURCES += \ static_libs/draw/draw_alpha_main.c \ +static_libs/draw/draw_main_neon.c \ +static_libs/draw/draw_main_sse2.c \ static_libs/draw/draw_main.c # Engine --
[EGIT] [core/efl] master 01/01: Evas filters: Move 'fill' to its own file
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=31984449a546f165d8de5f4cb39bf0c602d6bd16
commit 31984449a546f165d8de5f4cb39bf0c602d6bd16
Author: Jean-Philippe Andre
Date: Wed Dec 9 11:42:31 2015 +0900
Evas filters: Move 'fill' to its own file
---
src/Makefile_Evas.am| 1 +
src/lib/evas/filters/evas_filter.c | 70 -
src/lib/evas/filters/evas_filter_fill.c | 65 ++
src/lib/evas/include/evas_macros.h | 4 ++
4 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index c942d21..b2d1c7a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -543,6 +543,7 @@ lib/evas/filters/evas_filter_blur.c \
lib/evas/filters/evas_filter_bump.c \
lib/evas/filters/evas_filter_curve.c \
lib/evas/filters/evas_filter_displace.c \
+lib/evas/filters/evas_filter_fill.c \
lib/evas/filters/evas_filter_mask.c \
lib/evas/filters/evas_filter_parser.c \
lib/evas/filters/evas_filter_transform.c \
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index 42f2da8..b7d8370 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -28,11 +28,6 @@ static void _buffer_free(Evas_Filter_Buffer *fb);
static void _command_del(Evas_Filter_Context *ctx, Evas_Filter_Command *cmd);
static RGBA_Image *_rgba_image_alloc(Evas_Filter_Buffer const *fb, void *data);
-#ifdef CLAMP
-# undef CLAMP
-#endif
-#define CLAMP(a,b,c) MIN(MAX((b),(a)),(c))
-
#define DRAW_COLOR_SET(r, g, b, a) do { cmd->draw.R = r; cmd->draw.G = g;
cmd->draw.B = b; cmd->draw.A = a; } while (0)
#define DRAW_CLIP_SET(_x, _y, _w, _h) do { cmd->draw.clip.x = _x;
cmd->draw.clip.y = _y; cmd->draw.clip.w = _w; cmd->draw.clip.h = _h; } while (0)
#define DRAW_FILL_SET(fmode) do { cmd->draw.fillmode = fmode; } while (0)
@@ -1365,71 +1360,6 @@ evas_filter_command_transform_add(Evas_Filter_Context
*ctx,
return cmd->id;
}
-static Eina_Bool
-_fill_cpu(Evas_Filter_Command *cmd)
-{
- Evas_Filter_Buffer *fb = cmd->output;
- int step = fb->alpha_only ? sizeof(DATA8) : sizeof(DATA32);
- int x = MAX(0, cmd->draw.clip.x);
- int y = MAX(0, cmd->draw.clip.y);
- DATA8 *ptr = ((RGBA_Image *) fb->backing)->image.data8;
- int w, h, k, j;
-
- if (!cmd->draw.clip_mode_lrtb)
- {
-if (cmd->draw.clip.w)
- w = MIN(cmd->draw.clip.w, fb->w - x);
-else
- w = fb->w - x;
-if (cmd->draw.clip.h)
- h = MIN(cmd->draw.clip.h, fb->h - y);
-else
- h = fb->h - y;
- }
- else
- {
-x = MAX(0, cmd->draw.clip.l);
-y = MAX(0, cmd->draw.clip.t);
-w = CLAMP(0, fb->w - x - cmd->draw.clip.r, fb->w - x);
-h = CLAMP(0, fb->h - y - cmd->draw.clip.b, fb->h - y);
- }
-
- ptr += y * step * fb->w;
- if ((fb->alpha_only)
- || (!cmd->draw.R && !cmd->draw.G && !cmd->draw.B && !cmd->draw.A)
- || ((cmd->draw.R == 0xff) && (cmd->draw.G == 0xff)
- && (cmd->draw.B == 0xff) && (cmd->draw.A == 0xff)))
- {
-for (k = 0; k < h; k++)
- {
- memset(ptr + (x * step), cmd->draw.A, step * w);
- ptr += step * fb->w;
- }
- }
- else
- {
-DATA32 *dst = ((DATA32 *) ptr) + x;
-DATA32 color = ARGB_JOIN(cmd->draw.A, cmd->draw.R, cmd->draw.G,
cmd->draw.B);
-for (k = 0; k < h; k++)
- {
- for (j = 0; j < w; j++)
- *dst++ = color;
- dst += fb->w - w;
- }
- }
-
- return EINA_TRUE;
-}
-
-Evas_Filter_Apply_Func
-evas_filter_fill_cpu_func_get(Evas_Filter_Command *cmd)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
- EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);
- return _fill_cpu;
-}
-
-
/* Final target */
Eina_Bool
evas_filter_target_set(Evas_Filter_Context *ctx, void *draw_context,
diff --git a/src/lib/evas/filters/evas_filter_fill.c
b/src/lib/evas/filters/evas_filter_fill.c
new file mode 100644
index 000..5293233
--- /dev/null
+++ b/src/lib/evas/filters/evas_filter_fill.c
@@ -0,0 +1,65 @@
+#include "evas_filter_private.h"
+
+static Eina_Bool
+_fill_cpu(Evas_Filter_Command *cmd)
+{
+ Evas_Filter_Buffer *fb = cmd->output;
+ int step = fb->alpha_only ? sizeof(DATA8) : sizeof(DATA32);
+ int x = MAX(0, cmd->draw.clip.x);
+ int y = MAX(0, cmd->draw.clip.y);
+ DATA8 *ptr = ((RGBA_Image *) fb->backing)->image.data8;
+ int w, h, k, j;
+
+ if (!cmd->draw.clip_mode_lrtb)
+ {
+if (cmd->draw.clip.w)
+ w = MIN(cmd->draw.clip.w, fb->w - x);
+else
+ w = fb->w - x;
+if (cmd->draw.clip.h)
+ h = MIN(cmd->draw.clip.h, fb->h - y);
+else
+ h = fb->h - y;
+ }
+ else
+ {
+x = MAX(0, cmd->draw.clip.l);
+y = MAX(0, cmd->draw.clip.t);
+w = CLAMP(0, fb->w - x - cmd->draw.c
[EGIT] [core/efl] master 01/01: Evas: Fix build for ubuntu... again
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b6ead19a94663d125e659c1c9ebf49eff40db040 commit b6ead19a94663d125e659c1c9ebf49eff40db040 Author: Jean-Philippe Andre Date: Wed Dec 9 16:58:48 2015 +0900 Evas: Fix build for ubuntu... again See 75fed54f0e4d72b20860 Apparently the proper CFLAGS are not set for SSE compilation. SSE flags are set only for a specific file (now 2 of them). As usual, it was worksforme but not for others. This should probably fix that. Thanks Sub for the report and testing this solution. --- src/Makefile_Evas.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index b2d1c7a..3f7dd39 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -263,7 +263,6 @@ lib/evas/canvas/evas_vg_shape.c lib_evas_libevas_la_SOURCES += \ static_libs/draw/draw_alpha_main.c \ static_libs/draw/draw_main_neon.c \ -static_libs/draw/draw_main_sse2.c \ static_libs/draw/draw_main.c # Engine @@ -373,7 +372,8 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \ -lib/evas/common/evas_op_blend/op_blend_master_sse3.c +lib/evas/common/evas_op_blend/op_blend_master_sse3.c \ +static_libs/draw/draw_main_sse2.c lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ $(lib_evas_libevas_la_CPPFLAGS) \ --
[EGIT] [core/efl] master 01/01: Revert "Evas: Refactor model's savers and loaders."
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4bcd2fa0f080ad8d2bb0a78250d01ec14954538d
commit 4bcd2fa0f080ad8d2bb0a78250d01ec14954538d
Author: Jean-Philippe Andre
Date: Thu Dec 10 18:20:43 2015 +0900
Revert "Evas: Refactor model's savers and loaders."
This reverts commit 01a32f64c0ffbe2ce048f8eb016d685913558cf5.
This broke make check with the following error:
evas_test_mesh.c:123:F:Meshes:evas_object_mesh_loader_saver:0: Failure 'res
== 1' occurred
Reopen https://phab.enlightenment.org/D3420
---
src/Makefile_Evas.am | 4 +-
...odel_load_save_common.c => evas_model_common.c} | 2 +-
...odel_load_save_common.h => evas_model_common.h} | 0
.../evas/model_loaders/eet/evas_model_load_eet.c | 2 +
.../evas/model_loaders/ply/evas_model_load_ply.c | 319 -
.../evas/model_savers/eet/evas_model_save_eet.c| 20 +-
.../evas/model_savers/obj/evas_model_save_obj.c| 239 ++-
.../evas/model_savers/ply/evas_model_save_ply.c| 121 +++-
8 files changed, 390 insertions(+), 317 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index d76356d..3f7dd39 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -224,8 +224,8 @@ lib/evas/canvas/evas_canvas3d_node_callback.h
lib_evas_libevas_la_SOURCES += \
lib/evas/common3d/save_load/evas_model_load.c \
lib/evas/common3d/save_load/evas_model_save.c \
-lib/evas/common3d/save_load/evas_model_load_save_common.c \
-lib/evas/common3d/save_load/evas_model_load_save_common.h \
+lib/evas/common3d/save_load/evas_model_common.c \
+lib/evas/common3d/save_load/evas_model_common.h \
modules/evas/model_loaders/eet/evas_model_load_eet.c \
modules/evas/model_loaders/md2/evas_model_load_md2.c \
modules/evas/model_loaders/obj/evas_model_load_obj.c \
diff --git a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
b/src/lib/evas/common3d/save_load/evas_model_common.c
similarity index 99%
rename from src/lib/evas/common3d/save_load/evas_model_load_save_common.c
rename to src/lib/evas/common3d/save_load/evas_model_common.c
index 190ba59..612bccd 100644
--- a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
+++ b/src/lib/evas/common3d/save_load/evas_model_common.c
@@ -1,4 +1,4 @@
-#include "evas_model_load_save_common.h"
+#include "evas_model_common.h"
# define SAVE_MESH_INDICES_COPY \
if (header.indices_count) \
diff --git a/src/lib/evas/common3d/save_load/evas_model_load_save_common.h
b/src/lib/evas/common3d/save_load/evas_model_common.h
similarity index 100%
rename from src/lib/evas/common3d/save_load/evas_model_load_save_common.h
rename to src/lib/evas/common3d/save_load/evas_model_common.h
diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
index e049e2c..f5b1b6b 100644
--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
@@ -127,3 +127,5 @@ evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh,
Eina_File *file)
_evas_canvas3d_eet_file_free(eet_file);
}
+
+
diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
index 971e951..1beef18 100644
--- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
+++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
@@ -1,4 +1,44 @@
-#include "evas_model_load_save_common.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include
+#include "stdio.h"
+#include "evas_common_private.h"
+#include "evas_private.h"
+#include
+
+/* set value to position [x][y] to array name which have. */
+#define ARRAY_2D(name, x, y, count_y) (*(name + x * count_y + y))
+
+/* Structures for reading data from file. */
+typedef struct _PLY_HeaderPLY_Header;
+
+struct _PLY_Header
+{
+ int vertices_count;
+ int triangles_count;
+ Eina_Bool existence_of_geometries;
+ Eina_Bool existence_of_normals;
+ Eina_Bool existence_of_texcoords;
+ Eina_Bool existence_of_colors;
+};
+
+/* create new header */
+static inline PLY_Header
+_new_ply_header()
+{
+ PLY_Header header;
+
+ header.vertices_count = 0;
+ header.triangles_count = 0;
+ header.existence_of_geometries = EINA_FALSE;
+ header.existence_of_normals = EINA_FALSE;
+ header.existence_of_texcoords = EINA_FALSE;
+ header.existence_of_colors = EINA_FALSE;
+
+ return header;
+}
static inline char *
_to_next_line(char *current)
@@ -41,8 +81,8 @@ _read_data(float *array, int place, int count, char *current,
float divider)
return current;
}
-static inline Eina_Bool
-_read_ply_header(char *map, Evas_Model_Load_Save_Header *header)
+static inline PLY_Header
+_read_header(char *map)//Check properties of mesh in .ply file.
{
eina_ini
[EGIT] [core/efl] master 01/01: Evas GL: Avoid confusing ERR message when requesting depth & stencil
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce21e513d5a86dbcf3ff4f72c131c763d67a04ec
commit ce21e513d5a86dbcf3ff4f72c131c763d67a04ec
Author: Jean-Philippe Andre
Date: Fri Dec 11 11:32:06 2015 +0900
Evas GL: Avoid confusing ERR message when requesting depth & stencil
An ERR message would be printed out mentionning that direct rendering
won't work on this window, even if DR was not requested.
Also, set the DR-specific flags only if DR is enabled.
See T2936.
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 108 --
1 file changed, 59 insertions(+), 49 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 633f54a..2059957 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1330,7 +1330,6 @@ _internal_config_set(void *eng_data, EVGL_Surface *sfc,
Evas_GL_Config *cfg)
int color_bit = 0, depth_bit = 0, stencil_bit = 0, msaa_samples = 0;
int depth_size = 0;
int native_win_depth = 0, native_win_stencil = 0, native_win_msaa = 0;
- Eina_Bool support_win_cfg = 1;
// Check if engine is valid
if (!evgl_engine)
@@ -1384,58 +1383,69 @@ try_again:
sfc->msaa_samples = evgl_engine->caps.fbo_fmts[i].samples;
// Direct Rendering Option
- if (evgl_engine->funcs->native_win_surface_config_get)
- evgl_engine->funcs->native_win_surface_config_get(eng_data,
&native_win_depth, &native_win_stencil, &native_win_msaa);
- if ((native_win_depth >= depth_size)
- && (native_win_stencil >= stencil_bit)
- && (native_win_msaa >= msaa_samples))
+ if (cfg->options_bits & EVAS_GL_OPTIONS_DIRECT)
{
- DBG("Win cfg can support the Req Evas GL's config
successfully");
- support_win_cfg = EINA_TRUE;
- }
- else
- {
- ERR("Win cfg can't support Evas GL DR, win: [depth %d,
stencil %d, msaa %d] "
- "want: [depth %d, stencil %d, msaa %d]",
- native_win_depth, native_win_stencil, native_win_msaa,
- depth_size, stencil_bit, msaa_samples);
- support_win_cfg = EINA_FALSE;
- }
+ Eina_Bool support_win_cfg = EINA_FALSE;
- if ((sfc->direct_override) || support_win_cfg)
- sfc->direct_fb_opt = !!(cfg->options_bits &
EVAS_GL_OPTIONS_DIRECT);
- else if (cfg->options_bits & EVAS_GL_OPTIONS_DIRECT)
- {
- const char *s1[] = { "", ":depth8", ":depth16", ":depth24",
":depth32" };
- const char *s2[] = { "", ":stencil1", ":stencil2",
":stencil4", ":stencil8", ":stencil16" };
- const char *s3[] = { "", ":msaa_low", ":msaa_mid",
":msaa_high" };
- INF("Can not enable direct rendering with depth %d, stencil
%d "
- "and MSAA %d. When using Elementary GLView, try to call "
- "elm_config_accel_preference_set(\"opengl%s%s%s\")
before "
- "creating any window.",
- depth_size, stencil_bit, msaa_samples,
- s1[cfg->depth_bits], s2[cfg->stencil_bits],
s3[cfg->multisample_bits]);
- }
+ if (evgl_engine->funcs->native_win_surface_config_get)
+
evgl_engine->funcs->native_win_surface_config_get(eng_data, &native_win_depth,
&native_win_stencil, &native_win_msaa);
+ if ((native_win_depth >= depth_size)
+ && (native_win_stencil >= stencil_bit)
+ && (native_win_msaa >= msaa_samples))
+{
+ DBG("Win cfg can support the Req Evas GL's config
successfully");
+ support_win_cfg = EINA_TRUE;
+}
+ else
+{
+ ERR("Win config can't support Evas GL direct rendering,
"
+ "win: [depth %d, stencil %d, msaa %d] "
+ "want: [depth %d, stencil %d, msaa %d]. %s",
+ native_win_depth, native_win_stencil,
native_win_msaa,
+ depth_size, stencil_bit, msaa_samples,
+ sfc->direct_override ?
+ "Forcing direct rendering anyway." :
+ "Falling back to indirect rendering (FBO).");
+ support_win_cfg = EINA_FALSE;
+}
- // When direct rendering is enabled, FBO configuration should
match
- // window surface configuration as FBO will be used in fallback
cases.
- // So we
[EGIT] [core/efl] master 01/02: Eolian gen: Don't fail if file is empty (--gi)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6dcde68d249a400b39680f80b07dbaad0801bf4f
commit 6dcde68d249a400b39680f80b07dbaad0801bf4f
Author: Jean-Philippe Andre
Date: Mon Dec 14 16:14:29 2015 +0900
Eolian gen: Don't fail if file is empty (--gi)
@fix
---
src/bin/eolian/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 0de9a28..20bb7d2 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -62,7 +62,7 @@ _read_file(const char *filename, Eina_Strbuf **buf)
fseek(fd, 0, SEEK_END);
long file_size = ftell(fd);
- if (file_size <= 0)
+ if (file_size < 0)
{
fprintf(stderr, "eolian: could not get length of '%s'\n", filename);
fclose(fd);
--
[EGIT] [core/efl] master 02/02: Evas filters: Temporarily disable failing tests
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ddd783ec88ee76a10b6dff61c7d76fd13e5a8952
commit ddd783ec88ee76a10b6dff61c7d76fd13e5a8952
Author: Jean-Philippe Andre
Date: Mon Dec 14 20:28:13 2015 +0900
Evas filters: Temporarily disable failing tests
Apparently a special font makes the vflip tests crash. vflip
definitely needs to be fixed.
I'm currently working on the filters, so I'll get back to these.
This is a temporary patch.
---
src/tests/evas/evas_test_filters.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/tests/evas/evas_test_filters.c
b/src/tests/evas/evas_test_filters.c
index ea27256..43232e3 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -276,9 +276,12 @@ static struct Filter_Test_Case _test_cases[] = {
{ 7, 7, 7, 7, "a = buffer ({ 'rgba' }) b = buffer ({ 'rgba' }) blend ({ dst
= b, color = '#330' }) blend ({ dst = a }) displace ({ map = b, src = a,
intensity = 7, flags = 'nearest_stretch' })", NULL },
{ 7, 7, 7, 7, "a = buffer ({ 'rgba' }) b = buffer ({ 'rgba' }) blend ({ dst
= b, color = '#330' }) blend ({ dst = a }) displace ({ map = b, src = a,
intensity = 7, flags = 'smooth_stretch' })", NULL },
+ /* FIXME Fix transform filter!!! FIXME */
+#if 0
{ 0, 0, 0, 40, "a = buffer ({ 'alpha' }) transform ({ a, 'vflip', oy = 20
}) blend ({ src = a })", NULL },
{ 0, 0, 40, 0, "a = buffer ({ 'alpha' }) transform ({ a, 'vflip', oy = -20
}) blend ({ src = a })", NULL },
{ 0, 0, 0, 40, "a = buffer ({ 'alpha' }) blend ({ dst = a }) transform ({
a, 'vflip', oy = 20, src = a }) blend ({ src = a })", NULL },
+#endif
// Filter combos. TODO: Add some more tricky cases : })
{ 3, 5, 7, 11, "blend ({ ox = -3, oy = 11 }) blend ({ ox = 5, oy = -7 })",
NULL },
--
[EGIT] [core/efl] master 02/09: Evas GL: Fix clang warnings
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4943fe3a0d86878850435237c4cf8c437107fb9f commit 4943fe3a0d86878850435237c4cf8c437107fb9f Author: Jean-Philippe Andre Date: Tue Dec 15 14:12:43 2015 +0900 Evas GL: Fix clang warnings Use pragma diagnostic like with GCC since we want to set the function pointer even though we deprecate the function. --- src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h index 0bc3e72..6d4ea48 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h @@ -1468,9 +1468,14 @@ _EVASGL_EXT_END() // Disable warnings about deprecated functions here #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif + _EVASGL_EXT_BEGIN(EGL_KHR_image_base) _EVASGL_EXT_DRVNAME(EGL_KHR_image_base) @@ -1503,7 +1508,9 @@ _EVASGL_EXT_BEGIN(EGL_KHR_image_base) _EVASGL_EXT_END() #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(__clang__) +# pragma clang diagnostic pop #endif --
[EGIT] [core/efl] master 04/09: Evas VG: Fix clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=42744eff6f476de637c7c0c6fdc0bd8856fcaad6
commit 42744eff6f476de637c7c0c6fdc0bd8856fcaad6
Author: Jean-Philippe Andre
Date: Tue Dec 15 14:35:58 2015 +0900
Evas VG: Fix clang warning
---
src/lib/evas/canvas/evas_vg_container.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_vg_container.c
b/src/lib/evas/canvas/evas_vg_container.c
index 32ffbfa..fbaa8bc 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -155,9 +155,7 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj,
{
// By setting parent, we automatically reference
// this new object as a child of obj. Magic at work !
-eo_add_ref(eo_class_get(child),
- obj,
- efl_vg_dup(child));
+(void) eo_add_ref(eo_class_get(child), obj, efl_vg_dup(child));
}
}
--
[EGIT] [core/efl] master 03/09: Eina Xml: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2960b7034037aaa31cbebe01fb19dd8c5a7d59cc
commit 2960b7034037aaa31cbebe01fb19dd8c5a7d59cc
Author: Jean-Philippe Andre
Date: Tue Dec 15 14:35:46 2015 +0900
Eina Xml: Fix clang warnings
---
src/lib/eina/eina_simple_xml_parser.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/eina/eina_simple_xml_parser.c
b/src/lib/eina/eina_simple_xml_parser.c
index d19e217..ad0ce62 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -741,7 +741,7 @@ eina_simple_xml_node_tag_free(Eina_Simple_XML_Node_Tag *tag)
if (!tag)
return;
- EINA_MAGIC_CHECK_TAG(&tag->base);
+ EINA_MAGIC_CHECK_TAG(&(tag->base));
if (tag->base.type != EINA_SIMPLE_XML_NODE_TAG)
{
ERR("expected tag node!");
@@ -793,7 +793,7 @@ eina_simple_xml_node_data_free(Eina_Simple_XML_Node_Data
*node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_DATA)
{
ERR("expected node of type: data!");
@@ -815,7 +815,7 @@ eina_simple_xml_node_cdata_free(Eina_Simple_XML_Node_Data
*node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_CDATA)
{
ERR("expected node of type: cdata!");
@@ -837,7 +837,7 @@
eina_simple_xml_node_doctype_child_free(Eina_Simple_XML_Node_Data *node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_DOCTYPE_CHILD)
{
ERR("expected node of type: doctype child!");
@@ -859,7 +859,7 @@
eina_simple_xml_node_processing_free(Eina_Simple_XML_Node_Data *node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_PROCESSING)
{
ERR("expected node of type: processing!");
@@ -881,7 +881,7 @@ eina_simple_xml_node_doctype_free(Eina_Simple_XML_Node_Data
*node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_DOCTYPE)
{
ERR("expected node of type: doctype!");
@@ -903,7 +903,7 @@ eina_simple_xml_node_comment_free(Eina_Simple_XML_Node_Data
*node)
if (!node)
return;
- EINA_MAGIC_CHECK_DATA(&node->base);
+ EINA_MAGIC_CHECK_DATA(&(node->base));
if (node->base.type != EINA_SIMPLE_XML_NODE_COMMENT)
{
ERR("expected node of type: comment!");
@@ -1042,7 +1042,7 @@ EAPI void
eina_simple_xml_node_root_free(Eina_Simple_XML_Node_Root *root)
{
if (!root) return;
- EINA_MAGIC_CHECK_TAG(&root->base);
+ EINA_MAGIC_CHECK_TAG(&(root->base));
if (root->base.type != EINA_SIMPLE_XML_NODE_ROOT)
{
ERR("expected root node!");
--
[EGIT] [core/efl] master 09/09: Examples: Remove strange characters at beginning of file
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=293812023e39c4a06cf37d84b58e41b4914ddbd2 commit 293812023e39c4a06cf37d84b58e41b4914ddbd2 Author: Jean-Philippe Andre Date: Tue Dec 15 14:55:20 2015 +0900 Examples: Remove strange characters at beginning of file --- src/examples/evas/evas-3d-colorpick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index 3ff7e7a..f3cf3b4 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -1,4 +1,4 @@ -/** +/** * This example shows how to use color pick algorithm for finding node at scene. * Enable color pick mode of meshes and scene objects. * Click (left for color pick, right for geometry pick) on 3D object and see --
[EGIT] [core/efl] master 01/09: Eina value: Fix clang warnings (use NULL instead of bool)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e68f0524b00e16b9e1c1f21f57d37b6b919b1ae
commit 9e68f0524b00e16b9e1c1f21f57d37b6b919b1ae
Author: Jean-Philippe Andre
Date: Tue Dec 15 14:12:21 2015 +0900
Eina value: Fix clang warnings (use NULL instead of bool)
---
src/lib/eina/eina_inline_value.x | 2 +-
src/lib/eina/eina_value.c| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x
index a9ceea1..04f8c89 100644
--- a/src/lib/eina/eina_inline_value.x
+++ b/src/lib/eina/eina_inline_value.x
@@ -1704,7 +1704,7 @@ eina_value_optional_type_get(Eina_Value *value)
void *mem = eina_value_memory_get(value);
if (!mem)
- return EINA_FALSE;
+ return NULL;
if(2*sizeof(void*) <= sizeof(Eina_Value_Union))
{
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index 8b45856..1e0217d 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -4406,12 +4406,12 @@ eina_value_optional_new(Eina_Value_Type const *subtype,
if (!eina_value_setup(value, EINA_VALUE_TYPE_OPTIONAL))
{
eina_mempool_free(_eina_value_mp, value);
-return EINA_FALSE;
+return NULL;
}
if (!eina_value_optional_pset(value, subtype, initial_value))
{
eina_mempool_free(_eina_value_mp, value);
-return EINA_FALSE;
+return NULL;
}
return value;
}
--
[EGIT] [core/efl] master 01/02: Eina log: Fix meaning of EINA_LOG_BACKTRACE env
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6bc24b4794ebe1bd0d40a155f136d1597a2a0ada
commit 6bc24b4794ebe1bd0d40a155f136d1597a2a0ada
Author: Jean-Philippe Andre
Date: Tue Dec 15 15:20:12 2015 +0900
Eina log: Fix meaning of EINA_LOG_BACKTRACE env
Most eina log env vars mean "if loglevel <= val then print log"
but eina_log_backtrace was "if loglevel < val" which I thought
was a bit confusing. The default behaviour is unchanged.
---
src/lib/eina/eina_log.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 6fc9626..3d30d34 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -121,7 +121,7 @@ static Eina_Bool _disable_timing = EINA_TRUE;
static int _abort_level_on_critical = EINA_LOG_LEVEL_CRITICAL;
#ifdef EINA_LOG_BACKTRACE
-static int _backtrace_level = 2; // CRI & ERR by default
+static int _backtrace_level = 1; // CRI & ERR by default
#endif
static Eina_Bool _threads_enabled = EINA_FALSE;
@@ -1850,7 +1850,7 @@ eina_log_domain_registered_level_set(int domain, int
level)
#ifdef EINA_LOG_BACKTRACE
# define DISPLAY_BACKTRACE(File, Level) \
- if (EINA_UNLIKELY(Level < _backtrace_level)) { \
+ if (EINA_UNLIKELY(Level <= _backtrace_level)) { \
fprintf(File, "*** Backtrace ***\n"); \
EINA_BT(File); \
}
@@ -1953,7 +1953,7 @@ eina_log_print_cb_journald(const Eina_Log_Domain *d,
cur = SELF();
#ifdef EINA_LOG_BACKTRACE
- if (EINA_LIKELY(level >= _backtrace_level))
+ if (EINA_LIKELY(level > _backtrace_level))
#endif
sd_journal_send_with_location(file_prefixed, line_str, fnc,
"PRIORITY=%i", level,
--
[EGIT] [core/efl] master 02/02: Eina log: Disable backtrace by default for dev builds
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1f75cfc3cfea087433b10df14fdfc355ae84fc4a
commit 1f75cfc3cfea087433b10df14fdfc355ae84fc4a
Author: Jean-Philippe Andre
Date: Tue Dec 15 15:27:20 2015 +0900
Eina log: Disable backtrace by default for dev builds
The EINA_LOG_BACKTRACE thing is aimed at production environments,
so we can extract a backtrace from a log file post-mortem, but not
for continuous development of EFL itself.
I know this should make a few people happy.
---
configure.ac| 5 +
src/lib/eina/eina_log.c | 7 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 05b836c..08976a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,12 +85,17 @@ case "${build_profile}" in
esac
prefer_assert="no"
+eina_log_backtrace="yes"
case "${build_profile}" in
dev|debug)
prefer_assert="yes"
+ eina_log_backtrace="no"
;;
esac
+# Enable CRI & ERR backtrace by default for release but not for dev/debug
+AC_DEFINE_IF([EINA_LOG_BACKTRACE_ENABLE], [test "x${eina_log_backtrace}" =
"xyes"], [1], [Default log level triggering backtraces])
+
# TODO: add some build "profile" (server, full, etc...)
AC_ARG_WITH([crypto],
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 3d30d34..b544468 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -121,7 +121,12 @@ static Eina_Bool _disable_timing = EINA_TRUE;
static int _abort_level_on_critical = EINA_LOG_LEVEL_CRITICAL;
#ifdef EINA_LOG_BACKTRACE
-static int _backtrace_level = 1; // CRI & ERR by default
+// CRI & ERR by default in release mode, nothing in dev mode
+# ifndef EINA_LOG_BACKTRACE_ENABLE
+static int _backtrace_level = -1;
+# else
+static int _backtrace_level = 1;
+# endif
#endif
static Eina_Bool _threads_enabled = EINA_FALSE;
--
[EGIT] [core/efl] master 02/02: Eina safety: Set error flag in case of safety check error
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7fd907a1322ae251ca171f610dcaf06c700565e7
commit 7fd907a1322ae251ca171f610dcaf06c700565e7
Author: Jean-Philippe Andre
Date: Tue Dec 15 17:39:37 2015 +0900
Eina safety: Set error flag in case of safety check error
Eina_Error is almost not used at all. Meh.
---
src/lib/eina/eina_safety_checks.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/eina/eina_safety_checks.c
b/src/lib/eina/eina_safety_checks.c
index 57b863d..4ead9d6 100644
--- a/src/lib/eina/eina_safety_checks.c
+++ b/src/lib/eina/eina_safety_checks.c
@@ -69,6 +69,7 @@ eina_safety_checks_init(void)
if (!(initcnt++))
{
EINA_SAFETY_LOG_DOMAIN = eina_log_domain_register("eina_safety",
EINA_COLOR_RED);
+EINA_ERROR_SAFETY_FAILED = eina_error_msg_static_register("Safety
check failed");
}
return EINA_TRUE;
}
@@ -76,6 +77,7 @@ eina_safety_checks_init(void)
EAPI void
_eina_safety_error(const char *file, const char *func, int line, const char
*str)
{
+ eina_error_set(EINA_ERROR_SAFETY_FAILED);
if (EINA_SAFETY_LOG_DOMAIN)
{
eina_log_print(EINA_SAFETY_LOG_DOMAIN, EINA_LOG_LEVEL_ERR,
--
[EGIT] [core/efl] master 01/02: Eina safety: Add internal function to log errors
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ad9654fbc789c0d11aea265f9875b43d0ec5652
commit 5ad9654fbc789c0d11aea265f9875b43d0ec5652
Author: Jean-Philippe Andre
Date: Tue Dec 15 16:56:13 2015 +0900
Eina safety: Add internal function to log errors
The main reason is convenience for debugging when using GDB,
this will give a simple breakpoint for all safety check failures.
Also, this creates a more visible log domain (red).
---
src/lib/eina/eina_safety_checks.c | 63 ---
src/lib/eina/eina_safety_checks.h | 35 --
2 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/src/lib/eina/eina_safety_checks.c
b/src/lib/eina/eina_safety_checks.c
index 1ee6991..57b863d 100644
--- a/src/lib/eina/eina_safety_checks.c
+++ b/src/lib/eina/eina_safety_checks.c
@@ -25,45 +25,33 @@
#include "eina_log.h"
#include "eina_safety_checks.h"
-/**
-* Local *
-**/
+EAPI Eina_Error EINA_ERROR_SAFETY_FAILED = 0;
-/**
-* Global *
-**/
+static int EINA_SAFETY_LOG_DOMAIN = 0;
+static int initcnt = 0;
/**
- * @internal
- * @brief Shut down the safety checks module.
+ * Log entry-point called every time an eina safety check fails.
*
- * @return #EINA_TRUE on success, #EINA_FALSE on failure.
+ * One purpose of this dedicated function is to provide a convenient breakpoint
+ * for GDB debugging. Also, this gives it a dedicated log domain, rather than
+ * using the default one.
*
- * This function shuts down the error module set up by
- * eina_safety_checks_init(). It is called by eina_shutdown().
- *
- * @see eina_shutdown()
+ * @since 1.17
+ * @internal
*/
Eina_Bool
eina_safety_checks_shutdown(void)
{
+ if (!initcnt) return EINA_FALSE;
+ if (!(--initcnt))
+ {
+eina_log_domain_unregister(EINA_SAFETY_LOG_DOMAIN);
+EINA_SAFETY_LOG_DOMAIN = 0;
+ }
return EINA_TRUE;
}
-/**
-* API *
-**/
-
-/**
- * @cond LOCAL
- */
-
-EAPI Eina_Error EINA_ERROR_SAFETY_FAILED = 0;
-
-/**
- * @endcond
- */
-
/**
* @internal
* @brief Initialize the safety checks module.
@@ -78,9 +66,24 @@ EAPI Eina_Error EINA_ERROR_SAFETY_FAILED = 0;
Eina_Bool
eina_safety_checks_init(void)
{
+ if (!(initcnt++))
+ {
+EINA_SAFETY_LOG_DOMAIN = eina_log_domain_register("eina_safety",
EINA_COLOR_RED);
+ }
return EINA_TRUE;
}
-/**
- * @}
- */
+EAPI void
+_eina_safety_error(const char *file, const char *func, int line, const char
*str)
+{
+ if (EINA_SAFETY_LOG_DOMAIN)
+ {
+eina_log_print(EINA_SAFETY_LOG_DOMAIN, EINA_LOG_LEVEL_ERR,
+ file, func, line, "%s", str);
+ }
+ else
+ {
+eina_log_print(EINA_LOG_DOMAIN_DEFAULT, EINA_LOG_LEVEL_ERR,
+ file, func, line, "%s", str);
+ }
+}
diff --git a/src/lib/eina/eina_safety_checks.h
b/src/lib/eina/eina_safety_checks.h
index d40eeb9..656054b 100644
--- a/src/lib/eina/eina_safety_checks.h
+++ b/src/lib/eina/eina_safety_checks.h
@@ -93,12 +93,29 @@ EAPI extern Eina_Error EINA_ERROR_SAFETY_FAILED;
#include "eina_log.h"
+# ifdef EFL_BETA_API_SUPPORT
+/**
+ * Log entry-point called every time an eina safety check fails.
+ *
+ * One purpose of this dedicated function is to provide a convenient breakpoint
+ * for GDB debugging. Also, this gives it a dedicated log domain, rather than
+ * using the default one.
+ *
+ * @since 1.17
+ * @internal
+ */
+EAPI void _eina_safety_error(const char *file, const char *func, int line,
const char *str);
+# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __FUNCTION__,
__LINE__, msg)
+# else
+# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg)
+# endif
+
#define EINA_SAFETY_ON_NULL_RETURN(exp) \
do \
{ \
if (EINA_UNLIKELY((exp) == NULL)) \
{\
-EINA_LOG_ERR("%s", "safety check failed: " # exp " == NULL"); \
+EINA_SAFETY_ERROR("safety check failed: " # exp " == NULL"); \
return;
[EGIT] [core/efl] master 01/01: Evas GL: Fix shaders for bigendian
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4a538ec2461a42507a1917cd63006507e52f5889 commit 4a538ec2461a42507a1917cd63006507e52f5889 Author: Jean-Philippe Andre Date: Wed Dec 16 15:55:10 2015 +0900 Evas GL: Fix shaders for bigendian Fixes T2918 --- src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x | 4 ++-- src/modules/evas/engines/gl_common/shader/fragment.glsl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x index 19120e2..a0132aa 100644 --- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x +++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x @@ -67,13 +67,13 @@ static const char fragment_glsl[] = "# define SWZ \n" "#else\n" "# ifndef SHD_BGRA\n" - "# if defined(SHD_IMG) && defined(BIGENDIAN)\n" + "# if defined(SHD_IMG) && defined(SHD_BIGENDIAN)\n" "# define SWZ gbar\n" "# else\n" "# define SWZ bgra\n" "#endif\n" "# else\n" - "# if defined(SHD_IMG) && defined(BIGENDIAN)\n" + "# if defined(SHD_IMG) && defined(SHD_BIGENDIAN)\n" "# define SWZ grab\n" "# else\n" "# define SWZ rgba\n" diff --git a/src/modules/evas/engines/gl_common/shader/fragment.glsl b/src/modules/evas/engines/gl_common/shader/fragment.glsl index 3dce873..baa22e3 100644 --- a/src/modules/evas/engines/gl_common/shader/fragment.glsl +++ b/src/modules/evas/engines/gl_common/shader/fragment.glsl @@ -60,13 +60,13 @@ varying vec2 masktex_s[4]; # define SWZ #else # ifndef SHD_BGRA -# if defined(SHD_IMG) && defined(BIGENDIAN) +# if defined(SHD_IMG) && defined(SHD_BIGENDIAN) # define SWZ gbar # else # define SWZ bgra #endif # else -# if defined(SHD_IMG) && defined(BIGENDIAN) +# if defined(SHD_IMG) && defined(SHD_BIGENDIAN) # define SWZ grab # else # define SWZ rgba --
