File xf86-video-intel-bnc545499-commit_57fc09c.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-bnc545499-commit_57fc09c.diff of Package xorg-x11-driver-video (Revision 6018c65320f6e5a8f1e8ee8741ff89e7)

Currently displaying revision 6018c65320f6e5a8f1e8ee8741ff89e7 , Show latest

From 57fc09cef28bad2e3e8455b93ef2927118f8a3a3 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 20 Sep 2009 01:02:39 +0100
Subject: [PATCH] Avoid fallbacks for a1 src/mask

Reverted.

Index: xf86-video-intel-2.9.0/uxa/uxa-render.c
===================================================================
--- xf86-video-intel-2.9.0.orig/uxa/uxa-render.c
+++ xf86-video-intel-2.9.0/uxa/uxa-render.c
@@ -320,68 +320,6 @@ uxa_try_driver_solid_fill(PicturePtr	pSr
     return 1;
 }
 
-/* In order to avoid fallbacks when using an a1 source/mask,
- * for example with non-antialiased trapezoids, we need to
- * expand the bitmap into an a8 Picture. We do so by using the generic
- * composition routines, which while may not be perfect is far faster
- * than causing a fallback.
- */
-static PicturePtr
-uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
-				  pixman_image_t *image)
-{
-    PicturePtr pPicture;
-    PicturePtr pSrc;
-    PixmapPtr pPixmap;
-    int width, height;
-    int error;
-
-    width = pixman_image_get_width (image);
-    height = pixman_image_get_height (image);
-
-    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 8,
-					UXA_CREATE_PIXMAP_FOR_MAP);
-    if (!pPixmap)
-	return 0;
-
-    pPicture = CreatePicture (0, &pPixmap->drawable,
-			      PictureMatchFormat (pScreen, 8, PICT_a8),
-			      0, 0, serverClient, &error);
-    (*pScreen->DestroyPixmap) (pPixmap);
-    if (!pPicture)
-	return 0;
-
-    ValidatePicture (pPicture);
-
-    pPixmap = GetScratchPixmapHeader(pScreen, width, height, 1,
-				     BitsPerPixel (1),
-				     pixman_image_get_stride (image),
-				     pixman_image_get_data (image));
-    if (!pPixmap) {
-	FreePicture (pPicture, 0);
-	return 0;
-    }
-
-    pSrc = CreatePicture (0, &pPixmap->drawable,
-			  PictureMatchFormat (pScreen, 1, PICT_a1),
-			  0, 0, serverClient, &error);
-    FreeScratchPixmapHeader (pPixmap);
-    if (!pSrc) {
-	FreePicture (pPicture, 0);
-	return 0;
-    }
-
-    CompositePicture (PictOpSrc, pSrc, NULL, pPicture,
-		      0, 0,
-		      0, 0,
-		      0, 0,
-		      width, height);
-
-    FreePicture (pSrc, 0);
-
-    return pPicture;
-}
-
 static PicturePtr
 uxa_picture_from_pixman_image (ScreenPtr pScreen,
 			       pixman_image_t *image,
@@ -393,9 +331,6 @@ uxa_picture_from_pixman_image (ScreenPtr
     int width, height, depth;
     int error;
 
-    if (format == PICT_a1)
-	return uxa_picture_from_a1_pixman_image (pScreen, image);
-
     width = pixman_image_get_width (image);
     height = pixman_image_get_height (image);
     depth = pixman_image_get_depth (image);
@@ -409,9 +344,6 @@ uxa_picture_from_pixman_image (ScreenPtr
 			      PictureMatchFormat (pScreen, depth, format),
 			      0, 0, serverClient, &error);
     (*pScreen->DestroyPixmap) (pPixmap);
-    if (!pPicture)
-	return 0;
-
     ValidatePicture (pPicture);
 
     pPixmap = GetScratchPixmapHeader(pScreen, width, height, depth,

Places

File xf86-video-intel-bnc545499-commit_57fc09c.diff of Package xorg-x11-driver-video (Revision 6018c65320f6e5a8f1e8ee8741ff89e7)

Places