57b35adaed
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>
186 lines
4.7 KiB
C
186 lines
4.7 KiB
C
/*
|
|
*
|
|
* Copyright © 2000 SuSE, Inc.
|
|
*
|
|
* 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
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* Author: Keith Packard, SuSE, Inc.
|
|
*/
|
|
|
|
#ifndef _MIPICT_H_
|
|
#define _MIPICT_H_
|
|
|
|
#include "picturestr.h"
|
|
|
|
#define MI_MAX_INDEXED 256 /* XXX depth must be <= 8 */
|
|
|
|
#if MI_MAX_INDEXED <= 256
|
|
typedef CARD8 miIndexType;
|
|
#endif
|
|
|
|
typedef struct _miIndexed {
|
|
Bool color;
|
|
CARD32 rgba[MI_MAX_INDEXED];
|
|
miIndexType ent[32768];
|
|
} miIndexedRec, *miIndexedPtr;
|
|
|
|
#define miCvtR8G8B8to15(s) ((((s) >> 3) & 0x001f) | \
|
|
(((s) >> 6) & 0x03e0) | \
|
|
(((s) >> 9) & 0x7c00))
|
|
#define miIndexToEnt15(mif,rgb15) ((mif)->ent[rgb15])
|
|
#define miIndexToEnt24(mif,rgb24) miIndexToEnt15(mif,miCvtR8G8B8to15(rgb24))
|
|
|
|
#define miIndexToEntY24(mif,rgb24) ((mif)->ent[CvtR8G8B8toY15(rgb24)])
|
|
|
|
extern _X_EXPORT int
|
|
miCreatePicture (PicturePtr pPicture);
|
|
|
|
extern _X_EXPORT void
|
|
miDestroyPicture (PicturePtr pPicture);
|
|
|
|
extern _X_EXPORT void
|
|
miDestroyPictureClip (PicturePtr pPicture);
|
|
|
|
extern _X_EXPORT int
|
|
miChangePictureClip (PicturePtr pPicture,
|
|
int type,
|
|
pointer value,
|
|
int n);
|
|
|
|
extern _X_EXPORT void
|
|
miChangePicture (PicturePtr pPicture,
|
|
Mask mask);
|
|
|
|
extern _X_EXPORT void
|
|
miValidatePicture (PicturePtr pPicture,
|
|
Mask mask);
|
|
|
|
extern _X_EXPORT int
|
|
miChangePictureTransform (PicturePtr pPicture,
|
|
PictTransform *transform);
|
|
|
|
extern _X_EXPORT int
|
|
miChangePictureFilter (PicturePtr pPicture,
|
|
int filter,
|
|
xFixed *params,
|
|
int nparams);
|
|
|
|
extern _X_EXPORT void
|
|
miCompositeSourceValidate (PicturePtr pPicture);
|
|
|
|
extern _X_EXPORT Bool
|
|
miComputeCompositeRegion (RegionPtr pRegion,
|
|
PicturePtr pSrc,
|
|
PicturePtr pMask,
|
|
PicturePtr pDst,
|
|
INT16 xSrc,
|
|
INT16 ySrc,
|
|
INT16 xMask,
|
|
INT16 yMask,
|
|
INT16 xDst,
|
|
INT16 yDst,
|
|
CARD16 width,
|
|
CARD16 height);
|
|
|
|
extern _X_EXPORT Bool
|
|
miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
|
|
|
|
extern _X_EXPORT Bool
|
|
miRealizeGlyph (ScreenPtr pScreen,
|
|
GlyphPtr glyph);
|
|
|
|
extern _X_EXPORT void
|
|
miUnrealizeGlyph (ScreenPtr pScreen,
|
|
GlyphPtr glyph);
|
|
|
|
extern _X_EXPORT void
|
|
miGlyphs (CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc,
|
|
INT16 ySrc,
|
|
int nlist,
|
|
GlyphListPtr list,
|
|
GlyphPtr *glyphs);
|
|
|
|
extern _X_EXPORT void
|
|
miRenderColorToPixel (PictFormatPtr pPict,
|
|
xRenderColor *color,
|
|
CARD32 *pixel);
|
|
|
|
extern _X_EXPORT void
|
|
miRenderPixelToColor (PictFormatPtr pPict,
|
|
CARD32 pixel,
|
|
xRenderColor *color);
|
|
|
|
extern _X_EXPORT Bool
|
|
miIsSolidAlpha (PicturePtr pSrc);
|
|
|
|
extern _X_EXPORT void
|
|
miCompositeRects (CARD8 op,
|
|
PicturePtr pDst,
|
|
xRenderColor *color,
|
|
int nRect,
|
|
xRectangle *rects);
|
|
|
|
extern _X_EXPORT void
|
|
miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box);
|
|
|
|
extern _X_EXPORT void
|
|
miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds);
|
|
|
|
extern _X_EXPORT void
|
|
miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);
|
|
|
|
extern _X_EXPORT void
|
|
miTriStrip (CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc,
|
|
INT16 ySrc,
|
|
int npoint,
|
|
xPointFixed *points);
|
|
|
|
extern _X_EXPORT void
|
|
miTriFan (CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc,
|
|
INT16 ySrc,
|
|
int npoint,
|
|
xPointFixed *points);
|
|
|
|
extern _X_EXPORT Bool
|
|
miInitIndexed (ScreenPtr pScreen,
|
|
PictFormatPtr pFormat);
|
|
|
|
extern _X_EXPORT void
|
|
miCloseIndexed (ScreenPtr pScreen,
|
|
PictFormatPtr pFormat);
|
|
|
|
extern _X_EXPORT void
|
|
miUpdateIndexed (ScreenPtr pScreen,
|
|
PictFormatPtr pFormat,
|
|
int ndef,
|
|
xColorItem *pdef);
|
|
|
|
#endif /* _MIPICT_H_ */
|