diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-08-11 16:06:33 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-05 13:07:42 -0700 |
| commit | b90171f16652d1145fb80a63919f76a804a94cef (patch) | |
| tree | 8f52b493e8e087ad6e0a831ff58c127bddf55bdb /src/i830_video.c | |
| parent | 857e40a6e00db72401717da3ed79edbf65db31d4 (diff) | |
Xv: rename i830_display_video to i830_display_overlay
This function only programs the overlay and is never called for textured
video. Make this obvious.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 9e7eef13..f4a2663f 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2060,7 +2060,7 @@ i830_update_scaling_factors(I830OverlayRegPtr overlay, } static void -i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, int id, short width, short height, int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, short src_w, short src_h, short drw_w, short drw_h) @@ -2071,7 +2071,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, int planar; uint32_t swidth, swidthsw, sheigth; int tmp; - Bool scaleChanged = FALSE; + Bool scaleChanged; OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height, dstPitch); @@ -2536,7 +2536,7 @@ I830PutImage(ScrnInfoPtr pScrn, } if (!pPriv->textured) { - i830_display_video(pScrn, crtc, destId, width, height, dstPitch, + i830_display_overlay(pScrn, crtc, destId, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h); @@ -2881,7 +2881,7 @@ I830DisplaySurface(XF86SurfacePtr surface, if (!pI830Priv->textured && pI830->overlayOn && pI830Priv->doubleBuffer) pI830Priv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20); - i830_display_video(pScrn, crtc, surface->id, surface->width, surface->height, + i830_display_overlay(pScrn, crtc, surface->id, surface->width, surface->height, surface->pitches[0], x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h); |