Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_x11
Modified Files:
evas_engine.c
Log Message:
debugging, printfs, turn text off for now, etc.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/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 4 Sep 2003 07:40:33 -0000 1.4
+++ evas_engine.c 5 Sep 2003 05:37:14 -0000 1.5
@@ -649,6 +649,8 @@
evas_engine_gl_x11_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))
+ return image;
im = evas_gl_common_image_new(re->win->gl_context, w, h);
if (im_old)
{
@@ -691,7 +693,11 @@
Evas_GL_Image *im_new;
im_new = evas_gl_common_image_new_from_copied_data(im->gc,
im->im->image->w, im->im->image->h, im->im->image->data);
- if (!im_new) return im;
+ if (!im_new)
+ {
+ return im;
+ *image_data = NULL;
+ }
im = im_new;
}
else
@@ -720,7 +726,7 @@
return evas_engine_gl_x11_image_new_from_data(data, w, h, image_data);
}
/* hmmm - but if we wrote... why bother? */
-/* evas_gl_common_image_dirty(im); */
+ evas_gl_common_image_dirty(im);
return im;
}
@@ -733,6 +739,8 @@
re = (Render_Engine *)data;
evas_engine_gl_x11_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;
if (im->references > 1)
{
Evas_GL_Image *im_new;
@@ -949,7 +957,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
-#define GL_TXT 1
+//#define GL_TXT 1
#ifdef GL_TXT
{
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
