Revert "Optimize out computing a gradient pixel if the mask value is 0."

This reverts cf46242e337481cd3b9b39d77dd621d2a63b11f9 commit.  It wasn't meant
to be pushed to master yet, and doesn't work.

1 files changed, 76 insertions, 131 deletions

diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 7e17a0184..3a61e975a 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -2635,8 +2635,7 @@ FbComposeFunctions composeFunctions = {
 };
 
 
-static void fbFetchSolid(PicturePtr pict, int x, int y, int width,
-			 CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
+static void fbFetchSolid(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
 {
     FbBits *bits;
     FbStride stride;
@@ -2657,8 +2656,7 @@ static void fbFetchSolid(PicturePtr pict, int x, int y, int width,
         *buffer++ = color;
 }
 
-static void fbFetch(PicturePtr pict, int x, int y, int width, CARD32 *buffer,
-		    CARD32 *mask, CARD32 maskBits)
+static void fbFetch(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
 {
     FbBits *bits;
     FbStride stride;
@@ -2713,8 +2711,7 @@ static CARD32 gradientPixel(const SourcePictPtr pGradient, xFixed_48_16 pos, uns
     return pGradient->linear.colorTable[ipos];
 }
 
-static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
-			      CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
+static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
 {
     SourcePictPtr pGradient = pict->pSourcePict;
     CARD32 *end = buffer + width;
@@ -2764,30 +2761,22 @@ static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
                 inc = (a * unit.vector[0] + b * unit.vector[1]) >> 16;
             }
             while (buffer < end) {
-		if (mask == NULL || (*mask++ & maskBits) != 0) {
-		    *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
-		} else {
-		    *buffer++ = 0; /* Set it to a value for valgrind */
-		}
+                *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
                 t += inc;
             }
         } else {
             /* projective transformation */
             while (buffer < end) {
-		if (mask == NULL || (*mask++ & maskBits) != 0) {
-		    xFixed_48_16 t;
-		    if (v.vector[2] == 0) {
-			t = 0;
-		    } else {
-			xFixed_48_16 x, y;
-			x = ((xFixed_48_16)v.vector[0] << 16) / v.vector[2];
-			y = ((xFixed_48_16)v.vector[1] << 16) / v.vector[2];
-			t = ((a*x + b*y) >> 16) + off;
-		    }
-		    *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
-		} else {
-		    *buffer++ = 0; /* Set it to a value for valgrind */
-		}
+                xFixed_48_16 t;
+                if (v.vector[2] == 0) {
+                    t = 0;
+                } else {
+                    xFixed_48_16 x, y;
+                    x = ((xFixed_48_16)v.vector[0] << 16) / v.vector[2];
+                    y = ((xFixed_48_16)v.vector[1] << 16) / v.vector[2];
+                    t = ((a*x + b*y) >> 16) + off;
+                }
+                *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
                 v.vector[0] += unit.vector[0];
                 v.vector[1] += unit.vector[1];
                 v.vector[2] += unit.vector[2];
@@ -2827,45 +2816,37 @@ static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
                 ry -= pGradient->radial.fy;
 
                 while (buffer < end) {
-		    if (mask == NULL || (*mask++ & maskBits) != 0) {
-			double b = 2*(rx*pGradient->radial.dx + ry*pGradient->radial.dy);
-			double c = -(rx*rx + ry*ry);
-			double det = (b * b) - (4 * pGradient->radial.a * c);
-			double s = (-b + sqrt(det))/(2. * pGradient->radial.a);
-			*buffer++ = gradientPixel(pGradient,
-				(xFixed_48_16)((s * pGradient->radial.m +
-						pGradient->radial.b) * 65536),
-				pict->repeatType);
-		    } else {
-			*buffer++ = 0;
-		    }
+                    double b = 2*(rx*pGradient->radial.dx + ry*pGradient->radial.dy);
+                    double c = -(rx*rx + ry*ry);
+                    double det = (b * b) - (4 * pGradient->radial.a * c);
+                    double s = (-b + sqrt(det))/(2. * pGradient->radial.a);
+                    *buffer = gradientPixel(pGradient,
+                                            (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
+                                            pict->repeatType);
+                    ++buffer;
                     rx += cx;
                     ry += cy;
                 }
             } else {
                 while (buffer < end) {
-		    if (mask == NULL || (*mask++ & maskBits) != 0) {
-			double x, y;
-			double b, c, det, s;
-			if (rz != 0) {
-			    x = rx/rz;
-			    y = ry/rz;
-			} else {
-			    x = y = 0.;
-			}
-			x -= pGradient->radial.fx;
-			y -= pGradient->radial.fy;
-			b = 2*(x*pGradient->radial.dx + y*pGradient->radial.dy);
-			c = -(x*x + y*y);
-			det = (b * b) - (4 * pGradient->radial.a * c);
-			s = (-b + sqrt(det))/(2. * pGradient->radial.a);
-			*buffer++ = gradientPixel(pGradient,
-			    (xFixed_48_16)((s * pGradient->radial.m +
-					   pGradient->radial.b) * 65536),
-			    pict->repeatType);
-		    } else {
-			*buffer++ = 0;
-		    }
+                    double x, y;
+                    double b, c, det, s;
+                    if (rz != 0) {
+                        x = rx/rz;
+                        y = ry/rz;
+                    } else {
+                        x = y = 0.;
+                    }
+                    x -= pGradient->radial.fx;
+                    y -= pGradient->radial.fy;
+                    b = 2*(x*pGradient->radial.dx + y*pGradient->radial.dy);
+                    c = -(x*x + y*y);
+                    det = (b * b) - (4 * pGradient->radial.a * c);
+                    s = (-b + sqrt(det))/(2. * pGradient->radial.a);
+                    *buffer = gradientPixel(pGradient,
+                                            (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
+                                            pict->repeatType);
+                    ++buffer;
                     rx += cx;
                     ry += cy;
                     rz += cz;
@@ -2878,37 +2859,29 @@ static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
                 ry -= pGradient->conical.center.y/65536.;
 
                 while (buffer < end) {
-		    if (mask == NULL || (*mask++ & maskBits) != 0) {
-			double angle = atan2(ry, rx) + a;
-			*buffer++ = gradientPixel(pGradient,
-			    (xFixed_48_16) (angle * (65536. / (2*M_PI))),
-					    pict->repeatType);
-		    } else {
-			*buffer++ = 0;
-		    }
+                    double angle = atan2(ry, rx) + a;
+                    *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
+                                            pict->repeatType);
+                    ++buffer;
                     rx += cx;
                     ry += cy;
                 }
             } else {
 
                 while (buffer < end) {
-		    if (mask == NULL || (*mask++ & maskBits) != 0) {
-			double x, y, angle;
-			if (rz != 0) {
-			    x = rx/rz;
-			    y = ry/rz;
-			} else {
-			    x = y = 0.;
-			}
-			x -= pGradient->conical.center.x/65536.;
-			y -= pGradient->conical.center.y/65536.;
-			angle = atan2(y, x) + a;
-			*buffer++ = gradientPixel(pGradient, (xFixed_48_16)
-						  (angle * (65536. / (2*M_PI))),
-						  pict->repeatType);
-		    } else {
-			*buffer++ = 0;
-		    }
+                    double x, y, angle;
+                    if (rz != 0) {
+                        x = rx/rz;
+                        y = ry/rz;
+                    } else {
+                        x = y = 0.;
+                    }
+                    x -= pGradient->conical.center.x/65536.;
+                    y -= pGradient->conical.center.y/65536.;
+                    angle = atan2(y, x) + a;
+                    *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
+                                            pict->repeatType);
+                    ++buffer;
                     rx += cx;
                     ry += cy;
                     rz += cz;
@@ -2920,8 +2893,7 @@ static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
 
 
 
-static void fbFetchTransformed(PicturePtr pict, int x, int y, int width,
-			       CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
+static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
 {
     FbBits     *bits;
     FbStride    stride;
@@ -3385,24 +3357,21 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width,
 }
 
 
-static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width,
-				 CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
+static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
 {
     int i;
     CARD32 _alpha_buffer[SCANLINE_BUFFER_LENGTH];
     CARD32 *alpha_buffer = _alpha_buffer;
 
     if (!pict->alphaMap) {
-        fbFetchTransformed(pict, x, y, width, buffer, mask, maskBits);
+        fbFetchTransformed(pict, x, y, width, buffer);
 	return;
     }
     if (width > SCANLINE_BUFFER_LENGTH)
         alpha_buffer = (CARD32 *) malloc(width*sizeof(CARD32));
 
-    fbFetchTransformed(pict, x, y, width, buffer, mask, maskBits);
-    fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x,
-		       y - pict->alphaOrigin.y, width, alpha_buffer,
-		       mask, maskBits);
+    fbFetchTransformed(pict, x, y, width, buffer);
+    fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x, y - pict->alphaOrigin.y, width, alpha_buffer);
     for (i = 0; i < width; ++i) {
         int a = alpha_buffer[i]>>24;
         buffer[i] = (a << 24)
@@ -3472,8 +3441,7 @@ static void fbStoreExternalAlpha(PicturePtr pict, int x, int y, int width, CARD3
 }
 
 typedef void (*scanStoreProc)(PicturePtr , int , int , int , CARD32 *);
-typedef void (*scanFetchProc)(PicturePtr , int , int , int , CARD32 *,
-			      CARD32 *, CARD32);
+typedef void (*scanFetchProc)(PicturePtr , int , int , int , CARD32 *);
 
 static void
 fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
@@ -3535,16 +3503,12 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
         for (i = 0; i < data->height; ++i)
         {
             /* fill first half of scanline with source */
-            fetchMask(data->mask, data->xMask, data->yMask + i, data->width,
-		      mask_buffer, NULL, 0);
-            fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width,
-		     src_buffer, mask_buffer, 0);
+            fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width, src_buffer);
+            fetchMask(data->mask, data->xMask, data->yMask + i, data->width, mask_buffer);
 
             /* fill dest into second half of scanline */
-            if (fetchDest) {
-                fetchDest(data->dest, data->xDest, data->yDest + i, data->width,
-			  dest_buffer, NULL, 0);
-	    }
+            if (fetchDest)
+                fetchDest(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
 
             /* blend */
             compose(dest_buffer, src_buffer, mask_buffer, data->width);
@@ -3553,27 +3517,17 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
             store(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
         }
     } else {
-	CARD32 *mask_buffer;
+
         CombineFuncU compose = composeFunctions.combineU[data->op];
         if (!compose)
             return;
 
-	if (fetchMask)
-	    mask_buffer = dest_buffer + data->width;
-	else
-	    mask_buffer = NULL;
-
         if (fetchSrc == fbFetchSolid && (!fetchMask || fetchMask == fbFetchSolid)) {
+            fetchSrc(data->src, data->xSrc, data->ySrc, data->width, src_buffer);
             if (fetchMask) {
-                fetchMask(data->mask, data->xMask, data->yMask, data->width,
-			  dest_buffer, NULL, 0);
+                fetchMask(data->mask, data->xMask, data->yMask, data->width, dest_buffer);
+                composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
             }
-            fetchSrc(data->src, data->xSrc, data->ySrc, data->width,
-		     src_buffer, mask_buffer, 0xff000000);
-	    if (mask_buffer != NULL) {
-		composeFunctions.combineMaskU(src_buffer, dest_buffer,
-					      data->width);
-	    }
             fetchSrc = NULL;
             fetchMask = NULL;
         }
@@ -3582,27 +3536,18 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
         {
             /* fill first half of scanline with source */
             if (fetchSrc) {
-		/* Fetch mask before source so that fetching of source can be
-		 * optimized out if possible.
-		 */
-                if (fetchMask) {
-                    fetchMask(data->mask, data->xMask, data->yMask + i,
-			      data->width, dest_buffer, NULL, 0);
-		}
-                fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width,
-			 src_buffer, mask_buffer, 0xff000000);
+                fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width, src_buffer);
 
                 /* add in mask */
-                if (mask_buffer != NULL) {
+                if (fetchMask) {
+                    fetchMask(data->mask, data->xMask, data->yMask + i, data->width, dest_buffer);
                     composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
                 }
             }
 
             /* fill dest into second half of scanline */
-            if (fetchDest != NULL) {
-                fetchDest(data->dest, data->xDest, data->yDest + i, data->width,
-			  dest_buffer, NULL, 0);
-	    }
+            if (fetchDest)
+                fetchDest(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
 
             /* blend */
             compose(dest_buffer, src_buffer, data->width);