[Intel-gfx] [PATCH 3/7] Xv: kill unnecessary parameters for hw PutImage functions

[Daniel Vetter]

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 at ffwll.ch>
---
 src/i830_video.c |   14 +++++++-------
 src/i830_video.h |    2 --
 src/i915_video.c |    2 +-
 src/i965_video.c |    1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/i830_video.c b/src/i830_video.c
index e79933a..bab8687 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -269,7 +269,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)
 {
@@ -1180,7 +1180,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)
 {
@@ -1213,7 +1213,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);
 }
 
@@ -1575,13 +1575,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);
 	}
@@ -1658,7 +1658,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;
 
diff --git a/src/i830_video.h b/src/i830_video.h
index 8bb536c..fcdae73 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -70,7 +70,6 @@ void I915DisplayVideoTextured(ScrnInfoPtr scrn,
 			      intel_adaptor_private *adaptor_priv,
 			      int id, RegionPtr dstRegion, short width,
 			      short height, int video_pitch, int video_pitch2,
-			      int x1, int y1, int x2, int y2,
 			      short src_w, short src_h,
 			      short drw_w, short drw_h, PixmapPtr pixmap);
 
@@ -78,7 +77,6 @@ void I965DisplayVideoTextured(ScrnInfoPtr scrn,
 			      intel_adaptor_private *adaptor_priv,
 			      int id, RegionPtr dstRegion, short width,
 			      short height, int video_pitch,
-			      int x1, int y1, int x2, int y2,
 			      short src_w, short src_h,
 			      short drw_w, short drw_h, PixmapPtr pixmap);
 
diff --git a/src/i915_video.c b/src/i915_video.c
index 4e4ec03..927047b 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -44,7 +44,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn,
 			 intel_adaptor_private *adaptor_priv, int id,
 			 RegionPtr dstRegion,
 			 short width, short height, int video_pitch,
-			 int video_pitch2, int x1, int y1, int x2, int y2,
+			 int video_pitch2,
 			 short src_w, short src_h, short drw_w, short drw_h,
 			 PixmapPtr pixmap)
 {
diff --git a/src/i965_video.c b/src/i965_video.c
index 6225aa4..a0dab98 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -981,7 +981,6 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn,
 			 intel_adaptor_private *adaptor_priv, int id,
 			 RegionPtr dstRegion,
 			 short width, short height, int video_pitch,
-			 int x1, int y1, int x2, int y2,
 			 short src_w, short src_h,
 			 short drw_w, short drw_h, PixmapPtr pixmap)
 {
-- 
1.6.5.3