From bce5edacbdd1171485b859b0b4041c5b1bcc1ae1 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 12 Sep 2006 00:03:53 +0000 Subject: [PATCH] #ifdef the 1 bit transform stuff. SVN revision: 25756 --- .../modules/engines/xrender_x11/evas_engine_xrender.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c index b5de2239ee..2d2e89f38f 100644 --- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c +++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c @@ -8,6 +8,12 @@ #include "Evas_Engine_XRender_X11.h" #include +/* this is a work around broken xrender - when/if this ever gets fixed in xorg + * we can comment this out and one day remove it - for now keep it until such + * a fix is spotted in the wild + */ +#define BROKEN_XORG_XRENDER 1 + Xrender_Surface * _xr_render_surface_new(Ximage_Info *xinf, int w, int h, XRenderPictFormat *fmt, int alpha) { @@ -492,6 +498,7 @@ _xr_render_surface_copy(Xrender_Surface *srs, Xrender_Surface *drs, int sx, int if ((w <= 0) || (h <= 0) || (!srs) || (!drs)) return; +#ifdef BROKEN_XORG_XRENDER /* FIXME: why do we need to change the identity matrix ifthe src surface * is 1 bit deep? */ @@ -501,7 +508,7 @@ _xr_render_surface_copy(Xrender_Surface *srs, Xrender_Surface *drs, int sx, int xf.matrix[0][0] = xf.matrix[1][1] = xf.matrix[2][2] = 1; XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf); } - +#endif att.clip_mask = None; XRenderChangePicture(srs->xinf->disp, srs->pic, CPClipMask, &att);