Attachment 15862 Details for Bug 15047 – 0001-Remove-dependency-on-cfb.patch

[patch] 0001-Remove-dependency-on-cfb.patch

0001-Remove-dependency-on-cfb.patch (text/plain), 2.17 KB, created by Paulo César Pereira de Andrade on 2008-04-12 19:05:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-04-12 19:05:20 UTC

Size: 2.17 KB

patch

obsolete

>From f72645f10d414cb851c89c75e45c880f3caa2913 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sat, 12 Apr 2008 22:55:33 -0300
>Subject: [PATCH] Remove dependency on cfb.
>
>---
> src/glint_driver.c |   26 ++------------------------
> 1 files changed, 2 insertions(+), 24 deletions(-)
>
>diff --git a/src/glint_driver.c b/src/glint_driver.c
>index eb375ec..9291ae7 100644
>--- a/src/glint_driver.c
>+++ b/src/glint_driver.c
>@@ -2885,7 +2885,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
>     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>     GLINTPtr pGlint = GLINTPTR(pScrn);
>     int ret, displayWidth;
>-    int init_picture = 0;
>     unsigned char *FBStart;
>     VisualPtr visual;
>     
>@@ -3003,25 +3002,11 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
>     case 8:
>     case 16:
>     case 24:
>-	ret = fbScreenInit(pScreen, FBStart,
>-			pScrn->virtualX, pScrn->virtualY,
>-			pScrn->xDpi, pScrn->yDpi,
>-			displayWidth, pScrn->bitsPerPixel);
>-	init_picture = 1;
>-	break;
>     case 32:
>-	if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
>-	    ret = cfb8_32ScreenInit(pScreen, FBStart,
>-			pScrn->virtualX, pScrn->virtualY,
>-			pScrn->xDpi, pScrn->yDpi,
>-			displayWidth);
>-	else {
>-	    ret = fbScreenInit(pScreen, FBStart,
>+	ret = fbScreenInit(pScreen, FBStart,
> 			pScrn->virtualX, pScrn->virtualY,
> 			pScrn->xDpi, pScrn->yDpi,
> 			displayWidth, pScrn->bitsPerPixel);
>-	    init_picture = 1;
>-	}
> 	break;
>     default:
> 	xf86DrvMsg(scrnIndex, X_ERROR,
>@@ -3059,8 +3044,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
>     }
> 
>     /* must be after RGB ordering fixed */
>-    if (init_picture)
>-	fbPictureInit(pScreen, 0, 0);
>+    fbPictureInit(pScreen, 0, 0);
>     if (!pGlint->NoAccel) {
>         switch (pGlint->Chipset)
>         {
>@@ -3188,12 +3172,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
> 	}
>     }
> 
>-    if((pScrn->overlayFlags & OVERLAY_8_32_PLANAR) && 
>-						(pScrn->bitsPerPixel == 32)) {
>-	if(!xf86Overlay8Plus32Init(pScreen))
>-	    return FALSE;
>-    }
>-
>     if(pGlint->ShadowFB)
> 	ShadowFBInit(pScreen, GLINTRefreshArea);
> 
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 15047: 15167 | 15355 | 15862 | 15863 | 17758

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.