summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:21:57 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:21:57 +0200
commitfcbc29f85e04fa4dba30baa4ec692ae1fcad173d (patch)
treeb97ceb569937cfadcdb56d3fce2e9a8d468a4dec
parentcba397fcf1505b164d7f8b5ef4f6a0dd7cc7822d (diff)
ector: move dependency around. Evas now depend on Ector.
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile_Evas.am1
-rw-r--r--src/lib/ector/Ector.h5
-rw-r--r--src/lib/ector/cairo/Ector_Cairo.h1
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.eo7
-rw-r--r--src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo21
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c26
7 files changed, 61 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index afad51b..e773931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1676,6 +1676,7 @@ EFL_INTERNAL_DEPEND_PKG([EVAS], [eet])
1676EFL_INTERNAL_DEPEND_PKG([EVAS], [eina]) 1676EFL_INTERNAL_DEPEND_PKG([EVAS], [eina])
1677EFL_INTERNAL_DEPEND_PKG([EVAS], [efl]) 1677EFL_INTERNAL_DEPEND_PKG([EVAS], [efl])
1678EFL_INTERNAL_DEPEND_PKG([EVAS], [emile]) 1678EFL_INTERNAL_DEPEND_PKG([EVAS], [emile])
1679EFL_INTERNAL_DEPEND_PKG([EVAS], [ector])
1679 1680
1680EFL_ADD_LIBS([EVAS], [-lm]) 1681EFL_ADD_LIBS([EVAS], [-lm])
1681 1682
@@ -2113,7 +2114,7 @@ EFL_PLATFORM_DEPEND([ECTOR], [evil])
2113 2114
2114EFL_INTERNAL_DEPEND_PKG([ECTOR], [eina]) 2115EFL_INTERNAL_DEPEND_PKG([ECTOR], [eina])
2115EFL_INTERNAL_DEPEND_PKG([ECTOR], [eo]) 2116EFL_INTERNAL_DEPEND_PKG([ECTOR], [eo])
2116EFL_INTERNAL_DEPEND_PKG([ECTOR], [evas]) 2117EFL_INTERNAL_DEPEND_PKG([ECTOR], [efl])
2117 2118
2118EFL_EVAL_PKGS([ECTOR]) 2119EFL_EVAL_PKGS([ECTOR])
2119 2120
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 224ffca..b5f42a5 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -519,6 +519,7 @@ lib/evas/filters/blur/blur_box_rgba_neon.c
519### Engines 519### Engines
520 520
521if EVAS_STATIC_BUILD_SOFTWARE_GENERIC 521if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
522evas_eolian_files += modules/evas/engines/software_generic/ector_cairo_software_surface.eo
522lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h 523lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
523lib_evas_libevas_la_LIBADD += 524lib_evas_libevas_la_LIBADD +=
524else 525else
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h
index a47d2f1..fe8d13c 100644
--- a/src/lib/ector/Ector.h
+++ b/src/lib/ector/Ector.h
@@ -3,7 +3,7 @@
3 3
4#include <Eina.h> 4#include <Eina.h>
5#include <Eo.h> 5#include <Eo.h>
6#include <Evas.h> 6#include <Efl.h>
7 7
8#ifdef EAPI 8#ifdef EAPI
9# undef EAPI 9# undef EAPI
@@ -108,7 +108,8 @@ typedef Eo Ector_Renderer;
108 * @typedef Ector_Colorspace 108 * @typedef Ector_Colorspace
109 * The definiton of colorspace. 109 * The definiton of colorspace.
110 */ 110 */
111typedef Evas_Colorspace Ector_Colorspace; 111 // FIXME: Enable that when we have merged Emile
112/* typedef Evas_Colorspace Ector_Colorspace; */
112 113
113/** 114/**
114 * Raster operations at pixel level 115 * Raster operations at pixel level
diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h
index 13de627..a11a53f 100644
--- a/src/lib/ector/cairo/Ector_Cairo.h
+++ b/src/lib/ector/cairo/Ector_Cairo.h
@@ -4,6 +4,7 @@
4#include <Ector.h> 4#include <Ector.h>
5 5
6typedef Eo Ector_Cairo_Surface; 6typedef Eo Ector_Cairo_Surface;
7typedef struct _cairo_t cairo_t;
7 8
8#include "cairo/ector_cairo_surface.eo.h" 9#include "cairo/ector_cairo_surface.eo.h"
9 10
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 9c4e979..8a36767 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -9,8 +9,15 @@ class Ector.Cairo.Surface (Ector.Generic.Surface)
9 @in char* name; 9 @in char* name;
10 } 10 }
11 } 11 }
12 context_set {
13 return: Eina_Bool;
14 params {
15 @in cairo_t *ctx;
16 }
17 }
12 } 18 }
13 implements { 19 implements {
14 Ector.Generic.Surface.renderer_factory_new; 20 Ector.Generic.Surface.renderer_factory_new;
21 Eo.Base.finalize;
15 } 22 }
16} 23}
diff --git a/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
new file mode 100644
index 0000000..9387f31
--- /dev/null
+++ b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
@@ -0,0 +1,21 @@
1class Ector.Cairo_Software.Surface (Ector.Cairo.Surface)
2{
3 eo_prefix: ector_cairo_software_surface;
4 legacy_prefix: null;
5 properties {
6 surface {
7 set {
8 }
9 get {
10 }
11 values {
12 void *pixels;
13 uint width;
14 uint height;
15 }
16 }
17 }
18 implements {
19 Eo.Base.finalize;
20 }
21}
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index a679d5c..a2d5a1c 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -18,6 +18,10 @@
18 18
19#include "Evas_Engine_Software_Generic.h" 19#include "Evas_Engine_Software_Generic.h"
20 20
21#include "cairo/Ector_Cairo.h"
22
23#include "ector_cairo_software_surface.eo.h"
24
21#ifdef EVAS_GL 25#ifdef EVAS_GL
22//----------------------------------// 26//----------------------------------//
23// OSMesa... 27// OSMesa...
@@ -4694,3 +4698,25 @@ EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_generic);
4694#ifndef EVAS_STATIC_BUILD_SOFTWARE_GENERIC 4698#ifndef EVAS_STATIC_BUILD_SOFTWARE_GENERIC
4695EVAS_EINA_MODULE_DEFINE(engine, software_generic); 4699EVAS_EINA_MODULE_DEFINE(engine, software_generic);
4696#endif 4700#endif
4701
4702typedef struct _Ector_Cairo_Software_Surface_Data Ector_Cairo_Software_Surface_Data;
4703struct _Ector_Cairo_Software_Surface_Data
4704{
4705};
4706
4707void
4708_ector_cairo_software_surface_surface_set(Eo *obj, Ector_Cairo_Software_Surface_Data *pd, void *pixels, unsigned int width, unsigned int height)
4709{
4710}
4711
4712void
4713_ector_cairo_software_surface_surface_get(Eo *obj, Ector_Cairo_Software_Surface_Data *pd, void **pixels, unsigned int *width, unsigned int *height)
4714{
4715}
4716
4717Eo *
4718_ector_cairo_software_surface_eo_base_finalize(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
4719{
4720}
4721
4722#include "ector_cairo_software_surface.eo.c"