diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-02-17 17:48:32 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-02-17 17:49:48 +0000 |
commit | 1c3aaad09d6ef207fba748ad4ef4575a26ab2e5c (patch) | |
tree | 490ee930c09307034c01e6aee6336975dbd689de /src | |
parent | 00e7312dc45e54cd4547a943897a524639cb0b38 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/i830_dri.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index e64b25d4..83565257 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) |