Merge branch 'master' into glsl2

[mesa.git] / src / glx / dri_common.h

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index f3da50ecf093e8b2d8ac2936b5b3d0761e920534..846a905a88037fa56214c78ea4f08c12ae8ead21 100644 (file)
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -42,16 +42,19 @@ typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
 
 struct __GLXDRIconfigPrivateRec
 {
-   __GLcontextModes modes;
+   struct glx_config base;
    const __DRIconfig *driConfig;
 };
 
-extern __GLcontextModes *driConvertConfigs(const __DRIcoreExtension * core,
-                                           __GLcontextModes * modes,
+extern struct glx_config *driConvertConfigs(const __DRIcoreExtension * core,
+                                           struct glx_config * modes,
                                            const __DRIconfig ** configs);
 
 extern void driDestroyConfigs(const __DRIconfig **configs);
 
+extern __GLXDRIdrawable *
+driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable);
+
 extern const __DRIsystemTimeExtension systemTimeExtension;
 
 extern void InfoMessageF(const char *f, ...);