Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa

Conflicts due to DRI1 removal:
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_screen.c

diff --cc configure.ac
Simple merge

diff --cc progs/xdemos/glsync.c
Simple merge

diff --cc src/glx/x11/dri_glx.c
Simple merge

diff --cc src/glx/x11/glxcmds.c
Simple merge

diff --cc src/mesa/drivers/dri/common/dri_util.c
Simple merge

diff --cc src/mesa/drivers/dri/common/dri_util.h
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_context.h
index c7b72358362be7134cfb9108033e3e0884e35af1,61d0be3a5b02848e413b3b22b312a4c1e8f75bc1..07207bfbec97421292fd21352af143644b90fcb4
--- 1/src/mesa/drivers/dri/intel/intel_context.h
--- 2/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@@ -410,8 -443,11 +410,9 @@@ extern GLboolean intelInitContext(struc
                                    void *sharedContextPrivate,
                                    struct dd_function_table *functions);
  
 -extern void intelGetLock(struct intel_context *intel, GLuint flags);
 -
  extern void intelFinish(GLcontext * ctx);
  extern void intelFlush(GLcontext * ctx);
+ extern void intel_flush(GLcontext * ctx, GLboolean needs_mi_flush);
  
  extern void intelInitDriverFunctions(struct dd_function_table *functions);
  

diff --cc src/mesa/drivers/dri/intel/intel_screen.c
index 5165716e092878ad93cf5b5388ea81527eab67dc,8251e91ace770dc6bb0eb1596c0f28b63d1a0ed0..e240957197d5fb596d9a5ec32bc3768b363d0931
--- 1/src/mesa/drivers/dri/intel/intel_screen.c
--- 2/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@@ -113,10 -236,40 +113,36 @@@ static const __DRItexBufferExtension in
     intelSetTexBuffer2,
  };
  
+ static void
+ intelDRI2Flush(__DRIdrawable *drawable)
+ {
+    struct intel_context *intel = drawable->driContextPriv->driverPrivate;
+ 
+    if (intel->gen < 4)
+       INTEL_FIREVERTICES(intel);
+ 
+    if (intel->batch->map != intel->batch->ptr)
+       intel_batchbuffer_flush(intel->batch);
+ }
+ 
+ static void
+ intelDRI2FlushInvalidate(__DRIdrawable *drawable)
+ {
+    intelDRI2Flush(drawable);
+    drawable->validBuffers = GL_FALSE;
+ }
+ 
+ static const struct __DRI2flushExtensionRec intelFlushExtension = {
+     { __DRI2_FLUSH, __DRI2_FLUSH_VERSION },
+     intelDRI2Flush,
+     intelDRI2FlushInvalidate,
+ };
+ 
  static const __DRIextension *intelScreenExtensions[] = {
      &driReadDrawableExtension,
 -    &driCopySubBufferExtension.base,
 -    &driSwapControlExtension.base,
 -    &driFrameTrackingExtension.base,
 -    &driMediaStreamCounterExtension.base,
      &intelTexOffsetExtension.base,
      &intelTexBufferExtension.base,
+     &intelFlushExtension.base,
      NULL
  };
  

diff --cc src/mesa/drivers/dri/intel/intel_tex_image.c
index 307669f87ec780365f672e5a5dacc2b3775db466,a8f7e6c456e9dc3c622a39f09ff4f677184c9550..6f41eafd0ef8b9ac22ef6aec3e214f9e18d8649d
--- 1/src/mesa/drivers/dri/intel/intel_tex_image.c
--- 2/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@@ -742,9 -749,10 +742,10 @@@ intelSetTexBuffer2(__DRIcontext *pDRICt
     if (!intelObj)
        return;
  
-    intel_update_renderbuffers(pDRICtx, dPriv);
+    if (!dPriv->validBuffers)
+       intel_update_renderbuffers(pDRICtx, dPriv);
  
 -   rb = intel_fb->color_rb[0];
 +   rb = intel_get_renderbuffer(fb, BUFFER_FRONT_LEFT);
     /* If the region isn't set, then intel_update_renderbuffers was unable
      * to get the buffers for the drawable.
      */