Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / common / dri_util.h

diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index bc647ff8130f6f74d39034715f682c0c7eb9240d..ffffb99b30147802bdf20320dcbbf0fff08690d2 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -54,7 +54,6 @@
 #include "xmlconfig.h"
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "GL/internal/glcore.h"
 #include "GL/internal/dri_interface.h"
 
 #define GLX_BAD_CONTEXT                    5
@@ -149,7 +148,7 @@ struct __DriverAPIRec {
      * Context creation callback
      */                    
     GLboolean (*CreateContext)(gl_api api,
-                              const __GLcontextModes *glVis,
+                              const struct gl_config *glVis,
                               __DRIcontext *driContextPriv,
                                void *sharedContextPrivate);
 
@@ -163,7 +162,7 @@ struct __DriverAPIRec {
      */
     GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
                               __DRIdrawable *driDrawPriv,
-                              const __GLcontextModes *glVis,
+                              const struct gl_config *glVis,
                               GLboolean pixmapBuffer);
     
     /**
@@ -513,7 +512,11 @@ struct __DRIscreenRec {
      * 
      * This pointer is never touched by the DRI layer.
      */
+#ifdef __cplusplus
+    void *priv;
+#else
     void *private;
+#endif
 
     /* Extensions provided by the loader. */
     const __DRIgetDrawableInfoExtension *getDrawableInfo;
@@ -532,8 +535,10 @@ struct __DRIscreenRec {
     /* The lock actually in use, old sarea or DRI2 */
     drmLock *lock;
 
+    driOptionCache optionInfo;
     driOptionCache optionCache;
    unsigned int api_mask;
+   void *loaderPrivate;
 };
 
 extern void