summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_generic/evas_engine.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/evas/engines/gl_generic/evas_engine.c')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ddedadd..d296cf6 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2477,15 +2477,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei
2477 { 2477 {
2478 RGBA_Image *im = engine_image; 2478 RGBA_Image *im = engine_image;
2479 2479
2480 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, 2480 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2481 evas_ector_buffer_engine_image_set(evas, im));
2482 } 2481 }
2483 else 2482 else
2484 { 2483 {
2485 Evas_GL_Image *im = engine_image; 2484 Evas_GL_Image *im = engine_image;
2486 2485
2487 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, 2486 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2488 evas_ector_buffer_engine_image_set(evas, im));
2489 } 2487 }
2490 return buf; 2488 return buf;
2491} 2489}
@@ -2546,8 +2544,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
2546 2544
2547 gc = re->window_gl_context_get(re->software.ob); 2545 gc = re->window_gl_context_get(re->software.ob);
2548 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); 2546 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE);
2549 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, 2547 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2550 evas_ector_buffer_engine_image_set(evas, im));
2551 im->references--; 2548 im->references--;
2552 } 2549 }
2553 return buf; 2550 return buf;
@@ -2623,11 +2620,8 @@ eng_ector_renderer_draw(void *data, void *context, void *surface, void *engine_d
2623 if (eina_array_count(c) == 0) 2620 if (eina_array_count(c) == 0)
2624 eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h)); 2621 eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h));
2625 2622
2626 eo_do(renderer, 2623 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
2627 ector_renderer_draw(_evas_render_op_to_ector_rop(gc->dc->render_op), 2624 0xffffffff);
2628 c,
2629 // mul_col will be applied by GL during ector_end
2630 0xffffffff));
2631 2625
2632 while ((r = eina_array_pop(c))) 2626 while ((r = eina_array_pop(c)))
2633 eina_rectangle_free(r); 2627 eina_rectangle_free(r);
@@ -2704,16 +2698,14 @@ eng_ector_begin(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
2704 } 2698 }
2705 } 2699 }
2706 memset(buffer->software, 0, sizeof (unsigned int) * w * h); 2700 memset(buffer->software, 0, sizeof (unsigned int) * w * h);
2707 eo_do(ector, 2701 ector_buffer_pixels_set(ector, buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
2708 ector_buffer_pixels_set(buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 2702 ector_surface_reference_point_set(ector, x, y);
2709 EINA_TRUE, 0, 0, 0, 0),
2710 ector_surface_reference_point_set(x, y));
2711 } 2703 }
2712 else 2704 else
2713 { 2705 {
2714 evas_gl_common_context_flush(gl_context); 2706 evas_gl_common_context_flush(gl_context);
2715 2707
2716 eo_do(ector, ector_surface_reference_point_set(x, y)); 2708 ector_surface_reference_point_set(ector, x, y);
2717 } 2709 }
2718} 2710}
2719 2711
@@ -2734,7 +2726,7 @@ eng_ector_end(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
2734 w = gl_context->w; h = gl_context->h; 2726 w = gl_context->w; h = gl_context->h;
2735 mul_use = gl_context->dc->mul.use; 2727 mul_use = gl_context->dc->mul.use;
2736 2728
2737 eo_do(ector, ector_buffer_pixels_set(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0)); 2729 ector_buffer_pixels_set(ector, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0);
2738 eng_image_data_put(data, buffer->gl, buffer->software); 2730 eng_image_data_put(data, buffer->gl, buffer->software);
2739 2731
2740 if (!mul_use) 2732 if (!mul_use)