Merge branch 'gles2-2'

Conflicts:
	src/mesa/drivers/dri/common/dri_util.h

diff --cc configs/autoconf.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc include/GL/internal/dri_interface.h
Simple merge

diff --cc src/egl/drivers/dri2/egl_dri2.c
Simple merge

diff --cc src/mesa/drivers/dri/common/dri_util.c
index d2ffa5da6427ee11cf40d75168abd0c570d65835,e08005f90b9a198c5d6b950fe57db9a07bc27fac..360c5247548583ce1b4458e27cb5302b539bb58e
--- 1/src/mesa/drivers/dri/common/dri_util.c
--- 2/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@@ -863,15 -861,10 +913,17 @@@ const __DRIdri2Extension driDRI2Extensi
      dri2CreateNewScreen,
      dri2CreateNewDrawable,
      dri2CreateNewContext,
+     dri2GetAPIMask,
+     dri2CreateNewContextForAPI
  };
  
 +const __DRI2configQueryExtension dri2ConfigQueryExtension = {
 +   { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
 +   dri2ConfigQueryb,
 +   dri2ConfigQueryi,
 +   dri2ConfigQueryf,
 +};
 +
  static int
  driFrameTracking(__DRIdrawable *drawable, GLboolean enable)
  {

diff --cc src/mesa/drivers/dri/common/dri_util.h
index 0fe6f1e246ce98d78b3fc97c5c42b19d21fd229d,4b7cd414b8f7896e451d60e41d6a02b2f4c0e63e..ab6c6e57afc1d6f9e007d873dc9c40d85f6ee44b
--- 1/src/mesa/drivers/dri/common/dri_util.h
--- 2/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@@ -51,8 -51,8 +51,9 @@@
  #include <drm.h>
  #include <drm_sarea.h>
  #include <xf86drm.h>
 +#include "xmlconfig.h"
  #include "main/glheader.h"
+ #include "main/mtypes.h"
  #include "GL/internal/glcore.h"
  #include "GL/internal/dri_interface.h"
  
@@@ -530,7 -530,7 +532,8 @@@ struct __DRIscreenRec 
      /* The lock actually in use, old sarea or DRI2 */
      drmLock *lock;
  
 +    driOptionCache optionCache;
+    unsigned int api_mask;
  };
  
  extern void

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

diff --cc src/mesa/drivers/dri/r600/r600_context.c
Simple merge

diff --cc src/mesa/main/dlist.c
Simple merge

diff --cc src/mesa/main/enums.c
Simple merge

diff --cc src/mesa/main/shaders.c
Simple merge

diff --cc src/mesa/main/teximage.c
Simple merge