summaryrefslogtreecommitdiff
path: root/src/i830_video.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2009-12-01 14:32:30 +0100
committerEric Anholt <eric@anholt.net>2010-01-07 10:25:07 -0800
commitce6526b9b4df304ccd83a0a02a95621300dbaed3 (patch)
treeaf03a730ee408f86f2c0f4437321b1c32c175949 /src/i830_video.c
parentcf74caaa91667457bba3583b216dfc157d09f39e (diff)
Xv: kill unnecessary parameters for hw PutImage functions
This is the first part of my small crusade to rip out x1, x2, y1, y2 from I830PutImage*. These variables have strange semantics (they change from simple integers to fixed-point values somewhere in the middle) and don't really seem to be what we actually need. 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.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index aa3a604b..c0783993 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -261,7 +261,7 @@ static void drmmode_overlay_off(ScrnInfoPtr scrn)
static Bool
drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
int id, short width, short height,
- int dstPitch, int x1, int y1, int x2, int y2,
+ int dstPitch,
BoxPtr dstBox, short src_w, short src_h, short drw_w,
short drw_h)
{
@@ -1168,7 +1168,7 @@ static int xvmc_passthrough(int id)
static Bool
i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
int id, short width, short height,
- int dstPitch, int x1, int y1, int x2, int y2,
+ int dstPitch,
BoxPtr dstBox, short src_w, short src_h, short drw_w,
short drw_h)
{
@@ -1201,7 +1201,7 @@ i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
}
return drmmode_overlay_put_image(scrn, crtc, id, width, height,
- dstPitch, x1, y1, x2, y2, dstBox,
+ dstPitch, dstBox,
src_w, src_h, drw_w, drw_h);
}
@@ -1565,13 +1565,13 @@ I830PutImageTextured(ScrnInfoPtr scrn,
if (IS_I965G(intel)) {
I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
- width, height, dstPitch, x1,
- y1, x2, y2, src_w, src_h,
+ width, height, dstPitch,
+ src_w, src_h,
drw_w, drw_h, pixmap);
} else {
I915DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
width, height, dstPitch,
- dstPitch2, x1, y1, x2, y2,
+ dstPitch2,
src_w, src_h, drw_w, drw_h,
pixmap);
}
@@ -1648,7 +1648,7 @@ I830PutImageOverlay(ScrnInfoPtr scrn,
return BadAlloc;
if (!i830_display_overlay
- (scrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2,
+ (scrn, crtc, id, width, height, dstPitch,
&dstBox, src_w, src_h, drw_w, drw_h))
return BadAlloc;