NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: Render_Engine_GL_Generic is actually an output.

This commit is contained in:
Cedric BAIL 2017-08-25 10:48:00 -07:00
parent cac667e402
commit 6f3980f55e
17 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/evas/engines/eglfs/evas_engine.c
View File

@ -33,7 +33,7 @@ static int gl_wins = 0;
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
};
typedef struct _Native Native;

2
src/modules/evas/engines/gl_cocoa/evas_engine.h
View File

@ -43,7 +43,7 @@ typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
Outbuf *win;
};

2
src/modules/evas/engines/gl_drm/evas_engine.h
View File

@ -68,7 +68,7 @@ extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock;
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
Ecore_Drm2_Device *dev;
};

8
src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
View File

@ -8,7 +8,7 @@
#include "../gl_common/evas_gl_core.h"
#include "../gl_common/evas_gl_core_private.h"
typedef struct _Render_Engine_GL_Generic Render_Engine_GL_Generic;
typedef struct _Render_Output_GL_Generic Render_Output_GL_Generic;
typedef struct _Context_3D Context_3D;
typedef void (*Window_Use)(Outbuf *ob);
@ -17,7 +17,7 @@ typedef void *(*Window_EGL_Display_Get)(Outbuf *ob);
typedef Context_3D *(*Window_GL_Context_New)(Outbuf *ob);
typedef void (*Window_GL_Context_Use)(Context_3D *ctx);
struct _Render_Engine_GL_Generic
struct _Render_Output_GL_Generic
{
Render_Output_Software_Generic software;
@ -41,7 +41,7 @@ struct _Render_Engine_GL_Generic
};
static inline Eina_Bool
evas_render_engine_gl_generic_init(Render_Engine_GL_Generic *re,
evas_render_engine_gl_generic_init(Render_Output_GL_Generic *re,
Outbuf *ob,
Outbuf_Swap_Mode_Get outbuf_swap_mode_get,
Outbuf_Get_Rot outbuf_get_rot,
@ -100,7 +100,7 @@ evas_render_engine_gl_generic_init(Render_Engine_GL_Generic *re,
}
static inline void
evas_render_engine_software_gl_get_pixels_set(Render_Engine_GL_Generic *re,
evas_render_engine_software_gl_get_pixels_set(Render_Output_GL_Generic *re,
Evas_Object_Image_Pixels_Get_Cb get_pixels,
void *get_pixels_data,
Evas_Object *obj)

4
src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
View File

@ -37,7 +37,7 @@ struct _Ector_GL_Buffer_Map
struct _Evas_Ector_GL_Buffer_Data
{
Render_Engine_GL_Generic *re;
Render_Output_GL_Generic *re;
Evas_GL_Image *glim;
Eina_Bool alpha_only, was_render;
Ector_GL_Buffer_Map *maps;
@ -109,7 +109,7 @@ _evas_ector_gl_buffer_gl_buffer_prepare(Eo *obj, Evas_Ector_GL_Buffer_Data *pd,
int w, int h, Efl_Gfx_Colorspace cspace,
Ector_Buffer_Flag flags EINA_UNUSED)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_Engine_GL_Context *gc;
Evas_GL_Image *im;

4
src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
View File

@ -36,7 +36,7 @@ struct _Ector_GL_Buffer_Map
struct _Evas_Ector_GL_Image_Buffer_Data
{
Render_Engine_GL_Generic *re;
Render_Output_GL_Generic *re;
Evas_GL_Image *glim;
Ector_GL_Buffer_Map *maps;
};
@ -74,7 +74,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj EINA_UNUS
Evas_Ector_GL_Image_Buffer_Data *pd,
void *engine, void *image)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im = image;
EINA_SAFETY_ON_FALSE_RETURN(!pd->glim);

102
src/modules/evas/engines/gl_generic/evas_engine.c
View File

@ -111,7 +111,7 @@ static void
eng_rectangle_draw(void *engine EINA_UNUSED, void *data, void *context, void *surface, int x, int y, int w, int h, Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -124,7 +124,7 @@ static void
eng_line_draw(void *engine EINA_UNUSED, void *data, void *context, void *surface, int p1x, int p1y, int p2x, int p2y, Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -149,7 +149,7 @@ static void
eng_polygon_draw(void *engine EINA_UNUSED, void *data, void *context, void *surface EINA_UNUSED, void *polygon, int x, int y, Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -181,7 +181,7 @@ eng_image_colorspace_get(void *engine EINA_UNUSED, void *image)
static void *
eng_image_alpha_set(void *engine, void *image, int has_alpha)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im;
if (!image) return NULL;
@ -264,7 +264,7 @@ eng_image_data_direct_get(void *engine EINA_UNUSED, void *image, int plane,
static void
eng_image_colorspace_set(void *engine, void *image, Evas_Colorspace cspace)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im;
if (!image) return;
@ -380,7 +380,7 @@ static void *
eng_image_native_set(void *engine, void *image, void *native)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_Native_Surface *ns = native;
Evas_GL_Image *im = image, *im2 = NULL;
uint32_t texid;
@ -503,7 +503,7 @@ static void *
eng_image_load(void *engine, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
*error = EVAS_LOAD_ERROR_NONE;
re->window_use(re->software.ob);
@ -515,7 +515,7 @@ static void *
eng_image_mmap(void *engine, Eina_File *f, const char *key, int *error, Evas_Image_Load_Opts *lo)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
*error = EVAS_LOAD_ERROR_NONE;
re->window_use(re->software.ob);
@ -527,7 +527,7 @@ static void *
eng_image_new_from_data(void *engine, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -538,7 +538,7 @@ static void *
eng_image_new_from_copied_data(void *engine, int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -548,7 +548,7 @@ eng_image_new_from_copied_data(void *engine, int w, int h, DATA32 *image_data, i
void
eng_image_free(void *engine, void *image)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
if (!image) return;
re->window_use(re->software.ob);
@ -594,7 +594,7 @@ static void *
eng_image_size_set(void *engine, void *image, int w, int h)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im = image;
Evas_GL_Image *im_old;
@ -646,7 +646,7 @@ eng_image_size_set(void *engine, void *image, int w, int h)
static void *
eng_image_dirty_region(void *engine, void *image, int x, int y, int w, int h)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im = image;
if (!image) return NULL;
@ -657,7 +657,7 @@ eng_image_dirty_region(void *engine, void *image, int x, int y, int w, int h)
}
static Evas_GL_Image *
_rotate_image_data(Render_Engine_GL_Generic *re, Evas_GL_Image *im1)
_rotate_image_data(Render_Output_GL_Generic *re, Evas_GL_Image *im1)
{
int alpha;
Evas_GL_Image *im2;
@ -718,7 +718,7 @@ _rotate_image_data(Render_Engine_GL_Generic *re, Evas_GL_Image *im1)
void *
eng_image_data_get(void *engine, void *image, int to_write, DATA32 **image_data, int *err, Eina_Bool *tofree)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im_new = NULL;
Evas_GL_Image *im = image;
int error;
@ -945,7 +945,7 @@ rotate_image:
void *
eng_image_data_put(void *engine, void *image, DATA32 *image_data)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im, *im2;
if (!image) return NULL;
@ -1032,7 +1032,7 @@ eng_image_data_put(void *engine, void *image, DATA32 *image_data)
static void *
eng_image_orient_set(void *engine, void *image, Evas_Image_Orient orient)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im;
Evas_GL_Image *im_new;
@ -1081,7 +1081,7 @@ static void
eng_image_data_preload_request(void *engine EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
// Render_Engine_GL_Generic *re = data;
// Render_Output_GL_Generic *re = data;
RGBA_Image *im;
if (!gim) return;
@ -1137,7 +1137,7 @@ static Eina_Bool
eng_image_draw(void *engine EINA_UNUSED, 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_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
Evas_GL_Image *im = image;
Evas_Native_Surface *n;
@ -1230,7 +1230,7 @@ eng_image_map_draw(void *engine, void *data, void *context, void *surface, void
{
Evas_Engine_GL_Context *gl_context;
Evas_GL_Image *gim = image;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
if (!image) return EINA_FALSE;
re->window_use(re->software.ob);
@ -1283,7 +1283,7 @@ eng_image_map_clean(void *engine EINA_UNUSED, RGBA_Map *m EINA_UNUSED)
static void *
eng_image_map_surface_new(void *engine, int w, int h, int alpha)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_Engine_GL_Context *gl_context;
re->window_use(re->software.ob);
@ -1302,7 +1302,7 @@ eng_image_scaled_update(void *engine EINA_UNUSED, void *scaled, void *image,
static void
eng_image_content_hint_set(void *engine, void *image, int hint)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
evas_gl_common_image_content_hint_set(image, hint);
@ -1320,7 +1320,7 @@ static void
eng_image_cache_flush(void *engine)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
int tmp_size;
re->window_use(re->software.ob);
@ -1338,7 +1338,7 @@ static void
eng_image_cache_set(void *engine, int bytes)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -1357,7 +1357,7 @@ eng_image_cache_get(void *engine EINA_UNUSED)
static void
eng_font_cache_flush(void *engine)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
int tmp_size;
re->window_use(re->software.ob);
@ -1370,7 +1370,7 @@ eng_font_cache_flush(void *engine)
static void
eng_font_cache_set(void *engine, int bytes)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
evas_common_font_cache_set(bytes);
@ -1379,7 +1379,7 @@ eng_font_cache_set(void *engine, int bytes)
static int
eng_font_cache_get(void *engine)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
return evas_common_font_cache_get();
@ -1440,7 +1440,7 @@ static Eina_Bool
eng_font_draw(void *engine EINA_UNUSED, void *data, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props, Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -1479,7 +1479,7 @@ eng_font_draw(void *engine EINA_UNUSED, void *data, void *context, void *surface
//--------------------------------//
// Evas GL Related Code
static int
evgl_init(Render_Engine_GL_Generic *re)
evgl_init(Render_Output_GL_Generic *re)
{
if (re->evgl_initted) return 1;
if (!evgl_engine_init(re, re->evgl_funcs)) return 0;
@ -1540,7 +1540,7 @@ eng_gl_context_destroy(void *engine, void *context)
static int
eng_gl_make_current(void *engine, void *surface, void *context)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
EVGL_Surface *sfc = (EVGL_Surface *)surface;
EVGL_Context *ctx = (EVGL_Context *)context;
int ret = 0;
@ -1600,7 +1600,7 @@ eng_gl_string_query(void *engine, int name)
static void *
eng_gl_proc_address_get(void *engine, const char *name)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
EVGLINIT(re, NULL);
void *fun = NULL;
@ -1632,7 +1632,7 @@ eng_gl_native_surface_get(void *engine EINA_UNUSED, void *surface, void *native_
static void *
eng_gl_api_get(void *engine, int version)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
void *ret;
Evas_Engine_GL_Context *gl_context;
EVGLINIT(re, NULL);
@ -1668,7 +1668,7 @@ eng_gl_direct_override_get(void *engine, Eina_Bool *override, Eina_Bool *force_o
static Eina_Bool
eng_gl_surface_direct_renderable_get(void *engine, Evas_Native_Surface *ns, Eina_Bool *override, void *surface)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Eina_Bool direct_render, client_side_rotation;
Evas_Engine_GL_Context *gl_context;
Evas_GL_Image *sfc = surface;
@ -1695,7 +1695,7 @@ eng_gl_surface_direct_renderable_get(void *engine, Evas_Native_Surface *ns, Eina
static void
eng_gl_get_pixels_set(void *engine, void *get_pixels, void *get_pixels_data, void *obj)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->func.get_pixels = get_pixels;
re->func.get_pixels_data = get_pixels_data;
@ -1808,7 +1808,7 @@ eng_gl_surface_read_pixels(void *engine EINA_UNUSED, void *surface,
static Eina_Bool
eng_gl_surface_query(void *engine, void *surface, int attr, void *value)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
EVGL_Surface *sfc = surface;
#ifdef GL_GLES
@ -1921,7 +1921,7 @@ eng_gl_image_direct_get(void *engine EINA_UNUSED, void *image)
static void
eng_gl_image_direct_set(void *engine, void *image, Eina_Bool direct)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image *im = image;
if (!im) return;
@ -2045,7 +2045,7 @@ static void
eng_image_max_size_get(void *engine, int *maxw, int *maxh)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
gl_context = re->window_gl_context_get(re->software.ob);
if (maxw) *maxw = gl_context->shared->info.max_texture_size;
@ -2145,7 +2145,7 @@ static void
eng_context_flush(void *engine)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
gl_context = re->window_gl_context_get(re->software.ob);
@ -2245,7 +2245,7 @@ eng_context_dup(void *engine EINA_UNUSED, void *context)
static void
eng_context_3d_use(void *engine)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
if (!re->context_3d)
re->context_3d = re->window_gl_context_new(re->software.ob);
@ -2255,7 +2255,7 @@ eng_context_3d_use(void *engine)
static E3D_Renderer *
eng_renderer_3d_get(void *engine)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
if (!re->renderer_3d)
re->renderer_3d = e3d_renderer_new();
@ -2311,7 +2311,7 @@ static void
eng_drawable_scene_render(void *engine, void *data EINA_UNUSED, void *drawable, void *scene_data)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
E3D_Renderer *renderer = NULL;
re->window_use(re->software.ob);
@ -2346,7 +2346,7 @@ static Eina_Bool
eng_drawable_scene_render_to_texture(void *engine, void *drawable, void *scene_data)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
E3D_Renderer *renderer = NULL;
re->window_use(re->software.ob);
@ -2415,7 +2415,7 @@ static void
eng_texture_image_set(void *engine, void *texture, void *image)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -2501,7 +2501,7 @@ eng_ector_renderer_draw(void *engine EINA_UNUSED, void *data, void *context, voi
{
Evas_GL_Image *dst = surface;
Evas_Engine_GL_Context *gc;
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
Eina_Rectangle *r;
Eina_Array *c;
Eina_Rectangle clip;
@ -2594,7 +2594,7 @@ eng_ector_begin(void *engine, void *context EINA_UNUSED, Ector_Surface *ector,
int x, int y, Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Ector *buffer = engine_data;
int w, h;
@ -2647,7 +2647,7 @@ eng_ector_end(void *engine, void *context EINA_UNUSED, Ector_Surface *ector,
Eina_Bool do_async EINA_UNUSED)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Ector *buffer = engine_data;
int w, h;
Eina_Bool mul_use;
@ -2692,7 +2692,7 @@ eng_image_data_map(void *engine, void **image, Eina_Rw_Slice *slice,
Evas_Colorspace cspace, Efl_Gfx_Buffer_Access_Mode mode,
int plane)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
Evas_GL_Image_Data_Map *map = NULL;
Evas_GL_Image *glim, *glim2 = NULL;
Eina_Bool ok = EINA_FALSE;
@ -3023,7 +3023,7 @@ static void *
eng_image_surface_noscale_new(void *engine, int w, int h, int alpha)
{
Evas_Engine_GL_Context *gl_context;
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
re->window_use(re->software.ob);
gl_context = re->window_gl_context_get(re->software.ob);
@ -3055,7 +3055,7 @@ eng_image_surface_noscale_region_get(void *engine EINA_UNUSED, void *image, int
//------------------------------------------------//
static GL_Filter_Apply_Func
_gfx_filter_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gfx_filter_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
GL_Filter_Apply_Func funcptr = NULL;
@ -3078,7 +3078,7 @@ _gfx_filter_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
static Evas_Filter_Support
eng_gfx_filter_supports(void *engine, Evas_Filter_Command *cmd)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
if (!_gfx_filter_func_get(re, cmd))
return pfunc.gfx_filter_supports(&re->software, cmd);
@ -3089,7 +3089,7 @@ eng_gfx_filter_supports(void *engine, Evas_Filter_Command *cmd)
static Eina_Bool
eng_gfx_filter_process(void *engine, Evas_Filter_Command *cmd)
{
Render_Engine_GL_Generic *re = engine;
Render_Output_GL_Generic *re = engine;
GL_Filter_Apply_Func funcptr;
funcptr = _gfx_filter_func_get(re, cmd);

16
src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h
View File

@ -8,14 +8,14 @@
extern int _evas_engine_GL_log_dom;
typedef Eina_Bool (* GL_Filter_Apply_Func) (Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_blend_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_blur_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
//GL_Filter_Apply_Func gl_filter_bump_func_get(Render_Engine_GL_Generic *reEvas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_curve_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_displace_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_fill_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_mask_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
typedef Eina_Bool (* GL_Filter_Apply_Func) (Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_blend_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_blur_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
//GL_Filter_Apply_Func gl_filter_bump_func_get(Render_Output_GL_Generic *reEvas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_curve_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_displace_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_fill_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
GL_Filter_Apply_Func gl_filter_mask_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd);
//GL_Filter_Apply_Func gl_filter_transform_func_get(Evas_Filter_Command *cmd);
#undef DBG

4
src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c
View File

@ -156,7 +156,7 @@ _mapped_blend(Evas_Engine_GL_Context *gc,
}
static Eina_Bool
_gl_filter_blend(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_blend(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Engine_GL_Context *gc;
Evas_GL_Image *image, *surface;
@ -247,7 +247,7 @@ _gl_filter_blend(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_blend_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_blend_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);

4
src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c
View File

@ -127,7 +127,7 @@ _output_scale_get(Evas_Filter_Context *ctx, Evas_Filter_Command *cmd,
}
static Eina_Bool
_gl_filter_blur(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_blur(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Engine_GL_Context *gc;
Evas_GL_Image *image, *surface;
@ -267,7 +267,7 @@ _gl_filter_blur(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_blur_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_blur_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);

4
src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c
View File

@ -1,7 +1,7 @@
#include "gl_engine_filter.h"
static Eina_Bool
_gl_filter_curve(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_curve(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Engine_GL_Context *gc;
Evas_GL_Image *image, *surface;
@ -56,7 +56,7 @@ _gl_filter_curve(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_curve_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_curve_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);

4
src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c
View File

@ -1,7 +1,7 @@
#include "gl_engine_filter.h"
static Eina_Bool
_gl_filter_displace(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_displace(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Engine_GL_Context *gc;
Evas_GL_Image *image, *surface, *orig_map, *use_map;
@ -75,7 +75,7 @@ _gl_filter_displace(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_displace_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_displace_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);

4
src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c
View File

@ -1,7 +1,7 @@
#include "gl_engine_filter.h"
static Eina_Bool
_gl_filter_fill(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_fill(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Filter_Buffer *fb = cmd->output;
Evas_Engine_GL_Context *gc;
@ -63,7 +63,7 @@ _gl_filter_fill(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_fill_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_fill_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);

4
src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c
View File

@ -1,7 +1,7 @@
#include "gl_engine_filter.h"
static Eina_Bool
_gl_filter_mask(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
_gl_filter_mask(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
{
Evas_Engine_GL_Context *gc;
Evas_GL_Image *image, *surface, *orig_mask, *use_mask = NULL;
@ -68,7 +68,7 @@ _gl_filter_mask(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
}
GL_Filter_Apply_Func
gl_filter_mask_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
gl_filter_mask_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);

2
src/modules/evas/engines/gl_sdl/evas_engine.h
View File

@ -76,7 +76,7 @@ struct _Outbuf
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
};
#endif

6
src/modules/evas/engines/gl_x11/evas_engine.c
View File

@ -22,7 +22,7 @@ typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
};
const char *debug_dir;
@ -657,7 +657,7 @@ static void *
evgl_eng_pbuffer_surface_create(void *data, EVGL_Surface *sfc,
const int *attrib_list)
{
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
// TODO: Add support for surfaceless pbuffers (EGL_NO_TEXTURE)
// TODO: Add support for EGL_MIPMAP_TEXTURE??? (GLX doesn't support them)
@ -883,7 +883,7 @@ evgl_eng_pbuffer_surface_destroy(void *data, void *surface)
eglDestroySurface(eng_get_ob(re)->egl_disp, (EGLSurface)surface);
#else
Render_Engine_GL_Generic *re = data;
Render_Output_GL_Generic *re = data;
GLXPbuffer pbuf = (GLXPbuffer)(intptr_t) surface;
glXDestroyPbuffer(re->software.ob->disp, pbuf);

2
src/modules/evas/engines/wayland_egl/evas_engine.c
View File

@ -28,7 +28,7 @@
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
Render_Engine_GL_Generic generic;
Render_Output_GL_Generic generic;
};
/* local function prototypes */