mesa: Branch 'master'

[Nan hai Zou]

 src/mesa/drivers/dri/i965/intel_context.c |    9 +++++++++
 1 files changed, 9 insertions(+)

New commits:
diff-tree 844e5610de6ffe6966072d120b50db541ea85104 (from bdc5394d22d7bc1215c9a38f735a419c9063ab05)
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Wed Jan 24 16:07:43 2007 +0800

    965 glxswapcontrol fix

diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 388600d..f7ab7d3 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -61,6 +61,7 @@
 #include "bufmgr.h"
 
 #include "utils.h"
+#include "vblank.h"
 #ifndef INTEL_DEBUG
 int INTEL_DEBUG = (0);
 #endif
@@ -336,6 +337,11 @@ GLboolean intelInitContext( struct intel
    intel->driScreen = sPriv;
    intel->sarea = saPriv;
 
+   driParseConfigFiles (&intel->optionCache, &intelScreen->optionCache,
+		   intel->driScreen->myNum, "i965");
+
+   intel->vblank_flags = (intel->intelScreen->irq_active != 0)
+	   ? driGetDefaultVBlankFlags(&intel->optionCache) : VBLANK_FLAG_NO_IRQ;
 
    ctx->Const.MaxTextureMaxAnisotropy = 2.0;
 
@@ -563,6 +569,9 @@ GLboolean intelMakeCurrent(__DRIcontextP
 
       if ( intel->driDrawable != driDrawPriv ) {
 	 /* Shouldn't the readbuffer be stored also? */
+	 driDrawableInitVBlank( driDrawPriv, intel->vblank_flags,
+		      &intel->vbl_seq );
+
 	 intel->driDrawable = driDrawPriv;
 	 intelWindowMoved( intel );
       }