forked from enlightenment/efl
Revert "evas: remove unused fonction evas_gl_common_image_load."
Summary:
This reverts commit fc7e244e99
.
Depends on D11336
Reviewers: raster
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11337
This commit is contained in:
parent
7aec0565cb
commit
be3915cc90
|
@ -736,6 +736,7 @@ void evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
|
||||||
Evas_Colorspace evas_gl_common_gl_format_to_colorspace(GLuint f);
|
Evas_Colorspace evas_gl_common_gl_format_to_colorspace(GLuint f);
|
||||||
|
|
||||||
void evas_gl_common_image_alloc_ensure(Evas_GL_Image *im);
|
void evas_gl_common_image_alloc_ensure(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_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_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_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, Evas_Colorspace 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);
|
||||||
|
|
|
@ -281,6 +281,37 @@ found_cspace:
|
||||||
return im;
|
return 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)
|
||||||
|
{
|
||||||
|
RGBA_Image *im_im;
|
||||||
|
|
||||||
|
#ifdef EVAS_CSERVE2
|
||||||
|
if (evas_cserve2_use_get())
|
||||||
|
{
|
||||||
|
im_im = (RGBA_Image *) evas_cache2_image_open
|
||||||
|
(evas_common_image_cache2_get(), file, key, lo, error);
|
||||||
|
if (im_im)
|
||||||
|
{
|
||||||
|
*error = evas_cache2_image_open_wait(&im_im->cache_entry);
|
||||||
|
if ((*error != EVAS_LOAD_ERROR_NONE)
|
||||||
|
&& im_im->cache_entry.animated.animated)
|
||||||
|
{
|
||||||
|
evas_cache2_image_close(&im_im->cache_entry);
|
||||||
|
im_im = NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
im_im = evas_common_load_image_from_file(file, key, lo, error);
|
||||||
|
if (!im_im) return NULL;
|
||||||
|
|
||||||
|
return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error);
|
||||||
|
}
|
||||||
|
|
||||||
Evas_GL_Image *
|
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_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue