2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
*
|
2004-12-04 01:43:13 +01:00
|
|
|
* Copyright © 2000 SuSE, Inc.
|
2007-05-18 03:31:08 +02:00
|
|
|
* Copyright © 2007 Red Hat, Inc.
|
2003-11-14 17:48:57 +01:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that
|
|
|
|
* copyright notice and this permission notice appear in supporting
|
|
|
|
* documentation, and that the name of SuSE not be used in advertising or
|
|
|
|
* publicity pertaining to distribution of the software without specific,
|
|
|
|
* written prior permission. SuSE makes no representations about the
|
|
|
|
* suitability of this software for any purpose. It is provided "as is"
|
|
|
|
* without express or implied warranty.
|
|
|
|
*
|
|
|
|
* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
|
|
|
|
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
2005-06-13 16:40:25 +02:00
|
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
2003-11-14 17:48:57 +01:00
|
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
* Author: Keith Packard, SuSE, Inc.
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2006-02-10 23:00:30 +01:00
|
|
|
#include <string.h>
|
|
|
|
|
2003-11-14 17:48:57 +01:00
|
|
|
#include "fb.h"
|
|
|
|
|
|
|
|
#include "picturestr.h"
|
|
|
|
#include "mipict.h"
|
|
|
|
#include "fbpict.h"
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
fbComposite (CARD8 op,
|
|
|
|
PicturePtr pSrc,
|
|
|
|
PicturePtr pMask,
|
|
|
|
PicturePtr pDst,
|
|
|
|
INT16 xSrc,
|
|
|
|
INT16 ySrc,
|
|
|
|
INT16 xMask,
|
|
|
|
INT16 yMask,
|
|
|
|
INT16 xDst,
|
|
|
|
INT16 yDst,
|
|
|
|
CARD16 width,
|
|
|
|
CARD16 height)
|
|
|
|
{
|
2007-05-22 02:00:25 +02:00
|
|
|
pixman_image_t *src, *mask, *dest;
|
2009-12-02 17:37:20 +01:00
|
|
|
int src_xoff, src_yoff;
|
|
|
|
int msk_xoff, msk_yoff;
|
|
|
|
int dst_xoff, dst_yoff;
|
2007-04-25 18:34:19 +02:00
|
|
|
|
Remove geometry arguments from miSourceValidate()
The only user of the geometry coordinates is the software sprite code,
which uses them to remove the pointer whenever the window beneath is
being used as a source. However, using Window pictures as a source is
extremely rare (let alone *partial* windows), so there is no harm done
in just validating all of the drawable.
Additionally, the miSourceValidate() function was buggy in at least
three respects:
(a) It added drawable->{x,y} before calling down, which is wrong since
the misprite code already adds them in its check. (Alternatively,
the misprite code is wrong, but there are actual users who would
notice if that code was broken).
(b) It didn't account for the width of the interpolation filter, so if
the Picture had a bilinear or convolution filter, the edges
surrounding the source area would not be validated.
(c) It didn't validate alpha maps.
Finally, computing the bounding box of the transform on every
composite request was a real performance issue in pixman, so
presumably it could be one here as well.
This patch changes miSourceValidate() to simply validate all of the
underlying drawable.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
2011-03-09 19:57:25 +01:00
|
|
|
miCompositeSourceValidate (pSrc);
|
2007-06-11 15:16:46 +02:00
|
|
|
if (pMask)
|
Remove geometry arguments from miSourceValidate()
The only user of the geometry coordinates is the software sprite code,
which uses them to remove the pointer whenever the window beneath is
being used as a source. However, using Window pictures as a source is
extremely rare (let alone *partial* windows), so there is no harm done
in just validating all of the drawable.
Additionally, the miSourceValidate() function was buggy in at least
three respects:
(a) It added drawable->{x,y} before calling down, which is wrong since
the misprite code already adds them in its check. (Alternatively,
the misprite code is wrong, but there are actual users who would
notice if that code was broken).
(b) It didn't account for the width of the interpolation filter, so if
the Picture had a bilinear or convolution filter, the edges
surrounding the source area would not be validated.
(c) It didn't validate alpha maps.
Finally, computing the bounding box of the transform on every
composite request was a real performance issue in pixman, so
presumably it could be one here as well.
This patch changes miSourceValidate() to simply validate all of the
underlying drawable.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
2011-03-09 19:57:25 +01:00
|
|
|
miCompositeSourceValidate (pMask);
|
2007-06-11 15:16:46 +02:00
|
|
|
|
2009-12-02 17:37:20 +01:00
|
|
|
src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
|
|
|
|
mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
|
|
|
|
dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
|
2005-05-09 01:34:15 +02:00
|
|
|
|
2007-05-22 02:00:25 +02:00
|
|
|
if (src && dest && !(pMask && !mask))
|
|
|
|
{
|
|
|
|
pixman_image_composite (op, src, mask, dest,
|
2009-12-02 17:37:20 +01:00
|
|
|
xSrc + src_xoff, ySrc + src_yoff,
|
|
|
|
xMask + msk_xoff, yMask + msk_yoff,
|
|
|
|
xDst + dst_xoff, yDst + dst_yoff,
|
2007-06-11 15:16:46 +02:00
|
|
|
width, height);
|
2005-05-09 01:34:15 +02:00
|
|
|
}
|
2007-08-01 23:30:03 +02:00
|
|
|
|
|
|
|
free_pixman_pict (pSrc, src);
|
|
|
|
free_pixman_pict (pMask, mask);
|
|
|
|
free_pixman_pict (pDst, dest);
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
create_solid_fill_image (PicturePtr pict)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2007-06-11 15:16:46 +02:00
|
|
|
PictSolidFill *solid = &pict->pSourcePict->solidFill;
|
|
|
|
pixman_color_t color;
|
|
|
|
CARD32 a, r, g, b;
|
|
|
|
|
|
|
|
a = (solid->color & 0xff000000) >> 24;
|
|
|
|
r = (solid->color & 0x00ff0000) >> 16;
|
|
|
|
g = (solid->color & 0x0000ff00) >> 8;
|
|
|
|
b = (solid->color & 0x000000ff) >> 0;
|
|
|
|
|
|
|
|
color.alpha = (a << 8) | a;
|
|
|
|
color.red = (r << 8) | r;
|
|
|
|
color.green = (g << 8) | g;
|
|
|
|
color.blue = (b << 8) | b;
|
|
|
|
|
|
|
|
return pixman_image_create_solid_fill (&color);
|
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
create_linear_gradient_image (PictGradient *gradient)
|
|
|
|
{
|
|
|
|
PictLinearGradient *linear = (PictLinearGradient *)gradient;
|
|
|
|
pixman_point_fixed_t p1;
|
|
|
|
pixman_point_fixed_t p2;
|
|
|
|
|
|
|
|
p1.x = linear->p1.x;
|
|
|
|
p1.y = linear->p1.y;
|
|
|
|
p2.x = linear->p2.x;
|
|
|
|
p2.y = linear->p2.y;
|
|
|
|
|
|
|
|
return pixman_image_create_linear_gradient (
|
|
|
|
&p1, &p2, (pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
|
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
create_radial_gradient_image (PictGradient *gradient)
|
|
|
|
{
|
|
|
|
PictRadialGradient *radial = (PictRadialGradient *)gradient;
|
|
|
|
pixman_point_fixed_t c1;
|
|
|
|
pixman_point_fixed_t c2;
|
|
|
|
|
|
|
|
c1.x = radial->c1.x;
|
|
|
|
c1.y = radial->c1.y;
|
|
|
|
c2.x = radial->c2.x;
|
|
|
|
c2.y = radial->c2.y;
|
|
|
|
|
|
|
|
return pixman_image_create_radial_gradient (
|
|
|
|
&c1, &c2, radial->c1.radius,
|
|
|
|
radial->c2.radius,
|
|
|
|
(pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
|
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
create_conical_gradient_image (PictGradient *gradient)
|
|
|
|
{
|
|
|
|
PictConicalGradient *conical = (PictConicalGradient *)gradient;
|
|
|
|
pixman_point_fixed_t center;
|
|
|
|
|
|
|
|
center.x = conical->center.x;
|
|
|
|
center.y = conical->center.y;
|
|
|
|
|
|
|
|
return pixman_image_create_conical_gradient (
|
|
|
|
¢er, conical->angle, (pixman_gradient_stop_t *)gradient->stops,
|
|
|
|
gradient->nstops);
|
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
create_bits_picture (PicturePtr pict,
|
2009-12-02 17:37:20 +01:00
|
|
|
Bool has_clip,
|
|
|
|
int *xoff,
|
|
|
|
int *yoff)
|
2007-06-11 15:16:46 +02:00
|
|
|
{
|
2009-12-02 17:37:20 +01:00
|
|
|
PixmapPtr pixmap;
|
2007-06-11 15:16:46 +02:00
|
|
|
FbBits *bits;
|
|
|
|
FbStride stride;
|
2009-12-02 17:37:20 +01:00
|
|
|
int bpp;
|
2007-06-11 15:16:46 +02:00
|
|
|
pixman_image_t *image;
|
|
|
|
|
2009-12-02 17:37:20 +01:00
|
|
|
fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
|
|
|
|
fbGetPixmapBitsData(pixmap, bits, stride, bpp);
|
2007-08-17 02:43:29 +02:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
image = pixman_image_create_bits (
|
fb: Silence warnings when building with clang
fbpict.c:163:8: warning: implicit conversion from enumeration type 'PictFormatShort' (aka 'enum _PictFormatShort') to different enumeration
type 'pixman_format_code_t' [-Wconversion]
pict->format,
~~~~~~^~~~~~
fbbltone.c:486:2: warning: shift result (281474959933440) requires 49 bits to represent, but 'int' only has 32 bits [-Wshift-overflow]
C2_24( 0, 0), C2_24 ( 1, 0), C2_24 ( 2, 0), C2_24 ( 3, 0),
^~~~~~~~~~~~
fbbltone.c:474:6: note: instantiated from:
SelMask24(b,1,r))
^
fbbltone.c:429:46: note: instantiated from:
^
fbbltone.c:427:18: note: instantiated from:
0xffffff << Mask24Check(x,r)) : 0)
~~~~~~~~ ^
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-04-24 05:36:53 +02:00
|
|
|
(pixman_format_code_t)pict->format,
|
2009-12-02 17:37:20 +01:00
|
|
|
pixmap->drawable.width, pixmap->drawable.height,
|
2007-06-11 15:16:46 +02:00
|
|
|
(uint32_t *)bits, stride * sizeof (FbStride));
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef FB_ACCESS_WRAPPER
|
|
|
|
#if FB_SHIFT==5
|
|
|
|
|
|
|
|
pixman_image_set_accessors (image,
|
|
|
|
(pixman_read_memory_func_t)wfbReadMemory,
|
|
|
|
(pixman_write_memory_func_t)wfbWriteMemory);
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
#error The pixman library only works when FbBits is 32 bits wide
|
|
|
|
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2009-12-01 20:09:32 +01:00
|
|
|
/* pCompositeClip is undefined for source pictures, so
|
|
|
|
* only set the clip region for pictures with drawables
|
|
|
|
*/
|
2007-06-11 15:16:46 +02:00
|
|
|
if (has_clip)
|
|
|
|
{
|
2009-12-01 20:09:32 +01:00
|
|
|
if (pict->clientClipType != CT_NONE)
|
|
|
|
pixman_image_set_has_client_clip (image, TRUE);
|
2009-05-11 05:27:56 +02:00
|
|
|
|
2009-12-02 17:37:20 +01:00
|
|
|
if (*xoff || *yoff)
|
|
|
|
pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
|
2009-05-11 05:27:56 +02:00
|
|
|
|
2009-12-01 20:09:32 +01:00
|
|
|
pixman_image_set_clip_region (image, pict->pCompositeClip);
|
2009-06-13 16:28:21 +02:00
|
|
|
|
2009-12-02 17:37:20 +01:00
|
|
|
if (*xoff || *yoff)
|
|
|
|
pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
|
2007-06-11 15:16:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Indexed table */
|
|
|
|
if (pict->pFormat->index.devPrivate)
|
|
|
|
pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2009-12-02 17:37:20 +01:00
|
|
|
/* Add in drawable origin to position within the image */
|
|
|
|
*xoff += pict->pDrawable->x;
|
|
|
|
*yoff += pict->pDrawable->y;
|
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
return image;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
2005-11-30 03:36:25 +01:00
|
|
|
|
2010-05-21 18:01:43 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map);
|
|
|
|
|
2007-05-23 21:50:25 +02:00
|
|
|
static void
|
2010-05-21 18:01:43 +02:00
|
|
|
set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map)
|
2007-05-23 21:50:25 +02:00
|
|
|
{
|
|
|
|
pixman_repeat_t repeat;
|
|
|
|
pixman_filter_t filter;
|
|
|
|
|
|
|
|
if (pict->transform)
|
|
|
|
{
|
2009-12-02 17:37:20 +01:00
|
|
|
/* For source images, adjust the transform to account
|
|
|
|
* for the drawable offset within the pixman image,
|
|
|
|
* then set the offset to 0 as it will be used
|
|
|
|
* to compute positions within the transformed image.
|
|
|
|
*/
|
|
|
|
if (!has_clip) {
|
|
|
|
struct pixman_transform adjusted;
|
|
|
|
|
|
|
|
adjusted = *pict->transform;
|
|
|
|
pixman_transform_translate(&adjusted,
|
|
|
|
NULL,
|
|
|
|
pixman_int_to_fixed(*xoff),
|
|
|
|
pixman_int_to_fixed(*yoff));
|
|
|
|
pixman_image_set_transform (image, &adjusted);
|
|
|
|
*xoff = 0;
|
|
|
|
*yoff = 0;
|
|
|
|
} else
|
|
|
|
pixman_image_set_transform (image, pict->transform);
|
2007-05-23 21:50:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (pict->repeatType)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
case RepeatNone:
|
|
|
|
repeat = PIXMAN_REPEAT_NONE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RepeatPad:
|
|
|
|
repeat = PIXMAN_REPEAT_PAD;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RepeatNormal:
|
|
|
|
repeat = PIXMAN_REPEAT_NORMAL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RepeatReflect:
|
|
|
|
repeat = PIXMAN_REPEAT_REFLECT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
pixman_image_set_repeat (image, repeat);
|
|
|
|
|
2010-05-21 18:01:43 +02:00
|
|
|
/* Fetch alpha map unless 'pict' is being used
|
|
|
|
* as the alpha map for this operation
|
|
|
|
*/
|
|
|
|
if (pict->alphaMap && !is_alpha_map)
|
2007-05-23 21:50:25 +02:00
|
|
|
{
|
2009-12-02 17:37:20 +01:00
|
|
|
int alpha_xoff, alpha_yoff;
|
2010-05-21 18:01:43 +02:00
|
|
|
pixman_image_t *alpha_map = image_from_pict_internal (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff, TRUE);
|
2007-05-23 21:50:25 +02:00
|
|
|
|
|
|
|
pixman_image_set_alpha_map (
|
|
|
|
image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
|
|
|
|
|
2007-08-01 23:30:03 +02:00
|
|
|
free_pixman_pict (pict->alphaMap, alpha_map);
|
2007-05-23 21:50:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pixman_image_set_component_alpha (image, pict->componentAlpha);
|
|
|
|
|
|
|
|
switch (pict->filter)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
case PictFilterNearest:
|
|
|
|
case PictFilterFast:
|
|
|
|
filter = PIXMAN_FILTER_NEAREST;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PictFilterBilinear:
|
|
|
|
case PictFilterGood:
|
|
|
|
filter = PIXMAN_FILTER_BILINEAR;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PictFilterConvolution:
|
|
|
|
filter = PIXMAN_FILTER_CONVOLUTION;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);
|
2007-08-23 18:15:03 +02:00
|
|
|
pixman_image_set_source_clipping (image, TRUE);
|
2007-05-23 21:50:25 +02:00
|
|
|
}
|
|
|
|
|
2010-05-21 18:01:43 +02:00
|
|
|
static pixman_image_t *
|
|
|
|
image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map)
|
2007-05-23 21:50:25 +02:00
|
|
|
{
|
|
|
|
pixman_image_t *image = NULL;
|
|
|
|
|
|
|
|
if (!pict)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (pict->pDrawable)
|
|
|
|
{
|
2009-12-02 17:37:20 +01:00
|
|
|
image = create_bits_picture (pict, has_clip, xoff, yoff);
|
2007-05-23 21:50:25 +02:00
|
|
|
}
|
|
|
|
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);
|
|
|
|
}
|
2010-01-27 23:03:03 +01:00
|
|
|
*xoff = *yoff = 0;
|
2007-05-23 21:50:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (image)
|
2010-05-21 18:01:43 +02:00
|
|
|
set_image_properties (image, pict, has_clip, xoff, yoff, is_alpha_map);
|
2007-05-23 21:50:25 +02:00
|
|
|
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
2010-05-21 18:01:43 +02:00
|
|
|
pixman_image_t *
|
|
|
|
image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
|
|
|
|
{
|
|
|
|
return image_from_pict_internal (pict, has_clip, xoff, yoff, FALSE);
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2007-08-01 23:30:03 +02:00
|
|
|
free_pixman_pict (PicturePtr pict, pixman_image_t *image)
|
|
|
|
{
|
|
|
|
if (image && pixman_image_unref (image) && pict->pDrawable)
|
|
|
|
fbFinishAccess (pict->pDrawable);
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2007-06-11 15:16:46 +02:00
|
|
|
fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
|
|
|
|
{
|
2007-05-23 21:50:25 +02:00
|
|
|
|
2007-06-11 15:16:46 +02:00
|
|
|
PictureScreenPtr ps;
|
|
|
|
|
|
|
|
if (!miPictureInit (pScreen, formats, nformats))
|
|
|
|
return FALSE;
|
|
|
|
ps = GetPictureScreen(pScreen);
|
|
|
|
ps->Composite = fbComposite;
|
|
|
|
ps->Glyphs = miGlyphs;
|
|
|
|
ps->CompositeRects = miCompositeRects;
|
|
|
|
ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
|
2011-01-11 15:46:46 +01:00
|
|
|
ps->Trapezoids = fbTrapezoids;
|
2007-06-11 15:16:46 +02:00
|
|
|
ps->AddTraps = fbAddTraps;
|
|
|
|
ps->AddTriangles = fbAddTriangles;
|
2011-01-11 16:33:57 +01:00
|
|
|
ps->Triangles = fbTriangles;
|
2007-06-11 15:16:46 +02:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|