summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2013-01-08 04:00:36 +0000
committerCarsten Haitzler <raster@rasterman.com>2013-01-08 04:00:36 +0000
commita8cc6e9e163cba4ef6bf359e5d7a53f275affe73 (patch)
tree8e781d6a5e52ff1597b69d362a4309dae5733eb5 /src
parent7cb5f0f921cd0e327b7677915e0efd7a6dbd4c4f (diff)
oosp - didnt meant o commit this... it was just the start of some test
code... not ready yet. just adds warnings and stuff. SVN revision: 82381
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_render.c24
-rw-r--r--src/lib/evas/include/evas_private.h40
2 files changed, 0 insertions, 64 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index a5b5e8fdc9..bed97c5b26 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -58,8 +58,6 @@ struct _Render_Updates
58 58
59static Eina_Bool 59static Eina_Bool
60evas_render_updates_internal(Evas *eo_e, unsigned char make_updates, unsigned char do_draw, Evas_Render_Done_Cb done_func, void *done_data, Evas_Event_Cb updates_func, void *updates_data, Eina_Bool do_async); 60evas_render_updates_internal(Evas *eo_e, unsigned char make_updates, unsigned char do_draw, Evas_Render_Done_Cb done_func, void *done_data, Evas_Event_Cb updates_func, void *updates_data, Eina_Bool do_async);
61static void
62_evas_render_mode_eval(Evas_Public_Data *e);
63 61
64EAPI void 62EAPI void
65evas_damage_rectangle_add(Evas *eo_e, int x, int y, int w, int h) 63evas_damage_rectangle_add(Evas *eo_e, int x, int y, int w, int h)
@@ -1553,7 +1551,6 @@ evas_render_updates_internal(Evas *eo_e,
1553 { 1551 {
1554 unsigned int offset = 0; 1552 unsigned int offset = 0;
1555 1553
1556 _evas_render_mode_eval(e);
1557 while ((surface = 1554 while ((surface =
1558 e->engine.func->output_redraws_next_update_get 1555 e->engine.func->output_redraws_next_update_get
1559 (e->engine.data.output, 1556 (e->engine.data.output,
@@ -2123,25 +2120,4 @@ evas_render_object_recalc(Evas_Object *eo_obj)
2123 } 2120 }
2124} 2121}
2125 2122
2126static void
2127_evas_render_mode_eval(Evas_Public_Data *e) // eo
2128{
2129 Evas_Opset opset;
2130 int i;
2131
2132 if (!e->engine.func) return;
2133 if (!e->engine.func->opset_eval) return;
2134
2135 // XXX1: walk thru active objects - figure out render ops
2136 for (i = 0; i < e->active_objects.count; ++i)
2137 {
2138 Evas_Object_Protected_Data *obj = eina_array_data_get(&e->active_objects, i); // eo
2139 Evas_Object *eo_obj; // eo
2140
2141 if (!obj) continue;
2142 eo_obj = obj->object; // eo
2143 }
2144 e->engine.func->opset_eval(e->engine.data.output, &opset);
2145}
2146
2147/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ 2123/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 188feda60b..876401dc42 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -34,7 +34,6 @@ typedef struct _Evas_Font_Description Evas_Font_Description;
34typedef struct _Evas_Data_Node Evas_Data_Node; 34typedef struct _Evas_Data_Node Evas_Data_Node;
35typedef struct _Evas_Func_Node Evas_Func_Node; 35typedef struct _Evas_Func_Node Evas_Func_Node;
36typedef RGBA_Image_Loadopts Evas_Image_Load_Opts; 36typedef RGBA_Image_Loadopts Evas_Image_Load_Opts;
37typedef struct _Evas_Opset Evas_Opset;
38typedef struct _Evas_Func Evas_Func; 37typedef struct _Evas_Func Evas_Func;
39typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func; 38typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
40typedef struct _Evas_Image_Save_Func Evas_Image_Save_Func; 39typedef struct _Evas_Image_Save_Func Evas_Image_Save_Func;
@@ -754,42 +753,6 @@ struct _Evas_Object_Func
754 int (*get_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); 753 int (*get_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
755 754
756 int (*can_map) (Evas_Object *obj); 755 int (*can_map) (Evas_Object *obj);
757
758 int (*opset_get) (Evas_Object *obj);
759};
760
761typedef enum _Evas_Optype
762{
763 EVAS_OP_FILL_COLOR,
764 EVAS_OP_BLEND_COLOR,
765 EVAS_OP_COPY_PIXELS,
766 EVAS_OP_BLEND_PIXELS,
767 EVAS_OP_BLEND_ALPHA_MUL_PIXELS,
768 EVAS_OP_BLEND_COLOR_MUL_PIXELS,
769 EVAS_OP_SCALE_NEAREST_COPY_PIXELS,
770 EVAS_OP_BLEND_NEAREST_COPY_PIXELS,
771 EVAS_OP_SCALE_NEAREST_COPY_ALPHA_MUL_PIXELS,
772 EVAS_OP_BLEND_NEAREST_COPY_COLOR_MUL_PIXELS,
773 EVAS_OP_SCALE_SMOOTH_COPY_PIXELS,
774 EVAS_OP_BLEND_SMOOTH_COPY_PIXELS,
775 EVAS_OP_SCALE_SMOOTH_COPY_ALPHA_MUL_PIXELS,
776 EVAS_OP_BLEND_SMOOTH_COPY_COLOR_MUL_PIXELS,
777 EVAS_OP_BLEND_COLOR_ALPHA_MASK,
778 EVAS_OP_MAP_COPY_PIXELS,
779 EVAS_OP_MAP_BLEND_PIXELS,
780 EVAS_OP_MAP_COPY_ALPHA_MUL_PIXELS,
781 EVAS_OP_MAP_BLEND_COLOR_MUL_PIXELS,
782 EVAS_OP_MAP_90MUL_COPY_PIXELS,
783 EVAS_OP_MAP_90MUL_BLEND_PIXELS,
784 EVAS_OP_MAP_90MUL_COPY_ALPHA_MUL_PIXELS,
785 EVAS_OP_MAP_90MUL_BLEND_COLOR_MUL_PIXELS,
786 EVAS_OP_COUNT // marker for last one
787 // XXX: line? poly? or just made up of strips of the above?
788} Evas_Optype;
789
790struct _Evas_Opset
791{
792 Eina_Bool ops[EVAS_OP_COUNT];
793}; 756};
794 757
795struct _Evas_Func 758struct _Evas_Func
@@ -936,9 +899,6 @@ struct _Evas_Func
936 899
937 /* max size query */ 900 /* max size query */
938 void (*image_max_size_get) (void *data, int *maxw, int *maxh); 901 void (*image_max_size_get) (void *data, int *maxw, int *maxh);
939
940 /* pre-seed the engine with the kind of ops it will need */
941 void (*opset_eval) (void *data, Evas_Opset *ops);
942}; 902};
943 903
944struct _Evas_Image_Load_Func 904struct _Evas_Image_Load_Func