summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-06-25 11:12:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-06-25 14:36:10 +0900
commit04466193558ed23f4af3da4a5381aa75ea6e13e5 (patch)
treec8b5c9f97537e18ae6edf6816e7735a26a7e7ed4
parentc86a5edc9f4dbee7660166309d441790e9149e80 (diff)
Evas filters: Mark API as @beta
Until we're happy with it, keep the API as beta. The EDC support should not change, and the Lua either, but the API could potentially still change to accomodate for new needs (vector graphics, anyone?). If we're happy with the current interface, then we can remove the @beta flags.
-rw-r--r--doc/previews/preview_text_filter.c5
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Evas.am3
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_filter.eo12
-rw-r--r--src/tests/evas/evas_test_filters.c1
6 files changed, 13 insertions, 12 deletions
diff --git a/doc/previews/preview_text_filter.c b/doc/previews/preview_text_filter.c
index 778cb7a41a..fa3b26e461 100644
--- a/doc/previews/preview_text_filter.c
+++ b/doc/previews/preview_text_filter.c
@@ -1,9 +1,6 @@
1#include "config.h" 1#include "config.h"
2 2
3/* 3#define EFL_GFX_FILTER_BETA
4#define EFL_EO_API_SUPPORT 1
5#define EFL_BETA_API_SUPPORT 1
6*/
7 4
8#include "Eo.h" 5#include "Eo.h"
9#include "Evas.h" 6#include "Evas.h"
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index ad49f47bb6..b64223ee7d 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -42,7 +42,7 @@ lib_efl_libefl_la_SOURCES = \
42lib/efl/interfaces/efl_interfaces_main.c \ 42lib/efl/interfaces/efl_interfaces_main.c \
43lib/efl/interfaces/efl_gfx_shape.c 43lib/efl/interfaces/efl_gfx_shape.c
44 44
45lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ 45lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA
46lib_efl_libefl_la_LIBADD = @EFL_LIBS@ 46lib_efl_libefl_la_LIBADD = @EFL_LIBS@
47lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@ 47lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
48lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 48lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index cfba9b61e3..8917a5cd13 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -354,7 +354,8 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
354@EVAS_CFLAGS@ \ 354@EVAS_CFLAGS@ \
355@VALGRIND_CFLAGS@ \ 355@VALGRIND_CFLAGS@ \
356@NEON_CFLAGS@ \ 356@NEON_CFLAGS@ \
357@ALTIVEC_CFLAGS@ 357@ALTIVEC_CFLAGS@ \
358-DEFL_GFX_FILTER_BETA
358 359
359# SSE3 360# SSE3
360noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la 361noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index adeef5ce64..a261137c25 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1,3 +1,5 @@
1#define EFL_GFX_FILTER_BETA
2
1#include "edje_private.h" 3#include "edje_private.h"
2 4
3static void _edje_part_make_rtl(Edje_Part_Description_Common *desc); 5static void _edje_part_make_rtl(Edje_Part_Description_Common *desc);
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index a633c48e0f..f9cf35fb2b 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -3,7 +3,7 @@ interface Efl.Gfx.Filter
3 legacy_prefix: null; 3 legacy_prefix: null;
4 /* @since 1.15 */ 4 /* @since 1.15 */
5 methods { 5 methods {
6 @property program { 6 @property program @beta {
7 set { 7 set {
8 [[Set an evas filter program on this object. 8 [[Set an evas filter program on this object.
9 9
@@ -27,7 +27,7 @@ interface Efl.Gfx.Filter
27 name: const(char)*(0); [[filter name (optional)]] 27 name: const(char)*(0); [[filter name (optional)]]
28 } 28 }
29 } 29 }
30 @property state { 30 @property state @beta {
31 set { 31 set {
32 [[Set the current state of the filter (for use from Edje).]] 32 [[Set the current state of the filter (for use from Edje).]]
33 } 33 }
@@ -39,7 +39,7 @@ interface Efl.Gfx.Filter
39 pos: double(0.0); 39 pos: double(0.0);
40 } 40 }
41 } 41 }
42 @property padding { 42 @property padding @beta {
43 get { 43 get {
44 [[Gets the padding required to apply this filter.]] 44 [[Gets the padding required to apply this filter.]]
45 } 45 }
@@ -50,7 +50,7 @@ interface Efl.Gfx.Filter
50 b: int; 50 b: int;
51 } 51 }
52 } 52 }
53 source_set { 53 source_set @beta {
54 [[Bind an object to use as a mask or texture with Evas Filters. 54 [[Bind an object to use as a mask or texture with Evas Filters.
55 55
56 This will create automatically a new RGBA buffer containing 56 This will create automatically a new RGBA buffer containing
@@ -61,7 +61,7 @@ interface Efl.Gfx.Filter
61 @in source: Efl.Gfx.Base*; [[object to use as a proxy source]] 61 @in source: Efl.Gfx.Base*; [[object to use as a proxy source]]
62 } 62 }
63 } 63 }
64 source_get @const { 64 source_get @const @beta {
65 [[Retrieve which object is attached to this filter given its 65 [[Retrieve which object is attached to this filter given its
66 buffer name. 66 buffer name.
67 ]] 67 ]]
@@ -70,7 +70,7 @@ interface Efl.Gfx.Filter
70 @out source: Efl.Gfx.Base*; [[object used as a proxy source]] 70 @out source: Efl.Gfx.Base*; [[object used as a proxy source]]
71 } 71 }
72 } 72 }
73 data_set { 73 data_set @beta {
74 [[Pass extra data to the filter program. 74 [[Pass extra data to the filter program.
75 75
76 This sets a global value as a string.]] 76 This sets a global value as a string.]]
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index a5528df7e2..069bc0be9a 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -9,6 +9,7 @@
9 9
10#include <stdio.h> 10#include <stdio.h>
11 11
12#define EFL_GFX_FILTER_BETA
12#include "evas_suite.h" 13#include "evas_suite.h"
13#include "Evas.h" 14#include "Evas.h"
14#include "Ecore_Evas.h" 15#include "Ecore_Evas.h"