mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/i915/intel_context.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 159ecba4b335f09cb9345c67f48187db796f8955 (from e798d22556e0281240b448d5a0baa0ba9a68e134)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Apr 10 11:05:17 2007 +0200

    i915: Bring test for vsync to pipe B in line with i915tex.

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 4db4edd..d201fcf 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -569,7 +569,7 @@ void intelWindowMoved( intelContextPtr i
 	 GLint areaB = driIntersectArea( drw_rect, pipeB_rect );
 	 GLuint flags = intel->vblank_flags;
 
-	 if (areaB > areaA || (areaA > 0 && areaB > 0)) {
+	 if (areaB > areaA || (areaA == areaB && areaB > 0)) {
 	    flags = intel->vblank_flags | VBLANK_FLAG_SECONDARY;
 	 } else {
 	    flags = intel->vblank_flags & ~VBLANK_FLAG_SECONDARY;