xf86-video-intel: 2 commits - src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit a53538659d5e18cb5a7a7a7dbd460f35985183fd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 25 12:40:01 2011 +0100

    sna/accel: Fix s/x/y/ typo in computing relative drawing coordinates
    
    Reported-by:Roman Jarosz <kedgedev at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41165
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index aefb731..55dd2cd 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1826,7 +1826,7 @@ sna_poly_point_blt(DrawablePtr drawable,
 		pt++;
 		if (mode == CoordModePrevious) {
 			x += last.x;
-			y += last.x;
+			y += last.y;
 			last.x = x;
 			last.y = y;
 		} else {
@@ -1992,7 +1992,7 @@ sna_poly_line_blt(DrawablePtr drawable,
 		pt++;
 		if (mode == CoordModePrevious) {
 			x += last.x;
-			y += last.x;
+			y += last.y;
 		} else {
 			x += drawable->x;
 			y += drawable->y;
commit 960688d1684dd062c345aa8df1ff4f105015f467
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 25 12:23:10 2011 +0100

    sna/accel: Debug option to force CPU fallbacks
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 4c9ef7b..aefb731 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -55,6 +55,7 @@
 #endif
 
 #define FORCE_GPU_ONLY 0
+#define FORCE_FALLBACK 0
 
 DevPrivateKeyRec sna_pixmap_index;
 
@@ -1668,6 +1669,9 @@ sna_fill_spans(DrawablePtr drawable, GCPtr gc, int n,
 	DBG(("%s: extents (%d, %d), (%d, %d)\n", __FUNCTION__,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
+	if (FORCE_FALLBACK)
+		goto fallback;
+
 	if (sna->kgem.wedged) {
 		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
@@ -1889,6 +1893,9 @@ sna_poly_point(DrawablePtr drawable, GCPtr gc,
 	DBG(("%s: extents (%d, %d), (%d, %d)\n", __FUNCTION__,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
+	if (FORCE_FALLBACK)
+		goto fallback;
+
 	if (sna->kgem.wedged) {
 		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
@@ -2108,6 +2115,9 @@ sna_poly_line(DrawablePtr drawable, GCPtr gc,
 	DBG(("%s: extents (%d, %d), (%d, %d)\n", __FUNCTION__,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
+	if (FORCE_FALLBACK)
+		goto fallback;
+
 	if (sna->kgem.wedged) {
 		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
@@ -2321,6 +2331,9 @@ sna_poly_segment(DrawablePtr drawable, GCPtr gc, int n, xSegment *seg)
 	DBG(("%s: extents=(%d, %d), (%d, %d)\n", __FUNCTION__,
 	     extents.x1, extents.y1, extents.x2, extents.y2));
 
+	if (FORCE_FALLBACK)
+		goto fallback;
+
 	if (sna->kgem.wedged) {
 		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;
@@ -2811,6 +2824,9 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
 		return;
 	}
 
+	if (FORCE_FALLBACK)
+		goto fallback;
+
 	if (sna->kgem.wedged) {
 		DBG(("%s: fallback -- wedged\n", __FUNCTION__));
 		goto fallback;