xf86-video-intel:

- update to xf86-video-intel-20100221
This commit is contained in:
Stephan Raue 2010-02-21 11:16:11 +01:00
parent d29361b87b
commit 95ab46fd3e
2 changed files with 1 additions and 76 deletions

View File

@ -1,75 +0,0 @@
From 1c3aaad09d6ef207fba748ad4ef4575a26ab2e5c Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 17 Feb 2010 17:48:32 +0000
Subject: dri2: Silence the compiler for an unused function with proto < 4
Move the unused function into the #if DRI2INFOREC_VERSION >= 4 block.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
diff --git a/src/i830_dri.c b/src/i830_dri.c
index e64b25d..8356525 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -269,29 +269,6 @@ static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
#endif
-static int
-I830DRI2DrawablePipe(DrawablePtr pDraw)
-{
- ScreenPtr pScreen = pDraw->pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- BoxRec box, crtcbox;
- xf86CrtcPtr crtc;
- int pipe = -1;
-
- box.x1 = pDraw->x;
- box.y1 = pDraw->y;
- box.x2 = box.x1 + pDraw->width;
- box.y2 = box.y1 + pDraw->height;
-
- crtc = i830_covering_crtc(pScrn, &box, NULL, &crtcbox);
-
- /* Make sure the CRTC is valid and this is the real front buffer */
- if (crtc != NULL && !crtc->rotatedData)
- pipe = i830_crtc_to_pipe(crtc);
-
- return pipe;
-}
-
static void
I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer)
@@ -425,6 +402,29 @@ typedef struct _DRI2FrameEvent {
DRI2BufferPtr back;
} DRI2FrameEventRec, *DRI2FrameEventPtr;
+static int
+I830DRI2DrawablePipe(DrawablePtr pDraw)
+{
+ ScreenPtr pScreen = pDraw->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ BoxRec box, crtcbox;
+ xf86CrtcPtr crtc;
+ int pipe = -1;
+
+ box.x1 = pDraw->x;
+ box.y1 = pDraw->y;
+ box.x2 = box.x1 + pDraw->width;
+ box.y2 = box.y1 + pDraw->height;
+
+ crtc = i830_covering_crtc(pScrn, &box, NULL, &crtcbox);
+
+ /* Make sure the CRTC is valid and this is the real front buffer */
+ if (crtc != NULL && !crtc->rotatedData)
+ pipe = i830_crtc_to_pipe(crtc);
+
+ return pipe;
+}
+
static void
I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front,
DRI2BufferPtr back)
--
cgit v0.8.3-6-g21f6

View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xf86-video-intel-20100213.tar.bz2
http://sources.openelec.tv/svn/xf86-video-intel-20100221.tar.bz2