struct {
void *data; //Evas_Native_Surface ns;
struct {
- void (*bind) (void *data, void *image, int x, int y, int w, int h);
- void (*unbind) (void *data, void *image);
- void (*free) (void *data, void *image);
- void *data;
+ void (*bind) (void *image, int x, int y, int w, int h);
+ void (*unbind) (void *image);
+ void (*free) (void *image);
} func;
} native;
struct {
void *data;
struct {
- void (*bind) (void *data, void *image);
- void (*unbind) (void *data, void *image);
- void (*free) (void *data, void *image);
- int (*yinvert) (void *data, void *image);
- void *data;
+ void (*bind) (void *image);
+ void (*unbind) (void *image);
+ void (*free) (void *image);
+ int (*yinvert) (void *image);
} func;
int yinvert;
int target;
if ((tex->im) && (tex->im->native.data))
{
if (tex->im->native.func.yinvert)
- yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im);
+ yinvert = tex->im->native.func.yinvert(tex->im);
else
yinvert = tex->im->native.yinvert;
}
if ((tex->im) && (tex->im->native.data))
{
if (tex->im->native.func.yinvert)
- yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im);
+ yinvert = tex->im->native.func.yinvert(tex->im);
else
yinvert = tex->im->native.yinvert;
}
if (!gc->pipe[i].array.im->native.loose)
{
if (gc->pipe[i].array.im->native.func.bind)
- gc->pipe[i].array.im->native.func.bind(gc->pipe[i].array.im->native.func.data,
- gc->pipe[i].array.im);
+ gc->pipe[i].array.im->native.func.bind(gc->pipe[i].array.im);
}
}
}
if (!gc->pipe[i].array.im->native.loose)
{
if (gc->pipe[i].array.im->native.func.unbind)
- gc->pipe[i].array.im->native.func.unbind(gc->pipe[i].array.im->native.func.data,
- gc->pipe[i].array.im);
+ gc->pipe[i].array.im->native.func.unbind(gc->pipe[i].array.im);
}
gc->pipe[i].array.im = NULL;
}
}
if (im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
if (im->cs.data)
{
if (im->native.loose)
{
if (im->native.func.bind)
- im->native.func.bind(im->native.func.data, im);
+ im->native.func.bind(im);
}
#endif
}
static void
-_native_cb_bind(void *data EINA_UNUSED, void *image)
+_native_cb_bind(void *image)
{
Evas_GL_Image *img;
Native *n;
}
static void
-_native_cb_unbind(void *data EINA_UNUSED, void *image)
+_native_cb_unbind(void *image)
{
Evas_GL_Image *img;
Native *n;
}
static void
-_native_cb_free(void *data EINA_UNUSED, void *image)
+_native_cb_free(void *image)
{
Evas_GL_Image *img;
Native *n;
}
img->native.data = NULL;
- img->native.func.data = NULL;
img->native.func.bind = NULL;
img->native.func.unbind = NULL;
img->native.func.free = NULL;
if (img->native.data)
{
if (img->native.func.free)
- img->native.func.free(img->native.func.data, img);
+ img->native.func.free(img);
glsym_evas_gl_common_image_native_disable(img);
}
img->native.disp = ob->egl.disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
img->native.disp = ob->egl.disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
}
static void
-_native_bind_cb(void *data EINA_UNUSED, void *image)
+_native_bind_cb(void *image)
{
Evas_GL_Image *im = image;
Evas_Native_Surface *n = im->native.data;
}
static void
-_native_unbind_cb(void *data EINA_UNUSED, void *image)
+_native_unbind_cb(void *image)
{
Evas_GL_Image *im = image;
Evas_Native_Surface *n = im->native.data;
}
static void
-_native_free_cb(void *data EINA_UNUSED, void *image)
+_native_free_cb(void *image)
{
Evas_GL_Image *im = image;
Evas_Native_Surface *n = im->native.data;
eina_hash_del(im->native.shared->native_tex_hash, &texid, im);
}
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
if (im->native.data)
{
if (im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
evas_gl_common_image_native_disable(im);
}
im->native.loose = 0;
im->native.shared = gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
//#define GLX_TEX_PIXMAP_RECREATE 1
static void
-_native_bind_cb(void *data EINA_UNUSED, void *image)
+_native_bind_cb(void *image)
{
Evas_GL_Image *im = image;
Native *n = im->native.data;
}
static void
-_native_unbind_cb(void *data EINA_UNUSED, void *image)
+_native_unbind_cb(void *image)
{
Evas_GL_Image *im = image;
Native *n = im->native.data;
}
static void
-_native_free_cb(void *data EINA_UNUSED, void *image)
+_native_free_cb(void *image)
{
Evas_GL_Image *im = image;
Native *n = im->native.data;
#endif
}
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
}
static int
-_native_yinvert_cb(void *data EINA_UNUSED, void *image)
+_native_yinvert_cb(void *image)
{
Evas_GL_Image *im = image;
Native *n = im->native.data;
if (im->native.data)
{
if (im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
glsym_evas_gl_common_image_native_disable(im);
}
im->native.disp = eng_get_ob(re)->egl_disp;
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
im->native.disp = eng_get_ob(re)->disp;
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
#endif
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
im->native.disp = eng_get_ob(re)->egl_disp;
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
#endif
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
im->native.disp = eng_get_ob(re)->egl_disp;
im->native.shared = eng_get_ob(re)->gl_context->shared;
im->native.data = n;
- im->native.func.data = re;
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
if (!image) return EINA_FALSE;
im = image;
if (im->native.func.bind)
- im->native.func.bind(data, image, src_x, src_y, src_w, src_h);
+ im->native.func.bind(image, src_x, src_y, src_w, src_h);
if (do_async)
{
if (!im->cache_entry.flags.loaded)
{
if (im->native.func.unbind)
- im->native.func.unbind(data, image);
+ im->native.func.unbind(image);
return EINA_FALSE;
}
}
_image_thr_cb_sample,
_image_thr_cb_smooth);
if (im->native.func.unbind)
- im->native.func.unbind(data, image);
+ im->native.func.unbind(image);
return ret;
}
#ifdef BUILD_PIPE_RENDER
}
if (im->native.func.unbind)
- im->native.func.unbind(data, image);
+ im->native.func.unbind(image);
return EINA_FALSE;
}
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
- im->native.func.data = NULL;
im->image.data = NULL;
free(n);
}
static void
-_native_evasgl_free(void *data EINA_UNUSED, void *image)
+_native_evasgl_free(void *image)
{
RGBA_Image *im = image;
Native *n = im->native.data;
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
if (!ns)
{
if (im->native.data && im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
return NULL;
}
if (im->native.data)
{
if (im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
}
#ifdef EVAS_CSERVE2
n->ns.data.evasgl.surface = ns->data.evasgl.surface;
im->native.data = n;
im->native.func.free = _native_evasgl_free;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
}
}
static void
-_native_cb_bind(void *data, void *image, int x, int y, int w, int h)
+_native_cb_bind(int x, int y, int w, int h)
{
RGBA_Image *im;
Native *n;
n = im->native.data;
if ((n) && (n->ns.type == EVAS_NATIVE_SURFACE_X11))
- _evas_xcb_image_update(data, image, x, y, w, h);
+ _evas_xcb_image_update(NULL, image, x, y, w, h);
}
static void
-_native_cb_free(void *data EINA_UNUSED, void *image)
+_native_cb_free(void *image)
{
RGBA_Image *im;
Native *n;
n->ns_data.x11.visual = NULL;
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
n->ns_data.x11.exim = exim;
im->native.data = n;
- im->native.func.data = NULL;
im->native.func.bind = _native_cb_bind;
im->native.func.unbind = NULL;
im->native.func.free = _native_cb_free;
n->ns_data.x11.display = NULL;
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.free = NULL;
im->image.data = NULL;
n->ns_data.x11.display = d;
n->ns_data.x11.exim = exim;
im->native.data = n;
- im->native.func.data = NULL;
im->native.func.bind = _native_bind_cb;
im->native.func.free = _native_free_cb;
n->ns_data.x11.visual = NULL;
im->native.data = NULL;
- im->native.func.data = NULL;
im->native.func.bind = NULL;
im->native.func.unbind = NULL;
im->native.func.free = NULL;
n->ns_data.x11.visual = vis;
n->ns_data.x11.exim = exim;
im->native.data = n;
- im->native.func.data = NULL;
im->native.func.bind = _native_bind_cb;
im->native.func.free = _native_free_cb;
}
static void
-_native_cb_bind(void *data EINA_UNUSED, void *image)
+_native_cb_bind(void *image)
{
Evas_GL_Image *img;
Native *n;
}
static void
-_native_cb_unbind(void *data EINA_UNUSED, void *image)
+_native_cb_unbind(void *image)
{
Evas_GL_Image *img;
Native *n;
}
static void
-_native_cb_free(void *data EINA_UNUSED, void *image)
+_native_cb_free(void *image)
{
Evas_GL_Image *img;
Native *n;
#endif
}
img->native.data = NULL;
- img->native.func.data = NULL;
img->native.func.bind = NULL;
img->native.func.unbind = NULL;
img->native.func.free = NULL;
}
static int
-_native_cb_yinvert(void *data EINA_UNUSED, void *image)
+_native_cb_yinvert(void *image)
{
Evas_GL_Image *im = image;
Native *n = im->native.data;
if (img->native.data)
{
if (img->native.func.free)
- img->native.func.free(img->native.func.data, img);
+ img->native.func.free(img);
glsym_evas_gl_common_image_native_disable(img);
}
img->native.disp = ob->egl_disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
img->native.disp = ob->egl_disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
img->native.disp = ob->egl_disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
img->native.disp = ob->egl_disp;
img->native.shared = ob->gl_context->shared;
img->native.data = n;
- img->native.func.data = re;
img->native.func.bind = _native_cb_bind;
img->native.func.unbind = _native_cb_unbind;
img->native.func.free = _native_cb_free;
if (im->native.data)
{
if (im->native.func.free)
- im->native.func.free(im->native.func.data, im);
+ im->native.func.free(im);
}
#ifdef EVAS_CSERVE2