xf86-video-intel: src/i830_dri.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Feb 17 09:50:20 PST 2010
src/i830_dri.c | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 1c3aaad09d6ef207fba748ad4ef4575a26ab2e5c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Feb 17 17:48:32 2010 +0000
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 at 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)
More information about the xorg-commit
mailing list