Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/gl_x11
Modified Files:
evas_engine.c evas_engine.h
Log Message:
oops - soemoen changed the other symbols around while i changed the first set
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/modules/engines/gl_x11/evas_engine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_engine.c 7 Mar 2006 00:02:16 -0000 1.4
+++ evas_engine.c 7 Mar 2006 02:44:16 -0000 1.5
@@ -257,7 +257,7 @@
if (!glXQueryExtension(disp, &eb, &evb)) return NULL;
re = calloc(1, sizeof(Render_Engine));
- re->win = evas_engine_gl_x11_window_new(disp, draw,
+ re->win = eng_window_new(disp, draw,
0 /* FIXME: screen 0 assumption */,
vis, cmap, depth, w, h);
if (!re->win)
@@ -405,7 +405,7 @@
re = (Render_Engine *)data;
// printf("GL: flush your mush!\n");
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
/* SLOW AS ALL HELL! */
#if 0
@@ -598,7 +598,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
evas_gl_common_rect_draw(re->win->gl_context, context, x, y, w, h);
}
@@ -726,7 +726,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
evas_gl_common_gradient_draw(re->win->gl_context, context, gradient, x, y,
w, h, angle, spread);
}
@@ -737,7 +737,7 @@
re = (Render_Engine *)data;
*error = 0;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
return evas_gl_common_image_load(re->win->gl_context, file, key);
}
@@ -747,7 +747,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
return evas_gl_common_image_new_from_data(re->win->gl_context, w, h,
image_data);
}
@@ -757,7 +757,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h,
image_data);
}
@@ -767,7 +767,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
evas_gl_common_image_free(image);
}
@@ -788,7 +788,7 @@
Evas_GL_Image *im, *im_old;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
if (!image) return NULL;
im_old = image;
if ((im_old) && (im_old->im->image->w == w) && (im_old->im->image->h == h))
@@ -825,7 +825,7 @@
re = (Render_Engine *)data;
im = image;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
evas_common_load_image_data_from_file(im->im);
if (to_write)
{
@@ -856,7 +856,7 @@
re = (Render_Engine *)data;
im = image;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
if (image_data != im->im->image->data)
{
int w, h;
@@ -878,7 +878,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
im = image;
if ((has_alpha) && (im->im->flags & RGBA_IMAGE_HAS_ALPHA)) return image;
else if ((!has_alpha) && (!(im->im->flags & RGBA_IMAGE_HAS_ALPHA))) return
image;
@@ -909,7 +909,7 @@
re = (Render_Engine *)data;
im = image;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
if (im->im->flags & RGBA_IMAGE_HAS_ALPHA) return 1;
return 0;
}
@@ -920,7 +920,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- evas_engine_gl_x11_window_use(re->win);
+ eng_window_use(re->win);
evas_gl_common_image_draw(re->win->gl_context, context, image,
src_x, src_y, src_w, src_h,
dst_x, dst_y, dst_w, dst_h,
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/modules/engines/gl_x11/evas_engine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.h 7 Mar 2006 00:24:37 -0000 1.2
+++ evas_engine.h 7 Mar 2006 02:44:16 -0000 1.3
@@ -29,13 +29,13 @@
Evas_GL_X11_Window *
eng_window_new(Display *disp,
- Window win,
- int screen,
- Visual *vis,
- Colormap cmap,
- int depth,
- int w,
- int h);
+ Window win,
+ int screen,
+ Visual *vis,
+ Colormap cmap,
+ int depth,
+ int w,
+ int h);
void
eng_window_free(Evas_GL_X11_Window *gw);
void
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
