Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine.h evas_engine_gradient.c
evas_engine_xrender.c
Log Message:
joses's gradient work - gradient look nice. one problem jose.. USE BRACKETS!
do NOT depend on order operation precedence. it broke scaling. laos other
completely bizarre mmx things were going wrong with mm7 ending up not 0 so
i've had to force it to be 0.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_engine.c 9 Oct 2005 02:06:52 -0000 1.10
+++ evas_engine.c 3 Dec 2005 09:27:53 -0000 1.11
@@ -29,6 +29,10 @@
static int evas_engine_xrender_x11_context_multiplier_get(void *data, void
*context, int *r, int *g, int *b, int *a);
static void evas_engine_xrender_x11_context_cutout_add(void *data, void
*context, int x, int y, int w, int h);
static void evas_engine_xrender_x11_context_cutout_clear(void *data, void
*context);
+static void evas_engine_xrender_x11_context_anti_alias_set(void *data, void
*context, unsigned char aa);
+static unsigned char evas_engine_xrender_x11_context_anti_alias_get(void
*data, void *context);
+static void evas_engine_xrender_x11_context_color_interpolation_set(void
*data, void *context, int color_space);
+static int evas_engine_xrender_x11_context_color_interpolation_get(void *data,
void *context);
static void evas_engine_xrender_x11_rectangle_draw(void *data, void *context,
void *surface, int x, int y, int w, int h);
static void evas_engine_xrender_x11_line_draw(void *data, void *context, void
*surface, int x1, int y1, int x2, int y2);
static void *evas_engine_xrender_x11_polygon_point_add(void *data, void
*context, void *polygon, int x, int y);
@@ -36,7 +40,14 @@
static void evas_engine_xrender_x11_polygon_draw(void *data, void *context,
void *surface, void *polygon);
static void *evas_engine_xrender_x11_gradient_color_add(void *data, void
*context, void *gradient, int r, int g, int b, int a, int distance);
static void *evas_engine_xrender_x11_gradient_colors_clear(void *data, void
*context, void *gradient);
-static void evas_engine_xrender_x11_gradient_draw(void *data, void *context,
void *surface, void *gradient, int x, int y, int w, int h, double angle);
+static void evas_engine_xrender_x11_gradient_free(void *data, void *gradient);
+static void evas_engine_xrender_x11_gradient_fill_set(void *data, void
*gradient, int x, int y, int w, int h);
+static void evas_engine_xrender_x11_gradient_type_set(void *data, void
*gradient, char *name);
+static void evas_engine_xrender_x11_gradient_type_params_set(void *data, void
*gradient, char *params);
+static void *evas_engine_xrender_x11_gradient_geometry_init(void *data, void
*gradient, int spread);
+static int evas_engine_xrender_x11_gradient_alpha_get(void *data, void
*gradient, int spread);
+static void evas_engine_xrender_x11_gradient_map(void *data, void *context,
void *gradient, int spread);
+static void evas_engine_xrender_x11_gradient_draw(void *data, void *context,
void *surface, void *gradient, int x, int y, int w, int h, double angle, int
spread);
static void *evas_engine_xrender_x11_image_load(void *data, char *file, char
*key, int *error);
static void *evas_engine_xrender_x11_image_new_from_data(void *data, int w,
int h, DATA32 *image_data);
static void *evas_engine_xrender_x11_image_new_from_copied_data(void *data,
int w, int h, DATA32 *image_data);
@@ -131,6 +142,10 @@
evas_engine_xrender_x11_context_multiplier_get,
evas_engine_xrender_x11_context_cutout_add,
evas_engine_xrender_x11_context_cutout_clear,
+ evas_engine_xrender_x11_context_anti_alias_set,
+ evas_engine_xrender_x11_context_anti_alias_get,
+ evas_engine_xrender_x11_context_color_interpolation_set,
+ evas_engine_xrender_x11_context_color_interpolation_get,
/* rectangle draw funcs */
evas_engine_xrender_x11_rectangle_draw,
/* line draw funcs */
@@ -142,6 +157,13 @@
/* gradient draw funcs */
evas_engine_xrender_x11_gradient_color_add,
evas_engine_xrender_x11_gradient_colors_clear,
+ evas_engine_xrender_x11_gradient_free,
+ evas_engine_xrender_x11_gradient_fill_set,
+ evas_engine_xrender_x11_gradient_type_set,
+ evas_engine_xrender_x11_gradient_type_params_set,
+ evas_engine_xrender_x11_gradient_geometry_init,
+ evas_engine_xrender_x11_gradient_alpha_get,
+ evas_engine_xrender_x11_gradient_map,
evas_engine_xrender_x11_gradient_draw,
/* image draw funcs */
evas_engine_xrender_x11_image_load,
@@ -571,6 +593,41 @@
evas_common_draw_context_clear_cutouts(context);
}
+static void
+evas_engine_xrender_x11_context_anti_alias_set(void *data, void *context,
unsigned char aa)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ evas_common_draw_context_set_anti_alias(context, aa);
+}
+
+static unsigned char
+evas_engine_xrender_x11_context_anti_alias_get(void *data, void *context)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ return ((RGBA_Draw_Context *)context)->anti_alias;
+}
+
+static void
+evas_engine_xrender_x11_context_color_interpolation_set(void *data, void
*context, int color_space)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ evas_common_draw_context_set_color_interpolation(context, color_space);
+}
+
+static int
+evas_engine_xrender_x11_context_color_interpolation_get(void *data, void
*context)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ return ((RGBA_Draw_Context *)context)->interpolation.color_space;
+}
@@ -642,14 +699,77 @@
}
static void
-evas_engine_xrender_x11_gradient_draw(void *data, void *context, void
*surface, void *gradient, int x, int y, int w, int h, double angle)
+evas_engine_xrender_x11_gradient_free(void *data, void *gradient)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ _xre_gradient_free((XR_Gradient *)gradient);
+}
+
+static void
+evas_engine_xrender_x11_gradient_fill_set(void *data, void *gradient, int x,
int y, int w, int h)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ _xre_gradient_fill_set((XR_Gradient *)gradient, x, y, w, h);
+}
+
+static void
+evas_engine_xrender_x11_gradient_type_set(void *data, void *gradient, char
*name)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ _xre_gradient_type_set((XR_Gradient *)gradient, name);
+}
+
+static void
+evas_engine_xrender_x11_gradient_type_params_set(void *data, void *gradient,
char *params)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ _xre_gradient_type_params_set((XR_Gradient *)gradient, params);
+}
+
+static void *
+evas_engine_xrender_x11_gradient_geometry_init(void *data, void *gradient, int
spread)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ return _xre_gradient_geometry_init((XR_Gradient *)gradient, spread);
+}
+
+static int
+evas_engine_xrender_x11_gradient_alpha_get(void *data, void *gradient, int
spread)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ return _xre_gradient_alpha_get((XR_Gradient *)gradient, spread);
+}
+
+static void
+evas_engine_xrender_x11_gradient_map(void *data, void *context, void
*gradient, int spread)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ _xre_gradient_map((RGBA_Draw_Context *)context, (XR_Gradient *)gradient,
spread);
+}
+
+static void
+evas_engine_xrender_x11_gradient_draw(void *data, void *context, void
*surface, void *gradient, int x, int y, int w, int h, double angle, int spread)
{
Render_Engine *re;
re = (Render_Engine *)data;
_xre_gradient_draw((Xrender_Surface *)surface,
(RGBA_Draw_Context *)context,
- (XR_Gradient *)gradient, x, y, w, h, angle);
+ (XR_Gradient *)gradient, x, y, w, h, angle, spread);
}
static void *
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_engine.h 16 Oct 2005 09:34:35 -0000 1.5
+++ evas_engine.h 3 Dec 2005 09:27:53 -0000 1.6
@@ -144,10 +144,19 @@
Xrender_Surface *surface;
RGBA_Gradient *grad;
double angle;
+ int spread;
+ unsigned char changed;
};
XR_Gradient *_xre_gradient_color_add(Ximage_Info *xinf, XR_Gradient *gr, int
r, int g, int b, int a, int distance);
XR_Gradient *_xre_gradient_colors_clear(XR_Gradient *gr);
-void _xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc,
XR_Gradient *gr, int x, int y, int w, int h, double angle);
+void _xre_gradient_free(XR_Gradient *gr);
+void _xre_gradient_fill_set(XR_Gradient *gr, int x, int y, int w, int
h);
+void _xre_gradient_type_set(XR_Gradient *gr, char *name);
+void _xre_gradient_type_params_set(XR_Gradient *gr, char *params);
+void *_xre_gradient_geometry_init(XR_Gradient *gr, int spread);
+int _xre_gradient_alpha_get(XR_Gradient *gr, int spread);
+void _xre_gradient_map(RGBA_Draw_Context *dc, XR_Gradient *gr, int
spread);
+void _xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc,
XR_Gradient *gr, int x, int y, int w, int h, double angle, int spread);
#endif
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine_gradient.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine_gradient.c 26 Oct 2005 20:32:27 -0000 1.3
+++ evas_engine_gradient.c 3 Dec 2005 09:27:53 -0000 1.4
@@ -28,6 +28,7 @@
_xr_render_surface_free(gr->surface);
gr->surface = NULL;
}
+ gr->changed = 1;
return gr;
}
@@ -35,6 +36,20 @@
_xre_gradient_colors_clear(XR_Gradient *gr)
{
if (!gr) return NULL;
+ evas_common_gradient_colors_clear(gr->grad);
+ if (gr->surface)
+ {
+ _xr_render_surface_free(gr->surface);
+ gr->surface = NULL;
+ }
+ gr->changed = 1;
+ return gr;
+}
+
+void
+_xre_gradient_free(XR_Gradient *gr)
+{
+ if (!gr) return;
if (gr->grad)
{
evas_common_gradient_free(gr->grad);
@@ -47,17 +62,64 @@
}
_xr_image_info_free(gr->xinf);
free(gr);
- return NULL;
}
void
-_xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, XR_Gradient
*gr, int x, int y, int w, int h, double angle)
+_xre_gradient_fill_set(XR_Gradient *gr, int x, int y, int w, int h)
+{
+ if (!gr) return;
+ evas_common_gradient_fill_set(gr->grad, x, y, w, h);
+ gr->changed = 1;
+}
+
+void
+_xre_gradient_type_set(XR_Gradient *gr, char *name)
+{
+ if (!gr) return;
+ evas_common_gradient_type_set(gr->grad, name);
+ gr->changed = 1;
+}
+
+void
+_xre_gradient_type_params_set(XR_Gradient *gr, char *params)
+{
+ if (!gr) return;
+ evas_common_gradient_type_params_set(gr->grad, params);
+ gr->changed = 1;
+}
+
+void *
+_xre_gradient_geometry_init(XR_Gradient *gr, int spread)
+{
+ if (!gr) return NULL;
+ gr->grad = evas_common_gradient_geometry_init(gr->grad, spread);
+ return gr;
+}
+
+int
+_xre_gradient_alpha_get(XR_Gradient *gr, int spread)
+{
+ if (!gr) return 0;
+ return evas_common_gradient_has_alpha(gr->grad, spread);
+}
+
+void
+_xre_gradient_map(RGBA_Draw_Context *dc, XR_Gradient *gr, int spread)
+{
+ if (!gr) return;
+ evas_common_gradient_map(dc, gr->grad, spread);
+ evas_common_cpu_end_opt();
+ gr->changed = 1;
+}
+
+void
+_xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, XR_Gradient
*gr, int x, int y, int w, int h, double angle, int spread)
{
RGBA_Image *im;
if ((w <= 0) || (h <= 0)) return;
- if (angle != gr->angle)
+ if ((angle != gr->angle) || (spread != gr->spread) || (gr->changed))
{
if (gr->surface)
{
@@ -67,7 +129,7 @@
}
if (!gr->surface)
{
- im = evas_common_image_create(256, 256);
+ im = evas_common_image_create(w, h);
if (im)
{
RGBA_Draw_Context *dc2;
@@ -77,16 +139,20 @@
{
im->flags |= RGBA_IMAGE_HAS_ALPHA;
memset(im->image->data, 0, im->image->w * im->image->h *
sizeof(DATA32));
- evas_common_gradient_draw(im, dc2, 0, 0, 256, 256, gr->grad,
angle);
- gr->surface = _xr_render_surface_new(gr->xinf, 256, 256,
gr->xinf->fmt32, 1);
+ dc2->anti_alias = dc->anti_alias;
+ dc2->interpolation.color_space =
dc->interpolation.color_space;
+ evas_common_gradient_draw(im, dc2, 0, 0, w, h, gr->grad,
angle, spread);
+ gr->surface = _xr_render_surface_new(gr->xinf, w, h,
gr->xinf->fmt32, 1);
if (gr->surface)
- _xr_render_surface_argb_pixels_fill(gr->surface, 256, 256,
im->image->data, 0, 0, 256, 256);
+ _xr_render_surface_argb_pixels_fill(gr->surface, w, h,
im->image->data, 0, 0, w, h);
evas_common_draw_context_free(dc2);
gr->angle = angle;
+ gr->spread = spread;
}
evas_common_image_free(im);
}
}
if (gr->surface)
_xr_render_surface_composite(gr->surface, rs, dc, 0, 0, gr->surface->w,
gr->surface->h, x, y, w, h, 1);
+ gr->changed = 0;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_engine_xrender.c 9 Oct 2005 03:07:44 -0000 1.9
+++ evas_engine_xrender.c 3 Dec 2005 09:27:53 -0000 1.10
@@ -143,12 +143,22 @@
sple = sp + w;
while (sp < sple)
{
- a = A_VAL(sp);
- aa = a + 1;
- r = ((R_VAL(sp)) * aa) >> 8;
- g = ((G_VAL(sp)) * aa) >> 8;
- b = ((B_VAL(sp)) * aa) >> 8;
- *p = (b << 24) | (g << 16) | (r << 8) | a;
+ switch (a = A_VAL(sp))
+ {
+ case 0:
+ *p = 0;
+ break;
+ case 255:
+ *p = (B_VAL(sp) << 24) | (G_VAL(sp) << 16) | (R_VAL(sp)
<< 8) | 0xff;
+ break;
+ default:
+ aa = a + 1;
+ r = ((R_VAL(sp)) * aa) >> 8;
+ g = ((G_VAL(sp)) * aa) >> 8;
+ b = ((B_VAL(sp)) * aa) >> 8;
+ *p = (b << 24) | (g << 16) | (r << 8) | a;
+ break;
+ }
p++;
sp++;
}
@@ -163,12 +173,22 @@
sple = sp + w;
while (sp < sple)
{
- a = A_VAL(sp);
- aa = a + 1;
- r = ((R_VAL(sp)) * aa) >> 8;
- g = ((G_VAL(sp)) * aa) >> 8;
- b = ((B_VAL(sp)) * aa) >> 8;
- *p = (a << 24) | (r << 16) | (g << 8) | b;
+ switch (a = A_VAL(sp))
+ {
+ case 0:
+ *p = 0;
+ break;
+ case 255:
+ *p = *sp;
+ break;
+ default:
+ aa = a + 1;
+ r = ((R_VAL(sp)) * aa) >> 8;
+ g = ((G_VAL(sp)) * aa) >> 8;
+ b = ((B_VAL(sp)) * aa) >> 8;
+ *p = (a << 24) | (r << 16) | (g << 8) | b;
+ break;
+ }
p++;
sp++;
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
