diff options
| author | Søren Sandmann Pedersen <ssp@redhat.com> | 2011-03-08 10:14:28 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-03-14 14:09:07 -0400 |
| commit | d7f8011418f9da06631f27c66c29bcb226d0dffe (patch) | |
| tree | 9efa19d248a18c46ccb002e08fac425295194ac0 /render | |
| parent | 0eb5b0fbcf1233a93f285ff1e1609fcbd01e7c79 (diff) | |
Remove TriStrip and TriFan from the picture screen
These functions no longer go through the screen vtable, so remove
them and fix up the various wrappers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
Diffstat (limited to 'render')
| -rw-r--r-- | render/mipict.c | 2 | ||||
| -rw-r--r-- | render/mipict.h | 20 | ||||
| -rw-r--r-- | render/mitri.c | 24 | ||||
| -rw-r--r-- | render/picturestr.h | 2 |
4 files changed, 0 insertions, 48 deletions
diff --git a/render/mipict.c b/render/mipict.c index a057840df..08b2fa722 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -601,8 +601,6 @@ miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) ps->CompositeRects = miCompositeRects; ps->Trapezoids = 0; ps->Triangles = 0; - ps->TriStrip = miTriStrip; - ps->TriFan = miTriFan; ps->RasterizeTrapezoid = 0; /* requires DDX support */ ps->AddTraps = 0; /* requires DDX support */ diff --git a/render/mipict.h b/render/mipict.h index a70db2417..f6d9deefd 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -148,26 +148,6 @@ 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); diff --git a/render/mitri.c b/render/mitri.c index 2ca7cc4d7..b322a7c62 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -66,27 +66,3 @@ miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds) { miPointFixedBounds (ntri * 3, (xPointFixed *) tris, bounds); } - -void -miTriStrip (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int npoint, - xPointFixed *points) -{ -} - -void -miTriFan (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int npoint, - xPointFixed *points) -{ -} diff --git a/render/picturestr.h b/render/picturestr.h index ae69eef10..7c7edb1c4 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -381,8 +381,6 @@ typedef struct _PictureScreen { TrapezoidsProcPtr Trapezoids; TrianglesProcPtr Triangles; - TriStripProcPtr TriStrip; - TriFanProcPtr TriFan; RasterizeTrapezoidProcPtr RasterizeTrapezoid; |