svn merge ^/branches/released .

4 files changed, 2 insertions, 104 deletions

diff --git a/xorg-server/hw/dmx/dmx.h b/xorg-server/hw/dmx/dmx.h
index ddc11e368..dc5d25e16 100644
--- a/xorg-server/hw/dmx/dmx.h
+++ b/xorg-server/hw/dmx/dmx.h
@@ -249,8 +249,6 @@ typedef struct _DMXScreenInfo {
 

     TrapezoidsProcPtr              Trapezoids;

     TrianglesProcPtr               Triangles;

-    TriStripProcPtr                TriStrip;

-    TriFanProcPtr                  TriFan;

 } DMXScreenInfo;

 

 /* Global variables available to all Xserver/hw/dmx routines. */

diff --git a/xorg-server/hw/dmx/dmxpict.c b/xorg-server/hw/dmx/dmxpict.c
index 3f5cd4a50..1ea6543e0 100644
--- a/xorg-server/hw/dmx/dmxpict.c
+++ b/xorg-server/hw/dmx/dmxpict.c
@@ -165,8 +165,6 @@ Bool dmxPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 

     DMX_WRAP(Trapezoids,         dmxTrapezoids,         dmxScreen, ps);

     DMX_WRAP(Triangles,          dmxTriangles,          dmxScreen, ps);

-    DMX_WRAP(TriStrip,           dmxTriStrip,           dmxScreen, ps);

-    DMX_WRAP(TriFan,             dmxTriFan,             dmxScreen, ps);

 

     return TRUE;

 }

@@ -1237,88 +1235,3 @@ void dmxTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 

     DMX_WRAP(Triangles, dmxTriangles, dmxScreen, ps);

 }

-

-/** Composite a triangle strip on the appropriate screen.  For a

- *  complete description see the protocol document of the RENDER

- *  library. */

-void dmxTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-		 PictFormatPtr maskFormat,

-		 INT16 xSrc, INT16 ySrc,

-		 int npoint, xPointFixed *points)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pSrcPriv  = DMX_GET_PICT_PRIV(pSrc);

-    dmxPictPrivPtr    pDstPriv  = DMX_GET_PICT_PRIV(pDst);

-

-    DMX_UNWRAP(TriStrip, dmxScreen, ps);

-#if 0

-    if (ps->TriStrip)

-	ps->TriStrip(op, pSrc, pDst, maskFormat, xSrc, ySrc, npoint, *points);

-#endif

-

-    /* Draw trapezoids on back-end server */

-    if (pDstPriv->pict) {

-	XRenderPictFormat *pFormat;

-

-	pFormat = dmxFindFormat(dmxScreen, maskFormat);

-	if (!pFormat) {

-	    /* FIXME: Error! */

-	}

-

-	XRenderCompositeTriStrip(dmxScreen->beDisplay,

-				 op,

-				 pSrcPriv->pict,

-				 pDstPriv->pict,

-				 pFormat,

-				 xSrc, ySrc,

-				 (XPointFixed *)points,

-				 npoint);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_WRAP(TriStrip, dmxTriStrip, dmxScreen, ps);

-}

-

-/** Composite a triangle fan on the appropriate screen.  For a complete

- *  description see the protocol document of the RENDER library. */

-void dmxTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-	       PictFormatPtr maskFormat,

-	       INT16 xSrc, INT16 ySrc,

-	       int npoint, xPointFixed *points)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pSrcPriv  = DMX_GET_PICT_PRIV(pSrc);

-    dmxPictPrivPtr    pDstPriv  = DMX_GET_PICT_PRIV(pDst);

-

-    DMX_UNWRAP(TriFan, dmxScreen, ps);

-#if 0

-    if (ps->TriFan)

-	ps->TriFan(op, pSrc, pDst, maskFormat, xSrc, ySrc, npoint, *points);

-#endif

-

-    /* Draw trapezoids on back-end server */

-    if (pDstPriv->pict) {

-	XRenderPictFormat *pFormat;

-

-	pFormat = dmxFindFormat(dmxScreen, maskFormat);

-	if (!pFormat) {

-	    /* FIXME: Error! */

-	}

-

-	XRenderCompositeTriFan(dmxScreen->beDisplay,

-			       op,

-			       pSrcPriv->pict,

-			       pDstPriv->pict,

-			       pFormat,

-			       xSrc, ySrc,

-			       (XPointFixed *)points,

-			       npoint);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_WRAP(TriFan, dmxTriFan, dmxScreen, ps);

-}

diff --git a/xorg-server/hw/dmx/dmxpict.h b/xorg-server/hw/dmx/dmxpict.h
index d196f639a..f1d8c1f52 100644
--- a/xorg-server/hw/dmx/dmxpict.h
+++ b/xorg-server/hw/dmx/dmxpict.h
@@ -100,16 +100,6 @@ extern void dmxTriangles(CARD8 op,
 			 PictFormatPtr maskFormat,

 			 INT16 xSrc, INT16 ySrc,

 			 int ntri, xTriangle *tris);

-extern void dmxTriStrip(CARD8 op,

-			PicturePtr pSrc, PicturePtr pDst,

-			PictFormatPtr maskFormat,

-			INT16 xSrc, INT16 ySrc,

-			int npoint, xPointFixed *points);

-extern void dmxTriFan(CARD8 op,

-		      PicturePtr pSrc, PicturePtr pDst,

-		      PictFormatPtr maskFormat,

-		      INT16 xSrc, INT16 ySrc,

-		      int npoint, xPointFixed *points);

 

 extern int dmxBECreateGlyphSet(int idx, GlyphSetPtr glyphSet);

 extern Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet);

diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 2c5350bd9..d3acf23b7 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -30,8 +30,6 @@ DOXYGEN_HEAD=\
 	html/annotated.html

 

 DOXYGEN_REST= \

-	dmx.txt \

-	scaled.txt \

 	html/ChkNotMaskEv_8c.html \

 	html/ChkNotMaskEv_8h.html \

 	html/ChkNotMaskEv_8h_source.html \

@@ -237,7 +235,6 @@ DOXYGEN_REST= \
 DOXYGEN_FILES=$(DOXYGEN_HEAD) $(DOXYGEN_REST)

 

 EXTRA_DIST = \

-	$(XML_FILES) \

 	DMXSpec.txt \

 	DMXSpec-v1.txt \

 	doxygen.conf \

@@ -261,10 +258,10 @@ $(DOXYGEN_HEAD): $(DOXYGEN_SRC)
 $(DOXYGEN_REST): $(DOXYGEN_HEAD)

 

 maintainer-clean-local:

-	rm -rf html/ scaled.txt dmx.txt

+	rm -rf html/

 

 distclean-local:

-	rm -rf html/ scaled.txt dmx.txt

+	rm -rf html/

 

 endif HAVE_DOXYGEN

 endif ENABLE_DEVEL_DOCS