summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/software_generic/evas_engine.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/evas/engines/software_generic/evas_engine.c')
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index e147814..f2018a6 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3765,8 +3765,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_
3765 3765
3766 if (!ie) return NULL; 3766 if (!ie) return NULL;
3767 3767
3768 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, 3768 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eoid, e, ie));
3769 evas_ector_buffer_engine_image_set(e, ie));
3770 3769
3771 return buf; 3770 return buf;
3772} 3771}
@@ -3785,9 +3784,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels,
3785 3784
3786 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) 3785 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0)
3787 { 3786 {
3788 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, 3787 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eoid, pixels, width, height, stride, cspace, writeable, l, r, t, b));
3789 ector_buffer_pixels_set(pixels, width, height, stride, cspace,
3790 writeable, l, r, t, b));
3791 } 3788 }
3792 else 3789 else
3793 { 3790 {
@@ -3854,10 +3851,7 @@ _draw_thread_ector_draw(void *data)
3854{ 3851{
3855 Evas_Thread_Command_Ector *ector = data; 3852 Evas_Thread_Command_Ector *ector = data;
3856 3853
3857 eo_do(ector->r, 3854 ector_renderer_draw(ector->r, ector->render_op, ector->clips, ector->mul_col);
3858 ector_renderer_draw(ector->render_op,
3859 ector->clips,
3860 ector->mul_col));
3861 3855
3862 _draw_thread_ector_cleanup(ector); 3856 _draw_thread_ector_cleanup(ector);
3863} 3857}
@@ -3971,10 +3965,8 @@ _draw_thread_ector_surface_set(void *data)
3971 y = ector_surface->y; 3965 y = ector_surface->y;
3972 } 3966 }
3973 3967
3974 eo_do(ector_surface->ector, 3968 ector_buffer_pixels_set(ector_surface->ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
3975 ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 3969 ector_surface_reference_point_set(ector_surface->ector, x, y);
3976 EINA_TRUE, 0, 0, 0, 0),
3977 ector_surface_reference_point_set(x, y));
3978 3970
3979 eina_mempool_free(_mp_command_ector_surface, ector_surface); 3971 eina_mempool_free(_mp_command_ector_surface, ector_surface);
3980} 3972}
@@ -4018,10 +4010,8 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
4018 w = sf->cache_entry.w; 4010 w = sf->cache_entry.w;
4019 h = sf->cache_entry.h; 4011 h = sf->cache_entry.h;
4020 4012
4021 eo_do(ector, 4013 ector_buffer_pixels_set(ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
4022 ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 4014 ector_surface_reference_point_set(ector, x, y);
4023 EINA_TRUE, 0, 0, 0, 0),
4024 ector_surface_reference_point_set(x, y));
4025 } 4015 }
4026} 4016}
4027 4017
@@ -4042,7 +4032,7 @@ eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface *
4042 } 4032 }
4043 else 4033 else
4044 { 4034 {
4045 eo_do(ector, ector_renderer_surface_set(NULL)); 4035 ector_renderer_surface_set(ector, NULL);
4046 evas_common_cpu_end_opt(); 4036 evas_common_cpu_end_opt();
4047 } 4037 }
4048} 4038}