aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c6
-rw-r--r--src/modules/evas/engines/gl_generic/ector_surface.c6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c18
-rw-r--r--src/modules/evas/engines/software_generic/ector_surface.c6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c26
5 files changed, 31 insertions, 31 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 5344473c1d..83d54a48bb 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -105,7 +105,7 @@ _evas_gl_preload_main_loop_wakeup(void)
if (async->tex)
{
EINA_LIST_FREE(async->tex->targets, target)
- eo_do(target, evas_obj_image_pixels_dirty_set(EINA_TRUE));
+ eo_do(target, evas_obj_image_pixels_dirty_set(target, EINA_TRUE));
}
async->im->cache_entry.flags.preload_done = 0;
if (async->tex)
@@ -316,7 +316,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
EINA_SAFETY_ON_NULL_RETURN(tex);
eo_do(target,
- eo_event_callback_add(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+ eo_event_callback_add(target, EO_EV_DEL, _evas_gl_preload_target_die, tex));
tex->targets = eina_list_append(tex->targets, target);
tex->references++;
}
@@ -330,7 +330,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
EINA_SAFETY_ON_NULL_RETURN(tex);
eo_do(target,
- eo_event_callback_del(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+ eo_event_callback_del(target, EO_EV_DEL, _evas_gl_preload_target_die, tex));
EINA_LIST_FOREACH(tex->targets, l, o)
if (o == target)
diff --git a/src/modules/evas/engines/gl_generic/ector_surface.c b/src/modules/evas/engines/gl_generic/ector_surface.c
index 01e3c5de0d..32805b95f2 100644
--- a/src/modules/evas/engines/gl_generic/ector_surface.c
+++ b/src/modules/evas/engines/gl_generic/ector_surface.c
@@ -21,7 +21,7 @@ _ector_cairo_symbol_get(Eo *ector_surface, const char *name)
void *sym;
eo_do(ector_surface,
- sym = ector_cairo_surface_symbol_get(name));
+ sym = ector_cairo_surface_symbol_get(ector_surface, name));
return sym;
}
@@ -88,8 +88,8 @@ _ector_cairo_software_surface_surface_set(Eo *obj, Ector_Cairo_Software_Surface_
end:
eo_do(obj,
- ector_cairo_surface_context_set(pd->ctx),
- ector_surface_size_set(pd->width, pd->height));
+ ector_cairo_surface_context_set(obj, pd->ctx),
+ ector_surface_size_set(obj, pd->width, pd->height));
}
static void
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 2cf26ab235..dc67e6f3c3 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2383,12 +2383,12 @@ eng_ector_create(void *data EINA_UNUSED)
ector_backend = getenv("ECTOR_BACKEND");
if (ector_backend && !strcasecmp(ector_backend, "default"))
{
- ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_FALSE;
}
else
{
- ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_TRUE;
}
return ector;
@@ -2471,7 +2471,7 @@ eng_ector_renderer_draw(void *data, void *context, void *surface, Ector_Renderer
eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h));
eo_do(renderer,
- ector_renderer_draw(_evas_render_op_to_ector_rop(gc->dc->render_op),
+ ector_renderer_draw(renderer, _evas_render_op_to_ector_rop(gc->dc->render_op),
c,
// mul_col will be applied by GL during ector_end
0xffffffff));
@@ -2503,14 +2503,14 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(software_buffer, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector, software_buffer, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
else
{
eo_do(ector,
- ector_software_surface_set(software_buffer, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector, software_buffer, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
}
@@ -2531,12 +2531,12 @@ eng_ector_end(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(NULL, 0, 0));
+ ector_cairo_software_surface_set(ector, NULL, 0, 0));
}
else
{
eo_do(ector,
- ector_software_surface_set(NULL, 0, 0));
+ ector_software_surface_set(ector, NULL, 0, 0));
}
im = evas_gl_common_image_new_from_copied_data(gl_context, w, h, software_buffer, 1, EVAS_COLORSPACE_ARGB8888);
diff --git a/src/modules/evas/engines/software_generic/ector_surface.c b/src/modules/evas/engines/software_generic/ector_surface.c
index ffa32313b6..d202cf6c8f 100644
--- a/src/modules/evas/engines/software_generic/ector_surface.c
+++ b/src/modules/evas/engines/software_generic/ector_surface.c
@@ -21,7 +21,7 @@ _ector_cairo_symbol_get(Eo *ector_surface, const char *name)
void *sym;
eo_do(ector_surface,
- sym = ector_cairo_surface_symbol_get(name));
+ sym = ector_cairo_surface_symbol_get(ector_surface, name));
return sym;
}
@@ -90,8 +90,8 @@ _ector_cairo_software_surface_surface_set(Eo *obj, Ector_Cairo_Software_Surface_
evas_common_cpu_end_opt();
eo_do(obj,
- ector_cairo_surface_context_set(ctx),
- ector_surface_size_set(pd->width, pd->height));
+ ector_cairo_surface_context_set(obj, ctx),
+ ector_surface_size_set(obj, pd->width, pd->height));
}
void
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index d9b8956c99..4ea11f6feb 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3679,12 +3679,12 @@ eng_ector_create(void *data EINA_UNUSED)
ector_backend = getenv("ECTOR_BACKEND");
if (ector_backend && !strcasecmp(ector_backend, "default"))
{
- ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_FALSE;
}
else
{
- ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_TRUE;
}
return ector;
@@ -3729,7 +3729,7 @@ _draw_thread_ector_draw(void *data)
Evas_Thread_Command_Ector *ector = data;
eo_do(ector->r,
- ector_renderer_draw(ector->render_op,
+ ector_renderer_draw(ector->r, ector->render_op,
ector->clips,
ector->mul_col));
@@ -3848,14 +3848,14 @@ _draw_thread_ector_surface_set(void *data)
if (use_cairo)
{
eo_do(ector_surface->ector,
- ector_cairo_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector_surface->ector, pixels, w, h),
+ ector_surface_reference_point_set(ector_surface->ector, x, y));
}
else
{
eo_do(ector_surface->ector,
- ector_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector_surface->ector, pixels, w, h),
+ ector_surface_reference_point_set(ector_surface->ector, x, y));
}
eina_mempool_free(_mp_command_ector_surface, ector_surface);
@@ -3892,14 +3892,14 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector, pixels, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
else
{
eo_do(ector,
- ector_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector, pixels, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
}
}
@@ -3924,12 +3924,12 @@ eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface *
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(NULL, 0, 0));
+ ector_cairo_software_surface_set(ector, NULL, 0, 0));
}
else
{
eo_do(ector,
- ector_software_surface_set(NULL, 0, 0));
+ ector_software_surface_set(ector, NULL, 0, 0));
}
evas_common_cpu_end_opt();