Author: arekm Date: Wed Jul 23 19:19:48 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- single chunk obsolete
---- Files affected:
SOURCES:
xorg-xserver-server-glyph.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/xorg-xserver-server-glyph.patch
diff -u SOURCES/xorg-xserver-server-glyph.patch:1.1
SOURCES/xorg-xserver-server-glyph.patch:1.2
--- SOURCES/xorg-xserver-server-glyph.patch:1.1 Wed Jul 2 19:17:37 2008
+++ SOURCES/xorg-xserver-server-glyph.patch Wed Jul 23 21:19:43 2008
@@ -1793,56 +1793,6 @@
}
if (xf86ReturnOptValBool(pScreenPriv->options,
-commit 528b4e36ade482df99747081688ae52cfaeb28eb
-Author: Alan Hourihane <[EMAIL PROTECTED]>
-Date: Wed Jun 18 22:34:02 2008 +0100
-
- Set driverPriv immediately on CreatePixmap.
-
- If it's NULL anyway, we bail, if not, it lets
- ModifyPixmapHeader know about the private.
-
-diff --git a/exa/exa.c b/exa/exa.c
-index fc04748..48352bd 100644
---- a/exa/exa.c
-+++ b/exa/exa.c
-@@ -314,7 +314,6 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
-
- if (driver_alloc) {
- size_t paddedWidth, datasize;
-- void *driver_priv;
-
- paddedWidth = ((w * bpp + FB_MASK) >> FB_SHIFT) * sizeof(FbBits);
- if (paddedWidth / 4 > 32767 || h > 32767)
-@@ -327,22 +326,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int
depth,
-
- datasize = h * paddedWidth;
-
-- driver_priv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
-- if (!driver_priv) {
-+ pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen,
datasize, 0);
-+ if (!pExaPixmap->driverPriv) {
- fbDestroyPixmap(pPixmap);
- return NULL;
- }
-
- (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
- paddedWidth, NULL);
-- pExaPixmap->driverPriv = driver_priv;
- pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
- pExaPixmap->fb_ptr = NULL;
- } else {
-- pExaPixmap->driverPriv = NULL;
-- /* Scratch pixmaps may have w/h equal to zero, and may not be
-- * migrated.
-- */
-+ pExaPixmap->driverPriv = NULL;
-+ /* Scratch pixmaps may have w/h equal to zero, and may not be
-+ * migrated.
-+ */
- if (!w || !h)
- pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
- else
commit 13fd2256300b61d88b840952d838f834523f5dd7
Author: Owen Taylor <[EMAIL PROTECTED]>
Date: Mon Apr 28 21:00:55 2008 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-xserver-server-glyph.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
