RrPixel32 *data = a->surface.pixel_data;
RrPixel32 current;
guint r,g,b;
- gint off, x;
+ register gint off, x;
switch (a->surface.grad) {
case RR_SURFACE_PARENTREL:
static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised)
{
- gint r, g, b;
+ register gint r, g, b;
RrPixel32 *up, *down;
if (raised) {
static void create_bevel_colors(RrAppearance *l)
{
- gint r, g, b;
+ register gint r, g, b;
/* light color */
r = l->surface.primary->r;
*/
static inline void repeat_pixel(RrPixel32 *start, gint w)
{
- gint x;
+ register gint x;
RrPixel32 *dest;
dest = start + 1;
static void gradient_parentrelative(RrAppearance *a, gint w, gint h)
{
RrPixel32 *source, *dest;
- gint sw, sh, partial_w, partial_h, i;
+ gint sw, sh, partial_w, partial_h;
+ register gint i;
g_assert (a->surface.parent);
g_assert (a->surface.parent->w);
static void gradient_solid(RrAppearance *l, gint w, gint h)
{
- gint i;
+ register gint i;
RrPixel32 pix;
RrPixel32 *data = l->surface.pixel_data;
RrSurface *sp = &l->surface;
/* * * * * * * * * * * * * * GRADIENT MAGIC WOOT * * * * * * * * * * * * * * */
-#define VARS(x) \
- guint color##x[3]; \
- gint len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
+#define VARS(x) \
+ register gint len##x; \
+ guint color##x[3]; \
+ gint cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
gboolean bigslope##x[3] /* color slope > 1 */
#define SETUP(x, from, to, w) \
#define NEXT(x) \
{ \
- gint i; \
+ register gint i; \
for (i = 2; i >= 0; --i) { \
if (!cdelta##x[i]) continue; \
\
static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
{
- gint y1, y2, y3;
+ register gint y1, y2, y3;
RrSurface *sf = &a->surface;
RrPixel32 *data;
- gint y1sz, y2sz, y3sz;
+ register gint y1sz, y2sz, y3sz;
VARS(y1);
VARS(y2);
static void gradient_horizontal(RrSurface *sf, gint w, gint h)
{
- gint x, y, cpbytes;
+ register gint x, y, cpbytes;
RrPixel32 *data = sf->pixel_data, *datav;
gchar *datac;
static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
{
- gint x, y, half1, half2, cpbytes;
+ register gint x, y, half1, half2, cpbytes;
RrPixel32 *data = sf->pixel_data, *datav;
gchar *datac;
static void gradient_vertical(RrSurface *sf, gint w, gint h)
{
- gint y;
+ register gint y;
RrPixel32 *data;
VARS(y);
}
}
-
static void gradient_diagonal(RrSurface *sf, gint w, gint h)
{
- gint x, y;
+ register gint x, y;
RrPixel32 *data = sf->pixel_data;
RrColor left, right;
RrColor extracorner;
static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h)
{
- gint x, y;
+ register gint x, y;
RrPixel32 *data = sf->pixel_data;
RrColor left, right;
RrColor extracorner;
*data = COLOR(x);
}
-static void gradient_pyramid(RrSurface *sf, gint inw, gint inh)
+static void gradient_pyramid(RrSurface *sf, gint w, gint h)
{
- gint x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
- RrPixel32 *data = sf->pixel_data;
- RrPixel32 *end = data + inw*inh - 1;
- RrPixel32 current;
+ RrPixel32 *ldata, *rdata;
+ RrPixel32 *cp;
RrColor left, right;
RrColor extracorner;
+ register gint x, y, halfw, halfh, midx, midy;
VARS(lefty);
VARS(righty);
extracorner.g = (sf->primary->g + sf->secondary->g) / 2;
extracorner.b = (sf->primary->b + sf->secondary->b) / 2;
- SETUP(lefty, (&extracorner), sf->secondary, h);
- SETUP(righty, sf->primary, (&extracorner), h);
+ halfw = w >> 1;
+ halfh = h >> 1;
+ midx = w - halfw - halfw; /* 0 or 1, depending if w is even or odd */
+ midy = h - halfh - halfh; /* 0 or 1, depending if h is even or odd */
+
+ SETUP(lefty, sf->primary, (&extracorner), halfh + midy);
+ SETUP(righty, (&extracorner), sf->secondary, halfh + midy);
+
+ /* draw the top half
+
+ it is faster to draw both top quarters together than to draw one and
+ then copy it over to the other side.
+ */
+
+ ldata = sf->pixel_data;
+ rdata = ldata + w - 1;
+ for (y = halfh + midy; y > 0; --y) { /* 0 -> (h+1)/2 */
+ RrPixel32 c;
- for (y = h - 1; y > 0; --y) { /* 0 -> h-1 */
COLOR_RR(lefty, (&left));
COLOR_RR(righty, (&right));
- SETUP(x, (&left), (&right), w);
+ SETUP(x, (&left), (&right), halfw + midx);
- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */
- current = COLOR(x);
- *(data+x) = current;
- *(data+inw-x) = current;
- *(end-x) = current;
- *(end-(inw-x)) = current;
+ for (x = halfw + midx - 1; x > 0; --x) { /* 0 -> (w+1)/2 */
+ c = COLOR(x);
+ *(ldata++) = *(rdata--) = c;
NEXT(x);
}
- current = COLOR(x);
- *(data+x) = current;
- *(data+inw-x) = current;
- *(end-x) = current;
- *(end-(inw-x)) = current;
-
- data+=inw;
- end-=inw;
+ c = COLOR(x);
+ *ldata = *rdata = c;
+ ldata += halfw + 1;
+ rdata += halfw - 1 + midx + w;
NEXT(lefty);
NEXT(righty);
}
- COLOR_RR(lefty, (&left));
- COLOR_RR(righty, (&right));
- SETUP(x, (&left), (&right), w);
+ /* copy the top half into the bottom half, mirroring it, so we can only
+ copy one row at a time
- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */
- current = COLOR(x);
- *(data+x) = current;
- *(data+inw-x) = current;
- *(end-x) = current;
- *(end-(inw-x)) = current;
+ it is faster, to move the writing pointer forward, and the reading
+ pointer backward
- NEXT(x);
+ this is the current code, moving the write pointer forward and read
+ pointer backward
+ 41.78 4.26 1.78 504 3.53 3.53 gradient_pyramid2
+ this is the opposite, moving the read pointer forward and the write
+ pointer backward
+ 42.27 4.40 1.86 504 3.69 3.69 gradient_pyramid2
+
+ */
+ ldata = sf->pixel_data + (halfh - 1) * w;
+ cp = ldata + (midy + 1) * w;
+ for (y = halfh; y > 0; --y) {
+ memcpy(cp, ldata, w * sizeof(RrPixel32));
+ ldata -= w;
+ cp += w;
}
- current = COLOR(x);
- *(data+x) = current;
- *(data+inw-x) = current;
- *(end-x) = current;
- *(end-(inw-x)) = current;
}
-
projects / chaz / openbox / blobdiff