jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0d41ad0c837a2e1655a4d41c28ec7f0ccf10639c
commit 0d41ad0c837a2e1655a4d41c28ec7f0ccf10639c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Mar 18 18:02:19 2016 +0900
Emile: Move colorspaces to Efl.Gfx
A small hack to the toolchain allows us to generate enums with eolian
for use by Eet and Emile (internal or otherwise non-eo libraries).
Thanks to how BUILT_SOURCES works, the eo.h files required by Emile
will be generated before they are used.
This adds a partial dependency on eo for eet and emile:
- package dependency
- include dependency
There is no library link dependency.
---
configure.ac | 4 +++
src/lib/efl/interfaces/efl_gfx_types.eot | 21 ++++++++++--
src/lib/emile/Emile.h | 1 +
src/lib/emile/emile_image.h | 56 +++++++++++++-------------------
src/lib/evas/Evas_Loader.h | 42 ++++++++++++------------
5 files changed, 68 insertions(+), 56 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3458e97..f6cd7d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1333,6 +1333,8 @@ fi
EFL_CHECK_LIBS([EMILE], [zlib])
EFL_INTERNAL_DEPEND_PKG([EMILE], [eina])
+requirements_cflags_emile="${requirements_cflags_emile}
-I\${top_srcdir}/src/lib/efl -I\${top_builddir}/src/lib/efl"
+requirements_pc_emile="efl >= ${PACKAGE_VERSION} ${requirements_pc_emile}"
EFL_EVAL_PKGS([EMILE])
@@ -1384,6 +1386,8 @@ fi
EFL_INTERNAL_DEPEND_PKG([EET], [eina])
EFL_INTERNAL_DEPEND_PKG([EET], [emile])
+requirements_pc_eet="${requirements_pc_eet} ${requirements_pc_emile}"
+requirements_cflags_eet="${requirements_cflags_eet}
${requirements_cflags_emile}"
EFL_EVAL_PKGS([EET])
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot
b/src/lib/efl/interfaces/efl_gfx_types.eot
index 782ac9d..1dcc816 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -1,6 +1,23 @@
enum Efl.Gfx.Colorspace {
- argb8888 = 0, [[ARGB 32 bits per pixel, high-byte is Alpha, accessed one
32-bit word at a time.]]
- gry8 = 4, [[8-bit gray image, or alpha only.]]
+ argb8888, [[ARGB 32 bits per pixel, high-byte is Alpha, accessed
one 32bit word at a time.]]
+ ycbcr422p601_pl, [[YCbCr 4:2:2 Planar, ITU.BT-601 specifications. The
data pointed to is just an array of row pointer, pointing to the Y rows, then
the Cb, then Cr rows.]]
+ ycbcr422p709_pl, [[YCbCr 4:2:2 Planar, ITU.BT-709 specifications. The
data pointed to is just an array of row pointer, pointing to the Y rows, then
the Cb, then Cr rows.]]
+ rgb565_a5p, [[16bit rgb565 + Alpha plane at end - 5 bits of the 8
being used per alpha byte.]]
+ gry8 = 4, [[8-bit gray image, or alpha only.]]
+ ycbcr422601_pl, [[ YCbCr 4:2:2, ITU.BT-601 specifications. The data
pointed to is just an array of row pointer, pointing to line of Y,Cb,Y,Cr
bytes.]]
+ ycbcr420nv12601_pl, [[YCbCr 4:2:0, ITU.BT-601 specification. The data
pointed to is just an array of row pointer, pointing to the Y rows, then the
Cb,Cr rows..]]
+ ycbcr420tm12601_pl, [[YCbCr 4:2:0, ITU.BT-601 specification. The data
pointed to is just an array of tiled row pointer, pointing to the Y rows, then
the Cb,Cr rows..]]
+ agry88 = 8, [[AY 8bits Alpha and 8bits Grey, accessed 1 16bits at
a time.]]
+ etc1 = 9, [[OpenGL ETC1 encoding of RGB texture (4 bit per
pixel) @since 1.10.]]
+ rgb8_etc2 = 10, [[OpenGL GL_COMPRESSED_RGB8_ETC2 texture compression
format (4 bit per pixel) @since 1.10.]]
+ rgba8_etc2_eac = 11, [[OpenGL GL_COMPRESSED_RGBA8_ETC2_EAC texture
compression format, supports alpha (8 bit per pixel) @since 1.10.]]
+ etc1_alpha = 12, [[ETC1 with alpha support using two planes: ETC1 RGB
and ETC1 grey for alpha @since 1.11.]]
+ rgb_s3tc_dxt1 = 13, [[OpenGL COMPRESSED_RGB_S3TC_DXT1_EXT format with RGB
only. @since 1.11.]]
+ rgba_s3tc_dxt1 = 14, [[OpenGL COMPRESSED_RGBA_S3TC_DXT1_EXT format with
RGBA punchthrough. @since 1.11.]]
+ rgba_s3tc_dxt2 = 15, [[DirectDraw DXT2 format with premultiplied RGBA. Not
supported by OpenGL itself. @since 1.11.]]
+ rgba_s3tc_dxt3 = 16, [[OpenGL COMPRESSED_RGBA_S3TC_DXT3_EXT format with
RGBA. @since 1.11.]]
+ rgba_s3tc_dxt4 = 17, [[DirectDraw DXT4 format with premultiplied RGBA. Not
supported by OpenGL itself. @since 1.11.]]
+ rgba_s3tc_dxt5 = 18 [[OpenGL COMPRESSED_RGBA_S3TC_DXT5_EXT format with
RGBA. @since 1.11.]]
}
enum Efl.Gfx.Render_Op {
diff --git a/src/lib/emile/Emile.h b/src/lib/emile/Emile.h
index 890b5ed..03d8e53 100644
--- a/src/lib/emile/Emile.h
+++ b/src/lib/emile/Emile.h
@@ -20,6 +20,7 @@
#define EMILE_H_
#include <Eina.h>
+#include <interfaces/efl_gfx_types.eot.h>
#ifdef EAPI
# undef EAPI
diff --git a/src/lib/emile/emile_image.h b/src/lib/emile/emile_image.h
index bee101d..9d6f1af 100644
--- a/src/lib/emile/emile_image.h
+++ b/src/lib/emile/emile_image.h
@@ -9,39 +9,29 @@
* @{
*/
-/**
- * @typedef Emile_Colorspace
- *
- * Flags that describe all colorspace known by EFL. Some routine may not know
all of them.
- * All the value from below enum should be the same as in Evas_Loader.h
- *
- * @see Evas_Colorspace
- * @see Eet_Colorspace
- *
- * @since 1.14
- */
-typedef enum _Emile_Colorspace
-{
- EMILE_COLORSPACE_ARGB8888,/**< ARGB 32 bits per pixel, high-byte is Alpha,
accessed 1 32bit word at a time */
- EMILE_COLORSPACE_YCBCR422P601_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-601
specifications. The data pointed to is just an array of row pointer, pointing
to the Y rows, then the Cb, then Cr rows */
- EMILE_COLORSPACE_YCBCR422P709_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-709
specifications. The data pointed to is just an array of row pointer, pointing
to the Y rows, then the Cb, then Cr rows */
- EMILE_COLORSPACE_RGB565_A5P, /**< 16bit rgb565 + Alpha plane at end - 5 bits
of the 8 being used per alpha byte */
- EMILE_COLORSPACE_GRY8 = 4,
- EMILE_COLORSPACE_YCBCR422601_PL, /**< YCbCr 4:2:2, ITU.BT-601
specifications. The data pointed to is just an array of row pointer, pointing
to line of Y,Cb,Y,Cr bytes */
- EMILE_COLORSPACE_YCBCR420NV12601_PL, /**< YCbCr 4:2:0, ITU.BT-601
specification. The data pointed to is just an array of row pointer, pointing to
the Y rows, then the Cb,Cr rows. */
- EMILE_COLORSPACE_YCBCR420TM12601_PL, /**< YCbCr 4:2:0, ITU.BT-601
specification. The data pointed to is just an array of tiled row pointer,
pointing to the Y rows, then the Cb,Cr rows. */
- EMILE_COLORSPACE_AGRY88 = 8, /**< AY 8bits Alpha and 8bits Grey, accessed 1
16bits at a time */
- EMILE_COLORSPACE_ETC1 = 9, /**< OpenGL ETC1 encoding of RGB texture (4 bit
per pixel) @since 1.10 */
- EMILE_COLORSPACE_RGB8_ETC2 = 10, /**< OpenGL GL_COMPRESSED_RGB8_ETC2 texture
compression format (4 bit per pixel) @since 1.10 */
- EMILE_COLORSPACE_RGBA8_ETC2_EAC = 11, /**< OpenGL
GL_COMPRESSED_RGBA8_ETC2_EAC texture compression format, supports alpha (8 bit
per pixel) @since 1.10 */
- EMILE_COLORSPACE_ETC1_ALPHA = 12, /**< ETC1 with alpha support using two
planes: ETC1 RGB and ETC1 grey for alpha @since 1.11 */
- EMILE_COLORSPACE_RGB_S3TC_DXT1 = 13, /**< OpenGL
COMPRESSED_RGB_S3TC_DXT1_EXT format with RGB only. @since 1.11 */
- EMILE_COLORSPACE_RGBA_S3TC_DXT1 = 14, /**< OpenGL
COMPRESSED_RGBA_S3TC_DXT1_EXT format with RGBA punchthrough. @since 1.11 */
- EMILE_COLORSPACE_RGBA_S3TC_DXT2 = 15, /**< DirectDraw DXT2 format
with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
- EMILE_COLORSPACE_RGBA_S3TC_DXT3 = 16, /**< OpenGL
COMPRESSED_RGBA_S3TC_DXT3_EXT format with RGBA. @since 1.11 */
- EMILE_COLORSPACE_RGBA_S3TC_DXT4 = 17, /**< DirectDraw DXT4 format
with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
- EMILE_COLORSPACE_RGBA_S3TC_DXT5 = 18 /**< OpenGL
COMPRESSED_RGBA_S3TC_DXT5_EXT format with RGBA. @since 1.11 */
-} Emile_Colorspace;
+typedef Efl_Gfx_Colorspace Emile_Colorspace;
+
+#define EMILE_COLORSPACE_ARGB8888 EFL_GFX_COLORSPACE_ARGB8888
+#define EMILE_COLORSPACE_YCBCR422P601_PL EFL_GFX_COLORSPACE_YCBCR422P601_PL
+#define EMILE_COLORSPACE_YCBCR422P709_PL EFL_GFX_COLORSPACE_YCBCR422P709_PL
+#define EMILE_COLORSPACE_RGB565_A5P EFL_GFX_COLORSPACE_RGB565_A5P
+#define EMILE_COLORSPACE_GRY8 EFL_GFX_COLORSPACE_GRY8
+#define EMILE_COLORSPACE_YCBCR422601_PL EFL_GFX_COLORSPACE_YCBCR422601_PL
+#define EMILE_COLORSPACE_YCBCR420NV12601_PL
EFL_GFX_COLORSPACE_YCBCR420NV12601_PL
+#define EMILE_COLORSPACE_YCBCR420TM12601_PL
EFL_GFX_COLORSPACE_YCBCR420TM12601_PL
+#define EMILE_COLORSPACE_AGRY88 EFL_GFX_COLORSPACE_AGRY88
+ // ETC1/2 support
+#define EMILE_COLORSPACE_ETC1 EFL_GFX_COLORSPACE_ETC1
+#define EMILE_COLORSPACE_RGB8_ETC2 EFL_GFX_COLORSPACE_RGB8_ETC2
+#define EMILE_COLORSPACE_RGBA8_ETC2_EAC EFL_GFX_COLORSPACE_RGBA8_ETC2_EAC
+#define EMILE_COLORSPACE_ETC1_ALPHA EFL_GFX_COLORSPACE_ETC1_ALPHA
+ // S3TC support
+#define EMILE_COLORSPACE_RGB_S3TC_DXT1 EFL_GFX_COLORSPACE_RGB_S3TC_DXT1
+#define EMILE_COLORSPACE_RGBA_S3TC_DXT1 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT1
+#define EMILE_COLORSPACE_RGBA_S3TC_DXT2 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT2
+#define EMILE_COLORSPACE_RGBA_S3TC_DXT3 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT3
+#define EMILE_COLORSPACE_RGBA_S3TC_DXT4 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT4
+#define EMILE_COLORSPACE_RGBA_S3TC_DXT5 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT5
/**
* @typedef Emile_Image_Encoding
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index 58e760c..f8e4da4 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -149,29 +149,29 @@ typedef Emile_Image_Scale_Hint Evas_Image_Scale_Hint;
/**< How an image's data i
* Colorspaces for pixel data supported by Evas
* @ingroup Evas_Object_Image
*/
-typedef Emile_Colorspace Evas_Colorspace; /**< Colorspaces for pixel data
supported by Evas */
-
-#define EVAS_COLORSPACE_ARGB8888 EMILE_COLORSPACE_ARGB8888
-#define EVAS_COLORSPACE_YCBCR422P601_PL EMILE_COLORSPACE_YCBCR422P601_PL
-#define EVAS_COLORSPACE_YCBCR422P709_PL EMILE_COLORSPACE_YCBCR422P709_PL
-#define EVAS_COLORSPACE_RGB565_A5P EMILE_COLORSPACE_RGB565_A5P
-#define EVAS_COLORSPACE_GRY8 EMILE_COLORSPACE_GRY8
-#define EVAS_COLORSPACE_YCBCR422601_PL EMILE_COLORSPACE_YCBCR422601_PL
-#define EVAS_COLORSPACE_YCBCR420NV12601_PL EMILE_COLORSPACE_YCBCR420NV12601_PL
-#define EVAS_COLORSPACE_YCBCR420TM12601_PL EMILE_COLORSPACE_YCBCR420TM12601_PL
-#define EVAS_COLORSPACE_AGRY88 EMILE_COLORSPACE_AGRY88
+typedef Efl_Gfx_Colorspace Evas_Colorspace; /**< Colorspaces for pixel data
supported by Evas */
+
+#define EVAS_COLORSPACE_ARGB8888 EFL_GFX_COLORSPACE_ARGB8888
+#define EVAS_COLORSPACE_YCBCR422P601_PL EFL_GFX_COLORSPACE_YCBCR422P601_PL
+#define EVAS_COLORSPACE_YCBCR422P709_PL EFL_GFX_COLORSPACE_YCBCR422P709_PL
+#define EVAS_COLORSPACE_RGB565_A5P EFL_GFX_COLORSPACE_RGB565_A5P
+#define EVAS_COLORSPACE_GRY8 EFL_GFX_COLORSPACE_GRY8
+#define EVAS_COLORSPACE_YCBCR422601_PL EFL_GFX_COLORSPACE_YCBCR422601_PL
+#define EVAS_COLORSPACE_YCBCR420NV12601_PL
EFL_GFX_COLORSPACE_YCBCR420NV12601_PL
+#define EVAS_COLORSPACE_YCBCR420TM12601_PL
EFL_GFX_COLORSPACE_YCBCR420TM12601_PL
+#define EVAS_COLORSPACE_AGRY88 EFL_GFX_COLORSPACE_AGRY88
// ETC1/2 support
-#define EVAS_COLORSPACE_ETC1 EMILE_COLORSPACE_ETC1
-#define EVAS_COLORSPACE_RGB8_ETC2 EMILE_COLORSPACE_RGB8_ETC2
-#define EVAS_COLORSPACE_RGBA8_ETC2_EAC EMILE_COLORSPACE_RGBA8_ETC2_EAC
-#define EVAS_COLORSPACE_ETC1_ALPHA EMILE_COLORSPACE_ETC1_ALPHA
+#define EVAS_COLORSPACE_ETC1 EFL_GFX_COLORSPACE_ETC1
+#define EVAS_COLORSPACE_RGB8_ETC2 EFL_GFX_COLORSPACE_RGB8_ETC2
+#define EVAS_COLORSPACE_RGBA8_ETC2_EAC EFL_GFX_COLORSPACE_RGBA8_ETC2_EAC
+#define EVAS_COLORSPACE_ETC1_ALPHA EFL_GFX_COLORSPACE_ETC1_ALPHA
// S3TC support
-#define EVAS_COLORSPACE_RGB_S3TC_DXT1 EMILE_COLORSPACE_RGB_S3TC_DXT1
-#define EVAS_COLORSPACE_RGBA_S3TC_DXT1 EMILE_COLORSPACE_RGBA_S3TC_DXT1
-#define EVAS_COLORSPACE_RGBA_S3TC_DXT2 EMILE_COLORSPACE_RGBA_S3TC_DXT2
-#define EVAS_COLORSPACE_RGBA_S3TC_DXT3 EMILE_COLORSPACE_RGBA_S3TC_DXT3
-#define EVAS_COLORSPACE_RGBA_S3TC_DXT4 EMILE_COLORSPACE_RGBA_S3TC_DXT4
-#define EVAS_COLORSPACE_RGBA_S3TC_DXT5 EMILE_COLORSPACE_RGBA_S3TC_DXT5
+#define EVAS_COLORSPACE_RGB_S3TC_DXT1 EFL_GFX_COLORSPACE_RGB_S3TC_DXT1
+#define EVAS_COLORSPACE_RGBA_S3TC_DXT1 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT1
+#define EVAS_COLORSPACE_RGBA_S3TC_DXT2 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT2
+#define EVAS_COLORSPACE_RGBA_S3TC_DXT3 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT3
+#define EVAS_COLORSPACE_RGBA_S3TC_DXT4 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT4
+#define EVAS_COLORSPACE_RGBA_S3TC_DXT5 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT5
struct _Evas_Image_Load_Func
{
--
