frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Break image_from_pict() into a few subfunctions.

This commit is contained in:
Soren Sandmann Pedersen 2007-05-18 11:33:11 -04:00
parent c5ef84c325
commit a2e3614eb8
1 changed files with 193 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
fb/fbpict.c
View File

@ -931,41 +931,8 @@ fbCompositeSrcSrc_nxn (CARD8 op,
fbFinishAccess(pDst->pDrawable); fbFinishAccess(pDst->pDrawable);
} }
/*
* Solid fill
void
fbCompositeSolidSrc_nxn (CARD8 op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
INT16 xSrc,
INT16 ySrc,
INT16 xMask,
INT16 yMask,
INT16 xDst,
INT16 yDst,
CARD16 width,
CARD16 height)
{
}
*/
#define SCANLINE_BUFFER_LENGTH 2048
static pixman_image_t * static pixman_image_t *
image_from_pict (PicturePtr pict) create_solid_fill_image (PicturePtr pict)
{
pixman_image_t *result = NULL;
if (!pict)
return NULL;
if (pict->pSourcePict)
{
SourcePictPtr sp = pict->pSourcePict;
if (sp->type == SourcePictTypeSolidFill)
{ {
PictSolidFill *solid = &pict->pSourcePict->solidFill; PictSolidFill *solid = &pict->pSourcePict->solidFill;
pixman_color_t color; pixman_color_t color;
@ -981,15 +948,13 @@ image_from_pict (PicturePtr pict)
color.green = (g << 8) | g; color.green = (g << 8) | g;
color.blue = (b << 8) | b; color.blue = (b << 8) | b;
result = pixman_image_create_solid_fill (&color); return pixman_image_create_solid_fill (&color);
} }
else
{
PictGradient *gradient = &pict->pSourcePict->gradient;
if (sp->type == SourcePictTypeLinear) static pixman_image_t *
create_linear_gradient_image (PictGradient *gradient)
{ {
PictLinearGradient *linear = &pict->pSourcePict->linear; PictLinearGradient *linear = (PictLinearGradient *)gradient;
pixman_point_fixed_t p1; pixman_point_fixed_t p1;
pixman_point_fixed_t p2; pixman_point_fixed_t p2;
@ -998,13 +963,14 @@ image_from_pict (PicturePtr pict)
p2.x = linear->p2.x; p2.x = linear->p2.x;
p2.y = linear->p2.y; p2.y = linear->p2.y;
result = pixman_image_create_linear_gradient ( return pixman_image_create_linear_gradient (
&p1, &p2, (pixman_gradient_stop_t *)gradient->stops, gradient->nstops); &p1, &p2, (pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
} }
else if (sp->type == SourcePictTypeRadial)
{
PictRadialGradient *radial = &pict->pSourcePict->radial;
static pixman_image_t *
create_radial_gradient_image (PictGradient *gradient)
{
PictRadialGradient *radial = (PictRadialGradient *)gradient;
pixman_point_fixed_t c1; pixman_point_fixed_t c1;
pixman_point_fixed_t c2; pixman_point_fixed_t c2;
@ -1013,41 +979,39 @@ image_from_pict (PicturePtr pict)
c2.x = radial->c2.x; c2.x = radial->c2.x;
c2.y = radial->c2.y; c2.y = radial->c2.y;
result = pixman_image_create_radial_gradient ( return pixman_image_create_radial_gradient (
&c1, &c2, radial->c1.radius, &c1, &c2, radial->c1.radius,
radial->c2.radius, radial->c2.radius,
(pixman_gradient_stop_t *)gradient->stops, gradient->nstops); (pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
} }
else if (sp->type == SourcePictTypeConical)
static pixman_image_t *
create_conical_gradient_image (PictGradient *gradient)
{ {
PictConicalGradient *conical = &pict->pSourcePict->conical; PictConicalGradient *conical = (PictConicalGradient *)gradient;
pixman_point_fixed_t center; pixman_point_fixed_t center;
center.x = conical->center.x; center.x = conical->center.x;
center.y = conical->center.y; center.y = conical->center.y;
result = pixman_image_create_conical_gradient ( return pixman_image_create_conical_gradient (
&center, conical->angle, (pixman_gradient_stop_t *)gradient->stops, &center, conical->angle, (pixman_gradient_stop_t *)gradient->stops,
gradient->nstops); gradient->nstops);
} }
else
{ static pixman_image_t *
/* Shouldn't happen */ create_bits_picture (PicturePtr pict)
result = NULL;
}
}
}
else if (pict->pDrawable)
{ {
FbBits *bits; FbBits *bits;
FbStride stride; FbStride stride;
int bpp, xoff, yoff; int bpp, xoff, yoff;
pixman_image_t *image;
fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff); fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
bits += yoff * stride + xoff; bits += yoff * stride + xoff;
result = pixman_image_create_bits ( image = pixman_image_create_bits (
pict->format, pict->format,
pict->pDrawable->width, pict->pDrawable->height, pict->pDrawable->width, pict->pDrawable->height,
(uint32_t *)bits, stride * sizeof (FbStride)); (uint32_t *)bits, stride * sizeof (FbStride));
@ -1056,13 +1020,13 @@ image_from_pict (PicturePtr pict)
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
#if FB_SHIFT==5 #if FB_SHIFT==5
pixman_image_set_accessors ( pixman_image_set_accessors (image,
result,
(pixman_read_memory_func_t)wfbReadMemory, (pixman_read_memory_func_t)wfbReadMemory,
(pixman_write_memory_func_t)wfbWriteMemory); (pixman_write_memory_func_t)wfbWriteMemory);
#else #else
#error The pixman library only works with sizeof (FbBits) == 5 #error The pixman library only works when FbBits is 32 bits wide
#endif #endif
#endif #endif
@ -1070,13 +1034,17 @@ image_from_pict (PicturePtr pict)
/* pCompositeClip is undefined for source pictures, so /* pCompositeClip is undefined for source pictures, so
* only set the clip region for pictures with drawables * only set the clip region for pictures with drawables
*/ */
pixman_image_set_clip_region ( pixman_image_set_clip_region (image, pict->pCompositeClip);
result, pict->pCompositeClip);
fbFinishAccess (pict->pDrawable); fbFinishAccess (pict->pDrawable);
return image;
} }
if (result) static pixman_image_t *image_from_pict (PicturePtr pict);
static void
set_image_properties (pixman_image_t *image, PicturePtr pict)
{ {
pixman_repeat_t repeat; pixman_repeat_t repeat;
pixman_filter_t filter; pixman_filter_t filter;
@ -1084,7 +1052,7 @@ image_from_pict (PicturePtr pict)
if (pict->transform) if (pict->transform)
{ {
pixman_image_set_transform ( pixman_image_set_transform (
result, (pixman_transform_t *)pict->transform); image, (pixman_transform_t *)pict->transform);
} }
switch (pict->repeatType) switch (pict->repeatType)
@ -1107,19 +1075,19 @@ image_from_pict (PicturePtr pict)
break; break;
} }
pixman_image_set_repeat (result, repeat); pixman_image_set_repeat (image, repeat);
if (pict->alphaMap) if (pict->alphaMap)
{ {
pixman_image_t *alpha_map = image_from_pict (pict->alphaMap); pixman_image_t *alpha_map = image_from_pict (pict->alphaMap);
pixman_image_set_alpha_map ( pixman_image_set_alpha_map (
result, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y); image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
pixman_image_unref (alpha_map); pixman_image_unref (alpha_map);
} }
pixman_image_set_component_alpha (result, pict->componentAlpha); pixman_image_set_component_alpha (image, pict->componentAlpha);
switch (pict->filter) switch (pict->filter)
{ {
@ -1139,10 +1107,46 @@ image_from_pict (PicturePtr pict)
break; break;
} }
pixman_image_set_filter (result, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams); pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);
} }
return result; static pixman_image_t *
image_from_pict (PicturePtr pict)
{
pixman_image_t *image = NULL;
if (!pict)
return NULL;
if (pict->pDrawable)
{
image = create_bits_picture (pict);
}
else if (pict->pSourcePict)
{
SourcePict *sp = pict->pSourcePict;
if (sp->type == SourcePictTypeSolidFill)
{
image = create_solid_fill_image (pict);
}
else
{
PictGradient *gradient = &pict->pSourcePict->gradient;
if (sp->type == SourcePictTypeLinear)
image = create_linear_gradient_image (gradient);
else if (sp->type == SourcePictTypeRadial)
image = create_radial_gradient_image (gradient);
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image (gradient);
}
}
if (image)
set_image_properties (image, pict);
return image;
} }
static void static void
@ -1180,6 +1184,8 @@ out:
} }
#if 0 #if 0
#define SCANLINE_BUFFER_LENGTH 2048
static void static void
oldfbCompositeRectWrapper (CARD8 op, oldfbCompositeRectWrapper (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,