Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Mon Oct 12 21:01:31 CEST 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-10-11 13:20:17.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-10-12 18:36:05.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 12 15:45:33 UTC 2009 - mhopf@novell.com + +- xf86-video-intel-Regression-bnc545499-commit_57fc09c-avoid_fallbacks_for_a1_srcmask.diff: + * Remove new functionality that introduced regression. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-intel-bnc545499-commit_57fc09c.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.M8Ivok/_old 2009-10-12 21:00:01.000000000 +0200 +++ /var/tmp/diff_new_pack.M8Ivok/_new 2009-10-12 21:00:01.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 85 +Release: 86 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -109,6 +109,7 @@ Patch131: xf86-video-ati-bug519261-increase-virtual.diff Patch132: xf86-video-nv-bug519261-increase-virtual.diff Patch133: xf86-video-intel-commit-02fe9be6.diff +Patch134: xf86-video-intel-bnc545499-commit_57fc09c.diff %description This package contains X.Org video drivers. @@ -191,6 +192,7 @@ %endif %patch130 -p0 %patch133 -p1 -R +%patch134 -p1 popd pushd xf86-video-nv-* %patch132 -p1 ++++++ xf86-video-intel-bnc545499-commit_57fc09c.diff ++++++
From 57fc09cef28bad2e3e8455b93ef2927118f8a3a3 Mon Sep 17 00:00:00 2001 From: Chris Wilson
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, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org