summaryrefslogtreecommitdiff
path: root/src/sna/gen5_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-17 09:41:47 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-12-17 12:02:41 +0000
commit7a4d1136bd09bfd4d2657c0b1b64d553eeb6ed4f (patch)
tree1ff14694e334e5088d05a706208f06441e50af96 /src/sna/gen5_render.c
parentdfe9d18f9f97a77ceeb410307010424c789c8bd1 (diff)
sna/video: Pass along the video source offset
Fortunately nobody had yet noticed that all videos were assumed to play with a matching src/dst origin. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen5_render.c')
-rw-r--r--src/sna/gen5_render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 9b779b67..9b388786 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1604,7 +1604,6 @@ static void gen5_video_bind_surfaces(struct sna *sna,
int n_src, n;
uint16_t offset;
-
src_surf_base[0] = 0;
src_surf_base[1] = 0;
src_surf_base[2] = frame->VBufOffset;
@@ -1665,6 +1664,7 @@ gen5_render_video(struct sna *sna,
RegionPtr dstRegion,
short src_w, short src_h,
short drw_w, short drw_h,
+ short dx, short dy,
PixmapPtr pixmap)
{
struct sna_composite_op tmp;
@@ -1722,8 +1722,8 @@ gen5_render_video(struct sna *sna,
pix_yoff = 0;
#endif
- dxo = dstRegion->extents.x1;
- dyo = dstRegion->extents.y1;
+ dxo = dstRegion->extents.x1 + dx;
+ dyo = dstRegion->extents.y1 + dy;
/* Use normalized texture coordinates */
src_scale_x = ((float)src_w / frame->width) / (float)drw_w;