summaryrefslogtreecommitdiff
path: root/src/lib/emile
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 16:06:03 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:06:20 -0800
commit58fb597acc362a225f84110026d73979caa62268 (patch)
tree08c6d87e9ade74f6229d0433a092257fd55633b3 /src/lib/emile
parent04ccdefb3bba4070e38946c070403936aaf80898 (diff)
Revert "Emile: Move colorspaces to Efl.Gfx"
This reverts commit 0d41ad0c837a2e1655a4d41c28ec7f0ccf10639c. stop defining legacy types to eo types!!!! https://i.redd.it/95mmznk5wo021.gif Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8243
Diffstat (limited to 'src/lib/emile')
-rw-r--r--src/lib/emile/Emile.h1
-rw-r--r--src/lib/emile/emile_image.h56
2 files changed, 33 insertions, 24 deletions
diff --git a/src/lib/emile/Emile.h b/src/lib/emile/Emile.h
index 741905ef2f..e517b6bb48 100644
--- a/src/lib/emile/Emile.h
+++ b/src/lib/emile/Emile.h
@@ -20,7 +20,6 @@
20#define EMILE_H_ 20#define EMILE_H_
21 21
22#include <Eina.h> 22#include <Eina.h>
23#include <interfaces/efl_gfx_types.eot.h>
24 23
25#ifdef EAPI 24#ifdef EAPI
26# undef EAPI 25# undef EAPI
diff --git a/src/lib/emile/emile_image.h b/src/lib/emile/emile_image.h
index 3c1c6f2333..8877a6008e 100644
--- a/src/lib/emile/emile_image.h
+++ b/src/lib/emile/emile_image.h
@@ -9,29 +9,39 @@
9 * @{ 9 * @{
10 */ 10 */
11 11
12typedef Efl_Gfx_Colorspace Emile_Colorspace; 12/**
13 13 * @typedef Emile_Colorspace
14#define EMILE_COLORSPACE_ARGB8888 EFL_GFX_COLORSPACE_ARGB8888 14 *
15#define EMILE_COLORSPACE_YCBCR422P601_PL EFL_GFX_COLORSPACE_YCBCR422P601_PL 15 * Flags that describe all colorspace known by EFL. Some routine may not know all of them.
16#define EMILE_COLORSPACE_YCBCR422P709_PL EFL_GFX_COLORSPACE_YCBCR422P709_PL 16 * All the value from below enum should be the same as in Evas_Loader.h
17#define EMILE_COLORSPACE_RGB565_A5P EFL_GFX_COLORSPACE_RGB565_A5P 17 *
18#define EMILE_COLORSPACE_GRY8 EFL_GFX_COLORSPACE_GRY8 18 * @see Evas_Colorspace
19#define EMILE_COLORSPACE_YCBCR422601_PL EFL_GFX_COLORSPACE_YCBCR422601_PL 19 * @see Eet_Colorspace
20#define EMILE_COLORSPACE_YCBCR420NV12601_PL EFL_GFX_COLORSPACE_YCBCR420NV12601_PL 20 *
21#define EMILE_COLORSPACE_YCBCR420TM12601_PL EFL_GFX_COLORSPACE_YCBCR420TM12601_PL 21 * @since 1.14
22#define EMILE_COLORSPACE_AGRY88 EFL_GFX_COLORSPACE_AGRY88 22 */
23 // ETC1/2 support 23typedef enum _Emile_Colorspace
24#define EMILE_COLORSPACE_ETC1 EFL_GFX_COLORSPACE_ETC1 24{
25#define EMILE_COLORSPACE_RGB8_ETC2 EFL_GFX_COLORSPACE_RGB8_ETC2 25 EMILE_COLORSPACE_ARGB8888,/**< ARGB 32 bits per pixel, high-byte is Alpha, accessed 1 32bit word at a time */
26#define EMILE_COLORSPACE_RGBA8_ETC2_EAC EFL_GFX_COLORSPACE_RGBA8_ETC2_EAC 26 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 */
27#define EMILE_COLORSPACE_ETC1_ALPHA EFL_GFX_COLORSPACE_ETC1_ALPHA 27 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 */
28 // S3TC support 28 EMILE_COLORSPACE_RGB565_A5P, /**< 16bit rgb565 + Alpha plane at end - 5 bits of the 8 being used per alpha byte */
29#define EMILE_COLORSPACE_RGB_S3TC_DXT1 EFL_GFX_COLORSPACE_RGB_S3TC_DXT1 29 EMILE_COLORSPACE_GRY8 = 4,
30#define EMILE_COLORSPACE_RGBA_S3TC_DXT1 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT1 30 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 */
31#define EMILE_COLORSPACE_RGBA_S3TC_DXT2 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT2 31 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. */
32#define EMILE_COLORSPACE_RGBA_S3TC_DXT3 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT3 32 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. */
33#define EMILE_COLORSPACE_RGBA_S3TC_DXT4 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT4 33 EMILE_COLORSPACE_AGRY88 = 8, /**< AY 8bits Alpha and 8bits Grey, accessed 1 16bits at a time */
34#define EMILE_COLORSPACE_RGBA_S3TC_DXT5 EFL_GFX_COLORSPACE_RGBA_S3TC_DXT5 34 EMILE_COLORSPACE_ETC1 = 9, /**< OpenGL ETC1 encoding of RGB texture (4 bit per pixel) @since 1.10 */
35 EMILE_COLORSPACE_RGB8_ETC2 = 10, /**< OpenGL GL_COMPRESSED_RGB8_ETC2 texture compression format (4 bit per pixel) @since 1.10 */
36 EMILE_COLORSPACE_RGBA8_ETC2_EAC = 11, /**< OpenGL GL_COMPRESSED_RGBA8_ETC2_EAC texture compression format, supports alpha (8 bit per pixel) @since 1.10 */
37 EMILE_COLORSPACE_ETC1_ALPHA = 12, /**< ETC1 with alpha support using two planes: ETC1 RGB and ETC1 grey for alpha @since 1.11 */
38 EMILE_COLORSPACE_RGB_S3TC_DXT1 = 13, /**< OpenGL COMPRESSED_RGB_S3TC_DXT1_EXT format with RGB only. @since 1.11 */
39 EMILE_COLORSPACE_RGBA_S3TC_DXT1 = 14, /**< OpenGL COMPRESSED_RGBA_S3TC_DXT1_EXT format with RGBA punchthrough. @since 1.11 */
40 EMILE_COLORSPACE_RGBA_S3TC_DXT2 = 15, /**< DirectDraw DXT2 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
41 EMILE_COLORSPACE_RGBA_S3TC_DXT3 = 16, /**< OpenGL COMPRESSED_RGBA_S3TC_DXT3_EXT format with RGBA. @since 1.11 */
42 EMILE_COLORSPACE_RGBA_S3TC_DXT4 = 17, /**< DirectDraw DXT4 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
43 EMILE_COLORSPACE_RGBA_S3TC_DXT5 = 18 /**< OpenGL COMPRESSED_RGBA_S3TC_DXT5_EXT format with RGBA. @since 1.11 */
44} Emile_Colorspace;
35 45
36/** 46/**
37 * @typedef Emile_Image_Encoding 47 * @typedef Emile_Image_Encoding