enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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.



SVN revision: 58746
This commit is contained in:
Carsten Haitzler 2011-04-20 08:05:23 +00:00
parent 18619830c4
commit 7ed47808cb
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
View File

@ -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 *);

5
legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c
View File

@ -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;

4
legacy/evas/src/modules/engines/gl_x11/evas_engine.c
View File

@ -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 *