From: Kristian Høgsberg <krh@bitplanet.net>
Date: Sun, 2 May 2010 14:17:07 +0000 (-0400)
Subject: Merge branch 'gles2-2'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0870e4a2022cff79805613ae7cd4b9237a2f564c;p=mesa.git

Merge branch 'gles2-2'

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

0870e4a2022cff79805613ae7cd4b9237a2f564c
diff --cc src/mesa/drivers/dri/common/dri_util.c
index d2ffa5da642,e08005f90b9..360c5247548
--- a/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 0fe6f1e246c,4b7cd414b8f..ab6c6e57afc
--- a/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