Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine.h evas_engine_image.c
Log Message:
not complete yet - actually i need help with the fragment shader.
in evas_gl_texture.c i have a frag shader, and it tries to use a set of 3
textures that act as the yuv planes, BUT the u and v textures (Utex and Vtex)
are simply getting values from the Ytex - regardless of what i try. grrr.
what's up with that?
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_engine.c 9 Dec 2006 08:52:08 -0000 1.14
+++ evas_engine.c 17 Dec 2006 15:48:52 -0000 1.15
@@ -475,24 +475,24 @@
}
static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data)
+eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int
alpha, int cspace)
{
Render_Engine *re;
XR_Image *im;
re = (Render_Engine *)data;
- im = _xre_image_new_from_data(re->xinf, w, h, image_data);
+ im = _xre_image_new_from_data(re->xinf, w, h, image_data, alpha, cspace);
return im;
}
static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data)
+eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data,
int alpha, int cspace)
{
Render_Engine *re;
XR_Image *im;
re = (Render_Engine *)data;
- im = _xre_image_new_from_copied_data(re->xinf, w, h, image_data);
+ im = _xre_image_new_from_copied_data(re->xinf, w, h, image_data, alpha,
cspace);
return im;
}
@@ -590,7 +590,7 @@
{
if (!image)
{
- image = _xre_image_new_from_data(old_image->xinf,
old_image->w, old_image->h, image_data);
+ image = _xre_image_new_from_data(old_image->xinf,
old_image->w, old_image->h, image_data, old_image->alpha,
EVAS_COLORSPACE_ARGB8888);
if (image)
{
((XR_Image *)image)->alpha = old_image->alpha;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_engine.h 5 Nov 2006 12:51:23 -0000 1.7
+++ evas_engine.h 17 Dec 2006 15:48:52 -0000 1.8
@@ -106,8 +106,8 @@
};
XR_Image *_xre_image_load(Ximage_Info *xinf, const char *file, const char
*key, Evas_Image_Load_Opts *lo);
-XR_Image *_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void
*data);
-XR_Image *_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h,
void *data);
+XR_Image *_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void
*data, int alpha, int cspace);
+XR_Image *_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h,
void *data, int alpha, int cspace);
XR_Image *_xre_image_new(Ximage_Info *xinf, int w, int h);
void _xre_image_resize(XR_Image *im, int w, int h);
void _xre_image_free(XR_Image *im);
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_image.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_engine_image.c 5 Nov 2006 12:51:23 -0000 1.8
+++ evas_engine_image.c 17 Dec 2006 15:48:52 -0000 1.9
@@ -117,7 +117,7 @@
}
XR_Image *
-_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void *data)
+_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void *data, int
alpha, int cspace)
{
XR_Image *im;
@@ -129,14 +129,14 @@
im->h = h;
im->references = 1;
im->data = data;
- im->alpha = 1;
+ im->alpha = alpha;
im->dirty = 1;
__xre_image_dirty_hash_add(im);
return im;
}
XR_Image *
-_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h, void *data)
+_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h, void *data,
int alpha, int cspace)
{
XR_Image *im;
@@ -162,7 +162,7 @@
im->xinf = xinf;
im->xinf->references++;
im->free_data = 1;
- im->alpha = 1;
+ im->alpha = alpha;
im->dirty = 1;
__xre_image_dirty_hash_add(im);
return im;
@@ -268,7 +268,7 @@
}
}
if (!data) return NULL;
- im2 = _xre_image_new_from_copied_data(im->xinf, im->w, im->h, data);
+ im2 = _xre_image_new_from_copied_data(im->xinf, im->w, im->h, data,
im->alpha, EVAS_COLORSPACE_ARGB8888);
if (im2) im2->alpha = im->alpha;
if ((im->im) && (!im->dirty))
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
