From dce8b028cd5b249054e8197a536c29f6ba4110da Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 4 Mar 2010 17:13:53 +0000
Subject: [PATCH] drm/i915: Adjust clip matrix for clip origin.

---
 src/drm/cairo-drm-i915-shader.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c
index 5bd3ff208..5f2b55ae8 100644
--- a/src/drm/cairo-drm-i915-shader.c
+++ b/src/drm/cairo-drm-i915-shader.c
@@ -2407,14 +2407,13 @@ i915_shader_set_clip (i915_shader_t *shader,
 	SS3_NORMALIZED_COORDS |
 	i915_texture_extend (CAIRO_EXTEND_NONE);
 
+    clip_extents = _cairo_clip_get_extents (clip);
     cairo_matrix_init_scale (&shader->clip.base.matrix,
 			     1. / s->intel.drm.width,
 			     1. / s->intel.drm.height);
-
-    clip_extents = _cairo_clip_get_extents (clip);
     cairo_matrix_translate (&shader->clip.base.matrix,
-			    NEAREST_BIAS + clip_extents->x,
-			    NEAREST_BIAS + clip_extents->y);
+			    NEAREST_BIAS - clip_extents->x,
+			    NEAREST_BIAS - clip_extents->y);
 }
 
 static cairo_status_t
@@ -2534,7 +2533,6 @@ i915_shader_setup_dst (i915_shader_t *shader)
     cairo_matrix_init_scale (&shader->dst.base.matrix,
 			     1. / s->intel.drm.width,
 			     1. / s->intel.drm.height);
-
     cairo_matrix_translate (&shader->dst.base.matrix,
 			    NEAREST_BIAS,
 			    NEAREST_BIAS);