From 04466193558ed23f4af3da4a5381aa75ea6e13e5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 25 Jun 2015 11:12:05 +0900 Subject: [PATCH] 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. --- doc/previews/preview_text_filter.c | 5 +---- src/Makefile_Efl.am | 2 +- src/Makefile_Evas.am | 3 ++- src/lib/edje/edje_calc.c | 2 ++ src/lib/efl/interfaces/efl_gfx_filter.eo | 12 ++++++------ src/tests/evas/evas_test_filters.c | 1 + 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/previews/preview_text_filter.c b/doc/previews/preview_text_filter.c index 778cb7a..fa3b26e 100644 --- a/doc/previews/preview_text_filter.c +++ b/doc/previews/preview_text_filter.c @@ -1,9 +1,6 @@ #include "config.h" -/* -#define EFL_EO_API_SUPPORT 1 -#define EFL_BETA_API_SUPPORT 1 -*/ +#define EFL_GFX_FILTER_BETA #include "Eo.h" #include "Evas.h" diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index ad49f47..b64223e 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -42,7 +42,7 @@ lib_efl_libefl_la_SOURCES = \ lib/efl/interfaces/efl_interfaces_main.c \ lib/efl/interfaces/efl_gfx_shape.c -lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ +lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA lib_efl_libefl_la_LIBADD = @EFL_LIBS@ lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@ lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index cfba9b6..8917a5c 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 \ @EVAS_CFLAGS@ \ @VALGRIND_CFLAGS@ \ @NEON_CFLAGS@ \ -@ALTIVEC_CFLAGS@ +@ALTIVEC_CFLAGS@ \ +-DEFL_GFX_FILTER_BETA # SSE3 noinst_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 adeef5c..a261137c 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -1,3 +1,5 @@ +#define EFL_GFX_FILTER_BETA + #include "edje_private.h" static 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 a633c48..f9cf35f 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 legacy_prefix: null; /* @since 1.15 */ methods { - @property program { + @property program @beta { set { [[Set an evas filter program on this object. @@ -27,7 +27,7 @@ interface Efl.Gfx.Filter name: const(char)*(0); [[filter name (optional)]] } } - @property state { + @property state @beta { set { [[Set the current state of the filter (for use from Edje).]] } @@ -39,7 +39,7 @@ interface Efl.Gfx.Filter pos: double(0.0); } } - @property padding { + @property padding @beta { get { [[Gets the padding required to apply this filter.]] } @@ -50,7 +50,7 @@ interface Efl.Gfx.Filter b: int; } } - source_set { + source_set @beta { [[Bind an object to use as a mask or texture with Evas Filters. This will create automatically a new RGBA buffer containing @@ -61,7 +61,7 @@ interface Efl.Gfx.Filter @in source: Efl.Gfx.Base*; [[object to use as a proxy source]] } } - source_get @const { + source_get @const @beta { [[Retrieve which object is attached to this filter given its buffer name. ]] @@ -70,7 +70,7 @@ interface Efl.Gfx.Filter @out source: Efl.Gfx.Base*; [[object used as a proxy source]] } } - data_set { + data_set @beta { [[Pass extra data to the filter program. 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 a5528df..069bc0b 100644 --- a/src/tests/evas/evas_test_filters.c +++ b/src/tests/evas/evas_test_filters.c @@ -9,6 +9,7 @@ #include +#define EFL_GFX_FILTER_BETA #include "evas_suite.h" #include "Evas.h" #include "Ecore_Evas.h" -- 2.7.4