forked from enlightenment/efl
Evas: Use Evas_Colorspace to declare cspace
Why use int when we have a proper type? All these APIs are internal.
This commit is contained in:
parent
44b3cd1564
commit
54fb9b2346
|
@ -29,10 +29,10 @@ struct _Evas_Cache_Image_Func
|
||||||
int (*size_set)(Image_Entry *dst, const Image_Entry *src, unsigned int w, unsigned int h);
|
int (*size_set)(Image_Entry *dst, const Image_Entry *src, unsigned int w, unsigned int h);
|
||||||
|
|
||||||
/* The destination surface does not have any surface. */
|
/* The destination surface does not have any surface. */
|
||||||
int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
/* The destination surface does not have any surface. */
|
/* The destination surface does not have any surface. */
|
||||||
int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
int (*color_space)(Image_Entry *dst, int cspace);
|
int (*color_space)(Image_Entry *dst, Evas_Colorspace cspace);
|
||||||
|
|
||||||
/* This function need to update im->w and im->h. */
|
/* This function need to update im->w and im->h. */
|
||||||
int (*load)(Image_Entry *im); /**< return is EVAS_LOAD_ERROR_* or EVAS_LOAD_ERROR_NONE! */
|
int (*load)(Image_Entry *im); /**< return is EVAS_LOAD_ERROR_* or EVAS_LOAD_ERROR_NONE! */
|
||||||
|
@ -137,8 +137,8 @@ EAPI Eina_Bool evas_cache_image_is_loaded(Image_Entry *im);
|
||||||
EAPI void evas_cache_image_unload_all(Evas_Cache_Image *cache);
|
EAPI void evas_cache_image_unload_all(Evas_Cache_Image *cache);
|
||||||
EAPI void evas_cache_image_surface_alloc(Image_Entry *im, unsigned int w, unsigned int h);
|
EAPI void evas_cache_image_surface_alloc(Image_Entry *im, unsigned int w, unsigned int h);
|
||||||
EAPI DATA32* evas_cache_image_pixels(Image_Entry *im);
|
EAPI DATA32* evas_cache_image_pixels(Image_Entry *im);
|
||||||
EAPI Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
EAPI Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
EAPI void evas_cache_image_colorspace(Image_Entry *im, Evas_Colorspace cspace);
|
EAPI void evas_cache_image_colorspace(Image_Entry *im, Evas_Colorspace cspace);
|
||||||
EAPI Image_Entry* evas_cache_image_empty(Evas_Cache_Image *cache);
|
EAPI Image_Entry* evas_cache_image_empty(Evas_Cache_Image *cache);
|
||||||
EAPI Image_Entry* evas_cache_image_size_set(Image_Entry *im, unsigned int w, unsigned int h);
|
EAPI Image_Entry* evas_cache_image_size_set(Image_Entry *im, unsigned int w, unsigned int h);
|
||||||
|
@ -156,9 +156,9 @@ EAPI Engine_Image_Entry* evas_cache_engine_image_engine(Evas_Cache_Engine_I
|
||||||
EAPI void evas_cache_engine_image_drop(Engine_Image_Entry *eim);
|
EAPI void evas_cache_engine_image_drop(Engine_Image_Entry *eim);
|
||||||
EAPI Engine_Image_Entry* evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
|
EAPI Engine_Image_Entry* evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
|
||||||
EAPI Engine_Image_Entry* evas_cache_engine_image_dirty(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
|
EAPI Engine_Image_Entry* evas_cache_engine_image_dirty(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
|
||||||
EAPI Engine_Image_Entry* evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
|
EAPI Engine_Image_Entry* evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void *engine_data);
|
||||||
EAPI Engine_Image_Entry* evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
|
EAPI Engine_Image_Entry* evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void *engine_data);
|
||||||
EAPI void evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void *engine_data);
|
EAPI void evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, Evas_Colorspace cspace, void *engine_data);
|
||||||
EAPI Engine_Image_Entry* evas_cache_engine_image_size_set(Engine_Image_Entry *eim, unsigned int w, unsigned int h);
|
EAPI Engine_Image_Entry* evas_cache_engine_image_size_set(Engine_Image_Entry *eim, unsigned int w, unsigned int h);
|
||||||
|
|
||||||
EAPI void evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
|
EAPI void evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
|
||||||
|
|
|
@ -539,7 +539,7 @@ _evas_cache_engine_image_push_dirty(Evas_Cache_Engine_Image *cache, Image_Entry
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Engine_Image_Entry *
|
EAPI Engine_Image_Entry *
|
||||||
evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data)
|
evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void *engine_data)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
@ -551,7 +551,7 @@ evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, unsigned int
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Engine_Image_Entry *
|
EAPI Engine_Image_Entry *
|
||||||
evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace, void *engine_data)
|
evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace, void *engine_data)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
@ -679,7 +679,7 @@ evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void *engine_data
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void *engine_data)
|
evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, Evas_Colorspace cspace, void *engine_data)
|
||||||
{
|
{
|
||||||
Evas_Cache_Engine_Image *cache = eim->cache;
|
Evas_Cache_Engine_Image *cache = eim->cache;
|
||||||
|
|
||||||
|
|
|
@ -1038,7 +1038,8 @@ on_error:
|
||||||
EAPI Image_Entry *
|
EAPI Image_Entry *
|
||||||
evas_cache_image_copied_data(Evas_Cache_Image *cache,
|
evas_cache_image_copied_data(Evas_Cache_Image *cache,
|
||||||
unsigned int w, unsigned int h,
|
unsigned int w, unsigned int h,
|
||||||
DATA32 *image_data, int alpha, int cspace)
|
DATA32 *image_data, int alpha,
|
||||||
|
Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
@ -1064,7 +1065,8 @@ evas_cache_image_copied_data(Evas_Cache_Image *cache,
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Image_Entry *
|
EAPI Image_Entry *
|
||||||
evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace)
|
evas_cache_image_data(Evas_Cache_Image *cache, unsigned int w, unsigned int h,
|
||||||
|
DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
|
|
@ -385,7 +385,7 @@ _evas_cache2_image_entry_preload_remove(Image_Entry *ie, const void *target)
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Image_Entry *
|
EAPI Image_Entry *
|
||||||
evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace)
|
evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
@ -415,7 +415,7 @@ evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned int h
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Image_Entry *
|
EAPI Image_Entry *
|
||||||
evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace)
|
evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,10 @@ struct _Evas_Cache2_Image_Func
|
||||||
int (*size_set)(Image_Entry *dst, const Image_Entry *src, unsigned int w, unsigned int h);
|
int (*size_set)(Image_Entry *dst, const Image_Entry *src, unsigned int w, unsigned int h);
|
||||||
|
|
||||||
/* The destination surface does not have any surface. */
|
/* The destination surface does not have any surface. */
|
||||||
int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int (*copied_data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
/* The destination surface does not have any surface. */
|
/* The destination surface does not have any surface. */
|
||||||
int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int (*data)(Image_Entry *dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
int (*color_space)(Image_Entry *dst, int cspace);
|
int (*color_space)(Image_Entry *dst, Evas_Colorspace cspace);
|
||||||
|
|
||||||
/* This function need to update im->w and im->h. */
|
/* This function need to update im->w and im->h. */
|
||||||
// int (*load)(Image_Entry *im); /**< return is EVAS_LOAD_ERROR_* or EVAS_LOAD_ERROR_NONE! */
|
// int (*load)(Image_Entry *im); /**< return is EVAS_LOAD_ERROR_* or EVAS_LOAD_ERROR_NONE! */
|
||||||
|
@ -71,8 +71,8 @@ EAPI void evas_cache2_image_cache_key_create(char *hkey, const char *path, size_
|
||||||
|
|
||||||
EAPI DATA32 * evas_cache2_image_pixels(Image_Entry *im);
|
EAPI DATA32 * evas_cache2_image_pixels(Image_Entry *im);
|
||||||
EAPI Image_Entry * evas_cache2_image_writable(Image_Entry *im);
|
EAPI Image_Entry * evas_cache2_image_writable(Image_Entry *im);
|
||||||
EAPI Image_Entry * evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
EAPI Image_Entry * evas_cache2_image_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
EAPI Image_Entry * evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
EAPI Image_Entry * evas_cache2_image_copied_data(Evas_Cache2 *cache, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
EAPI Image_Entry * evas_cache2_image_size_set(Image_Entry *im, unsigned int w, unsigned h);
|
EAPI Image_Entry * evas_cache2_image_size_set(Image_Entry *im, unsigned int w, unsigned h);
|
||||||
EAPI Image_Entry * evas_cache2_image_dirty(Image_Entry *im, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
|
EAPI Image_Entry * evas_cache2_image_dirty(Image_Entry *im, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
|
||||||
EAPI Image_Entry * evas_cache2_image_empty(Evas_Cache2 *cache);
|
EAPI Image_Entry * evas_cache2_image_empty(Evas_Cache2 *cache);
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "evas_image.h"
|
#include "evas_image.h"
|
||||||
|
|
||||||
int
|
int
|
||||||
evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
RGBA_Image *dst = (RGBA_Image *) ie_dst;
|
RGBA_Image *dst = (RGBA_Image *) ie_dst;
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *imag
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
RGBA_Image *dst = (RGBA_Image *) ie_dst;
|
RGBA_Image *dst = (RGBA_Image *) ie_dst;
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
#define _EVAS_IMAGE_PRIVATE_H
|
#define _EVAS_IMAGE_PRIVATE_H
|
||||||
|
|
||||||
int evas_common_rgba_image_size_set (Image_Entry* dst, const Image_Entry* im, unsigned int w, unsigned int h);
|
int evas_common_rgba_image_size_set (Image_Entry* dst, const Image_Entry* im, unsigned int w, unsigned int h);
|
||||||
int evas_common_rgba_image_from_copied_data (Image_Entry* dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int evas_common_rgba_image_from_copied_data (Image_Entry* dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
int evas_common_rgba_image_from_data (Image_Entry* dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, int cspace);
|
int evas_common_rgba_image_from_data (Image_Entry* dst, unsigned int w, unsigned int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
int evas_common_rgba_image_colorspace_set (Image_Entry* dst, int cspace);
|
int evas_common_rgba_image_colorspace_set (Image_Entry* dst, Evas_Colorspace cspace);
|
||||||
|
|
||||||
void evas_common_scalecache_init(void);
|
void evas_common_scalecache_init(void);
|
||||||
void evas_common_scalecache_shutdown(void);
|
void evas_common_scalecache_shutdown(void);
|
||||||
|
|
|
@ -817,8 +817,8 @@ struct _Evas_Func
|
||||||
|
|
||||||
void *(*image_load) (void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo);
|
void *(*image_load) (void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo);
|
||||||
void *(*image_mmap) (void *data, Eina_File *f, const char *key, int *error, Evas_Image_Load_Opts *lo);
|
void *(*image_mmap) (void *data, Eina_File *f, const char *key, int *error, Evas_Image_Load_Opts *lo);
|
||||||
void *(*image_new_from_data) (void *data, int w, int h, DATA32 *image_data, int alpha, int cspace);
|
void *(*image_new_from_data) (void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 *image_data, int alpha, int cspace);
|
void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace);
|
||||||
void (*image_free) (void *data, void *image);
|
void (*image_free) (void *data, void *image);
|
||||||
void (*image_size_get) (void *data, void *image, int *w, int *h);
|
void (*image_size_get) (void *data, void *image, int *w, int *h);
|
||||||
void *(*image_size_set) (void *data, void *image, int w, int h);
|
void *(*image_size_set) (void *data, void *image, int w, int h);
|
||||||
|
@ -835,8 +835,8 @@ struct _Evas_Func
|
||||||
Eina_Bool (*image_draw) (void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async);
|
Eina_Bool (*image_draw) (void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async);
|
||||||
char *(*image_comment_get) (void *data, void *image, char *key);
|
char *(*image_comment_get) (void *data, void *image, char *key);
|
||||||
char *(*image_format_get) (void *data, void *image);
|
char *(*image_format_get) (void *data, void *image);
|
||||||
void (*image_colorspace_set) (void *data, void *image, int cspace);
|
void (*image_colorspace_set) (void *data, void *image, Evas_Colorspace cspace);
|
||||||
int (*image_colorspace_get) (void *data, void *image);
|
Evas_Colorspace (*image_colorspace_get) (void *data, void *image);
|
||||||
Eina_Bool (*image_can_region_get) (void *data, void *image);
|
Eina_Bool (*image_can_region_get) (void *data, void *image);
|
||||||
void *(*image_native_set) (void *data, void *image, void *native);
|
void *(*image_native_set) (void *data, void *image, void *native);
|
||||||
void *(*image_native_get) (void *data, void *image);
|
void *(*image_native_get) (void *data, void *image);
|
||||||
|
|
|
@ -395,7 +395,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image)
|
||||||
return im->alpha;
|
return im->alpha;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static Evas_Colorspace
|
||||||
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
||||||
{
|
{
|
||||||
// Render_Engine *re;
|
// Render_Engine *re;
|
||||||
|
@ -512,7 +512,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_image_colorspace_set(void *data, void *image, int cspace)
|
eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
@ -598,7 +598,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, int *error, Evas_Image
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
@ -608,7 +608,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
|
|
@ -604,7 +604,7 @@ struct _Evas_GL_Image
|
||||||
// if im->im == NULL, it's a render-surface so these here are used
|
// if im->im == NULL, it's a render-surface so these here are used
|
||||||
int w, h;
|
int w, h;
|
||||||
struct {
|
struct {
|
||||||
int space;
|
Evas_Colorspace space;
|
||||||
void *data;
|
void *data;
|
||||||
unsigned char no_free : 1;
|
unsigned char no_free : 1;
|
||||||
} cs;
|
} cs;
|
||||||
|
@ -806,9 +806,9 @@ void evas_gl_common_image_ref(Evas_GL_Image *im);
|
||||||
void evas_gl_common_image_unref(Evas_GL_Image *im);
|
void evas_gl_common_image_unref(Evas_GL_Image *im);
|
||||||
Evas_GL_Image *evas_gl_common_image_load(Evas_Engine_GL_Context *gc, const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error);
|
Evas_GL_Image *evas_gl_common_image_load(Evas_Engine_GL_Context *gc, const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error);
|
||||||
Evas_GL_Image *evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error);
|
Evas_GL_Image *evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error);
|
||||||
Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace);
|
Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace);
|
||||||
Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace);
|
Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace);
|
||||||
Evas_GL_Image *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, int cspace);
|
Evas_GL_Image *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, Evas_Colorspace cspace);
|
||||||
Evas_GL_Image *evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha);
|
Evas_GL_Image *evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha);
|
||||||
void evas_gl_common_image_native_enable(Evas_GL_Image *im);
|
void evas_gl_common_image_native_enable(Evas_GL_Image *im);
|
||||||
void evas_gl_common_image_native_disable(Evas_GL_Image *im);
|
void evas_gl_common_image_native_disable(Evas_GL_Image *im);
|
||||||
|
|
|
@ -140,7 +140,7 @@ _evas_gl_common_image(Evas_Engine_GL_Context *gc, RGBA_Image *im_im, Evas_Image_
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
int cspace = EVAS_COLORSPACE_ARGB8888;
|
Evas_Colorspace cspace = EVAS_COLORSPACE_ARGB8888;
|
||||||
|
|
||||||
/* i'd LOVe to do this, but we can't because we load to load header
|
/* i'd LOVe to do this, but we can't because we load to load header
|
||||||
* to get image size to know if its too big or not! so this disallows
|
* to get image size to know if its too big or not! so this disallows
|
||||||
|
@ -286,7 +286,7 @@ evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_GL_Image *
|
Evas_GL_Image *
|
||||||
evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace)
|
evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
@ -350,7 +350,7 @@ evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, u
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_GL_Image *
|
Evas_GL_Image *
|
||||||
evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace)
|
evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
|
||||||
|
@ -401,7 +401,7 @@ evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned i
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_GL_Image *
|
Evas_GL_Image *
|
||||||
evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, int cspace)
|
evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
|
||||||
|
|
|
@ -335,7 +335,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image)
|
||||||
return im ? im->alpha : 1;
|
return im ? im->alpha : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static Evas_Colorspace
|
||||||
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im = image;
|
Evas_GL_Image *im = image;
|
||||||
|
@ -406,7 +406,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace)
|
eng_image_colorspace_set(void *data EINA_UNUSED, void *image, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
|
||||||
|
@ -497,7 +497,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, int *error, Evas_Image
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re = data;
|
Render_Engine *re = data;
|
||||||
|
|
||||||
|
@ -505,7 +505,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re = data;
|
Render_Engine *re = data;
|
||||||
|
|
||||||
|
|
|
@ -1840,7 +1840,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image)
|
||||||
return im->alpha;
|
return im->alpha;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static Evas_Colorspace
|
||||||
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
||||||
{
|
{
|
||||||
// Render_Engine *re;
|
// Render_Engine *re;
|
||||||
|
@ -1951,7 +1951,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_image_colorspace_set(void *data, void *image, int cspace)
|
eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
@ -2638,7 +2638,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, int *error, Evas_Image
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
@ -2648,7 +2648,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
@ -2717,6 +2717,7 @@ eng_image_size_set(void *data, void *image, int w, int h)
|
||||||
case EVAS_COLORSPACE_YCBCR420TM12601_PL:
|
case EVAS_COLORSPACE_YCBCR420TM12601_PL:
|
||||||
w &= ~0x1;
|
w &= ~0x1;
|
||||||
break;
|
break;
|
||||||
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
evas_gl_common_image_alloc_ensure(im_old);
|
evas_gl_common_image_alloc_ensure(im_old);
|
||||||
|
|
|
@ -829,7 +829,7 @@ eng_image_alpha_get(void *data EINA_UNUSED, void *image)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static Evas_Colorspace
|
||||||
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
@ -902,7 +902,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace)
|
eng_image_colorspace_set(void *data EINA_UNUSED, void *image, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Image_Entry *im;
|
Image_Entry *im;
|
||||||
|
|
||||||
|
@ -1006,7 +1006,7 @@ use_local_cache:
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
#ifdef EVAS_CSERVE2
|
#ifdef EVAS_CSERVE2
|
||||||
if (evas_cserve2_use_get())
|
if (evas_cserve2_use_get())
|
||||||
|
@ -1019,7 +1019,7 @@ eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_copied_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_copied_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
#ifdef EVAS_CSERVE2
|
#ifdef EVAS_CSERVE2
|
||||||
if (evas_cserve2_use_get())
|
if (evas_cserve2_use_get())
|
||||||
|
|
|
@ -90,7 +90,7 @@ static void _native_bind_cb(void *data EINA_UNUSED, void *image);
|
||||||
static void _native_unbind_cb(void *data EINA_UNUSED, void *image);
|
static void _native_unbind_cb(void *data EINA_UNUSED, void *image);
|
||||||
static void _native_free_cb(void *data, void *image);
|
static void _native_free_cb(void *data, void *image);
|
||||||
|
|
||||||
static int eng_image_colorspace_get(void *data EINA_UNUSED, void *image);
|
static Evas_Colorspace eng_image_colorspace_get(void *data EINA_UNUSED, void *image);
|
||||||
static int eng_image_alpha_get(void *data EINA_UNUSED, void *image);
|
static int eng_image_alpha_get(void *data EINA_UNUSED, void *image);
|
||||||
|
|
||||||
static Eina_Bool eng_gl_preload_make_current(void *data, void *doit);
|
static Eina_Bool eng_gl_preload_make_current(void *data, void *doit);
|
||||||
|
@ -1600,7 +1600,7 @@ eng_image_mmap(void *data, Eina_File *f, const char *key, int *error, Evas_Image
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
@ -1610,7 +1610,7 @@ eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
|
eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
|
|
||||||
|
@ -2065,7 +2065,7 @@ eng_image_format_get(void *data EINA_UNUSED, void *image EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eng_image_colorspace_set(void *data, void *image, int cspace)
|
eng_image_colorspace_set(void *data, void *image, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
@ -2113,7 +2113,7 @@ eng_image_colorspace_set(void *data, void *image, int cspace)
|
||||||
im->cs.space = cspace;
|
im->cs.space = cspace;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static Evas_Colorspace
|
||||||
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
|
Loading…
Reference in New Issue