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

[Chris Wilson]

 src/sna/gen2_render.c |    2 ++
 src/sna/sna_dri.c     |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ba1dea5e373b8d7b410c07df897acc4d11079f63
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Oct 1 11:19:41 2012 +0100

    sna/gen2: Clear STIPPLE setup before rendering with the 3D pipeline
    
    One over-zealous removal too many.
    
    Reported-by: Timo Kamph <timo at kamph.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55455
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index ca61bd3..d7980d4 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -503,6 +503,8 @@ static void gen2_emit_invariant(struct sna *sna)
 	      ENABLE_COLOR_WRITE |
 	      ENABLE_TEX_CACHE);
 
+	BATCH(_3DSTATE_STIPPLE);
+
 	sna->render_state.gen2.need_invariant = false;
 }
 
commit eec12faf82370a8540114287c224953aa66d7bd9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 30 18:39:06 2012 +0100

    sna/dri: Check back/front buffers of a pixmap for format change
    
    Highly unlikely.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 4dc9647..69c1b42 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1091,15 +1091,15 @@ can_exchange(struct sna * sna,
 	WindowPtr win = (WindowPtr)draw;
 	PixmapPtr pixmap;
 
-	if (draw->type == DRAWABLE_PIXMAP)
-		return true;
-
 	if (front->format != back->format) {
 		DBG(("%s: no, format mismatch, front = %d, back = %d\n",
 		     __FUNCTION__, front->format, back->format));
 		return false;
 	}
 
+	if (draw->type == DRAWABLE_PIXMAP)
+		return true;
+
 	pixmap = get_window_pixmap(win);
 	if (pixmap == sna->front) {
 		DBG(("%s: no, window is attached to the front buffer\n",