xserver/hw/xgl xglcmap.c, 1.3, 1.4 xglcomp.c, 1.3, 1.4 xglglyph.c, 1.1, 1.2 xglpixmap.c, 1.7, 1.8 xglwindow.c, 1.3, 1.4

[David Reveman]

Committed by: davidr

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv27157/hw/xgl

Modified Files:
	xglcmap.c xglcomp.c xglglyph.c xglpixmap.c xglwindow.c 
Log Message:
Fixes a few problems in Xgl

Index: xglcmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcmap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglcmap.c	26 Jan 2005 10:58:52 -0000	1.3
+++ xglcmap.c	11 Feb 2005 20:19:20 -0000	1.4
@@ -288,11 +288,6 @@
 						0, NULL, k++);
 		    if (format && format->type == GLITZ_FORMAT_TYPE_COLOR)
 		    {
-			/* formats must have an alpha channel, otherwise
-			   filtering wont match the render spec. */
-			if (!format->color.alpha_size)
-			    continue;
-
 			/* find best matching sufficient format */
 			if (format->color.red_size   >= rs &&
 			    format->color.green_size >= gs &&

Index: xglcomp.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcomp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglcomp.c	26 Jan 2005 10:58:52 -0000	1.3
+++ xglcomp.c	11 Feb 2005 20:19:20 -0000	1.4
@@ -170,9 +170,7 @@
 	    if (pSrc->repeat)
 	    {
 		/* tile */
-		if (!pSrcPriv->acceleratedTile &&
-		    (pSrc->pDrawable->width > 1 ||
-		     pSrc->pDrawable->height > 1))
+		if (!pSrcPriv->acceleratedTile)
 		{
 		    pGeometry =
 			xglTiledBoxGeometry ((PixmapPtr) pSrc->pDrawable,

Index: xglglyph.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglglyph.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xglglyph.c	26 Jan 2005 10:58:52 -0000	1.1
+++ xglglyph.c	11 Feb 2005 20:19:20 -0000	1.2
@@ -137,9 +137,15 @@
 {
     xglGlyphCachePtr pCache = (xglGlyphCachePtr) pArea->pRoot->closure;
     GlyphPtr	     pGlyph = (GlyphPtr) closure2;
+    xglGlyphAreaPtr  pAreaPriv;
 
     XGL_GLYPH_PRIV (pCache->pScreen, pGlyph);
-    GLYPH_AREA_PRIV (pGlyphPriv->pArea);
+
+    /* this shouldn't be needed, seems like a bug in xglarea.c */
+    if (!pGlyphPriv->pArea)
+	return 1;
+
+    pAreaPriv = GLYPH_GET_AREA_PRIV (pGlyphPriv->pArea);
 
     if (pAreaPriv->serial != glyphSerialNumber)
 	return 1;

Index: xglpixmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglpixmap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xglpixmap.c	8 Feb 2005 22:45:21 -0000	1.7
+++ xglpixmap.c	11 Feb 2005 20:19:20 -0000	1.8
@@ -97,11 +97,17 @@
 	
 	if (width && height)
 	{
-	    if (features & GLITZ_FEATURE_TEXTURE_BORDER_CLAMP_MASK)
+	    if (width == 1 && height == 1)
+	    {
+		pPixmapPriv->acceleratedTile = TRUE;
+	    }
+	    else if (features & GLITZ_FEATURE_TEXTURE_BORDER_CLAMP_MASK)
+	    {
 		if ((features & GLITZ_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK) ||
 		    (POWER_OF_TWO (width) && POWER_OF_TWO (height)))
 		    pPixmapPriv->acceleratedTile = TRUE;
-	
+	    }
+	    
 	    pPixmapPriv->target = xglPixmapTargetOut;
 	    
 	    /*

Index: xglwindow.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglwindow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglwindow.c	26 Jan 2005 10:58:52 -0000	1.3
+++ xglwindow.c	11 Feb 2005 20:19:20 -0000	1.4
@@ -120,19 +120,6 @@
     REGION_INTERSECT (pWin->drawable.pScreen,
 		      &rgnDst, &pWin->borderClip, prgnSrc);
 
-#ifdef COMPOSITE
-    if (pPixmap->screen_x || pPixmap->screen_y)
-    {
-	REGION_TRANSLATE (pWin->drawable.pScreen, &rgnDst,
-			  -pPixmap->screen_x, -pPixmap->screen_y);
-
-	box.x1 -= pPixmap->screen_x;
-	box.y1 -= pPixmap->screen_y;
-	box.x2 -= pPixmap->screen_x;
-	box.y2 -= pPixmap->screen_y;
-    }
-#endif
-    
     fbCopyRegion (&pWin->drawable, &pWin->drawable,
 		  0, &rgnDst, dx, dy, xglCopyProc, 0, (void *) &box);