diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-03 09:57:10 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-03 10:19:25 +0000 |
| commit | 5e48146777921b693c828af9566a77422cc4f85f (patch) | |
| tree | 1808d8d24b9b6fdd5cddd5c81fb20a1546df4ae5 /src/i830_video.c | |
| parent | ea0b00e675281b2914450992501566122f9affe0 (diff) | |
Replace some pixmap-related idioms with inline functions to do so.
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 085e79a0..1ff80a05 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2216,7 +2216,7 @@ I830PutImage(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv = (I830PortPrivPtr) data; ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; I830OverlayRegPtr overlay; - PixmapPtr pPixmap; + PixmapPtr pPixmap = get_drawable_pixmap(pDraw);; INT32 x1, x2, y1, y2; int srcPitch = 0, srcPitch2 = 0, dstPitch, destId; int dstPitch2 = 0; @@ -2467,12 +2467,6 @@ I830PutImage(ScrnInfoPtr pScrn, break; } - if (pDraw->type == DRAWABLE_WINDOW) { - pPixmap = (*pScreen->GetWindowPixmap)((WindowPtr)pDraw); - } else { - pPixmap = (PixmapPtr)pDraw; - } - if (!pPriv->textured) { i830_display_video(pScrn, crtc, destId, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, @@ -2497,7 +2491,7 @@ I830PutImage(ScrnInfoPtr pScrn, int y1, y2; int pipe = -1, event, load_scan_lines_pipe; - if (pPixmap == pScreen->GetScreenPixmap(pScreen)) { + if (pixmap_is_scanout(pPixmap)) { if (pI830->use_drm_mode) pipe = drmmode_get_pipe_from_crtc_id(pI830->bufmgr, crtc); else { |