From e1548271733f0369a79e3906c29537f8a34fb907 Mon Sep 17 00:00:00 2001 From: raster Date: Wed, 20 Apr 2011 08:05:23 +0000 Subject: [PATCH] more bad code - why pass in void * image and data? sero point.. and it totally is out of step with the rest of the api for gl_common.. that alone would tell you "dont so that". ugh. more filter fixes. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@58746 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_common.h | 2 +- src/modules/engines/gl_common/evas_gl_filter.c | 5 +---- src/modules/engines/gl_x11/evas_engine.c | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/engines/gl_common/evas_gl_common.h index 3358005..8474a7e 100644 --- a/src/modules/engines/gl_common/evas_gl_common.h +++ b/src/modules/engines/gl_common/evas_gl_common.h @@ -549,7 +549,7 @@ void evas_gl_common_poly_draw(Evas_Engine_GL_Context *gc, Evas_GL_P void evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, int x1, int y1, int x2, int y2); -void evas_gl_common_filter_draw(void *data, Evas_Engine_GL_Context *context, void *image, Evas_Filter_Info *filter); +void evas_gl_common_filter_draw(Evas_Engine_GL_Context *context, Evas_GL_Image *im, Evas_Filter_Info *filter); Filtered_Image *evas_gl_common_image_filtered_get(Evas_GL_Image *im, uint8_t *key, size_t keylen); Filtered_Image *evas_gl_common_image_filtered_save(Evas_GL_Image *im, Evas_GL_Image *fimage, uint8_t *key, size_t keylen); void evas_gl_common_image_filtered_free(Evas_GL_Image *im, Filtered_Image *); diff --git a/src/modules/engines/gl_common/evas_gl_filter.c b/src/modules/engines/gl_common/evas_gl_filter.c index 2d985b8..adec10c 100644 --- a/src/modules/engines/gl_common/evas_gl_filter.c +++ b/src/modules/engines/gl_common/evas_gl_filter.c @@ -1,11 +1,8 @@ #include "evas_gl_private.h" -// FIXME: wtf. why pass in data? void -evas_gl_common_filter_draw(void *data __UNUSED__, Evas_Engine_GL_Context *gc, - void *image, Evas_Filter_Info *filter) +evas_gl_common_filter_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, Evas_Filter_Info *filter) { - Evas_GL_Image *im = image; RGBA_Draw_Context *dc; GLuint prog; int r,g,b,a; diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c index d04370a..83dfd19 100644 --- a/src/modules/engines/gl_x11/evas_engine.c +++ b/src/modules/engines/gl_x11/evas_engine.c @@ -1559,7 +1559,7 @@ eng_image_native_get(void *data __UNUSED__, void *image) static void eng_image_draw_filtered(void *data, void *context, void *surface, - void *image, Evas_Filter_Info *filter) + void *image, Evas_Filter_Info *filter) { Render_Engine *re = data; @@ -1568,7 +1568,7 @@ eng_image_draw_filtered(void *data, void *context, void *surface, evas_gl_common_context_target_surface_set(re->win->gl_context, surface); re->win->gl_context->dc = context; - evas_gl_common_filter_draw(data, re->win->gl_context, image, filter); + evas_gl_common_filter_draw(re->win->gl_context, image, filter); } static Filtered_Image * -- 2.7.4