All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allows

1,402 lines of code to be removed from Mesa (drivers and libGL).  The
big winner is dri_util.c.

Primary changes are:

1. Remove all "deprecated" entry-points from the various structures in
dri_interface.h.

2. Rename the remaining fields to removed "version numbers."  So,
bindContext3 becomes bindContext.  Functions with "New" in the name
(e.g., CreateNewContext) were *not* changed, but that is an option.
Having "New" in the name is less annoying to me than having "3" in the name.

3. Remove all compatibility code that handles cases where the driver or
the loader is too old to support the latest interfaces.

4. Append the API version to the __driCreateNewScreen function name.
This is currently done by hand.  In the future (i.e., the next time we
make an incompatible change to the interface) we'll want to come up with
a better way to do this.  This prevents old loaders from being able to load
new (incompatible) drivers.

5. Bump the API version to 20050722.  All drivers (by way of dri_util.c)
require this version.

6. All drivers are *required* to expose GLX_SGIX_fbconfig and
GLX_OML_swap_method (or the moral equivalents).  Support for these
functions in implicit in the use of the "new" interface.

7. Some cases still exist that need to be compiled differently in a loader
or core Mesa versus in a driver.  These are identified by the define
IN_DRI_DRIVER.

1 files changed, 4 insertions, 73 deletions

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 9c430469b29..3a704f6a72e 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -248,25 +248,6 @@ struct __DRIscreenRec {
     void (*destroyScreen)(__DRInativeDisplay *dpy, int scrn, void *screenPrivate);
 
     /**
-     * Method to create the private DRI context data and initialize the
-     * context dependent methods.
-     *
-     * \sa __DRIscreenRec::createNewContext driCreateContext 
-     *     driCreateNewContext
-     *
-     * \deprecated
-     * This function has been replaced by \c __DRIscreenRec::createNewContext.
-     * New drivers will continue to export this method, but it will eventually
-     * (in the next XFree86 major relearse) go away.
-     */
-#ifndef DRI_NEW_INTERFACE_ONLY
-    void *(*createContext)(Display *dpy, XVisualInfo *vis, void *sharedPrivate,
-			   __DRIcontext *pctx);
-#else
-    void * createContext;
-#endif /* DRI_NEW_INTERFACE_ONLY */
-
-    /**
      * Method to create the private DRI drawable data and initialize the
      * drawable dependent methods.
      */
@@ -342,30 +323,6 @@ struct __DRIcontextRec {
     void (*destroyContext)(__DRInativeDisplay *dpy, int scrn, void *contextPrivate);
 
     /**
-     * Method to bind a DRI drawable to a DRI graphics context.
-     *
-     * \deprecated Replaced by bindContext3.
-     */
-#ifndef DRI_NEW_INTERFACE_ONLY
-    Bool (*bindContext)(Display *dpy, int scrn, GLXDrawable draw,
-			GLXContext gc);
-#else
-    void *bindContext;
-#endif /* DRI_NEW_INTERFACE_ONLY */
-
-    /**
-     * Method to unbind a DRI drawable to a DRI graphics context.
-     *
-     * \deprecated Replaced by unbindContext3.
-     */
-#ifndef DRI_NEW_INTERFACE_ONLY
-    Bool (*unbindContext)(Display *dpy, int scrn, GLXDrawable draw,
-			  GLXContext gc, int will_rebind);
-#else
-    void *unbindContext;
-#endif /* DRI_NEW_INTERFACE_ONLY */
-
-    /**
      * Opaque pointer to private per context direct rendering data.
      * \c NULL if direct rendering is not supported on the display or
      * screen used to create this context.  Never dereferenced in libGL.
@@ -373,32 +330,6 @@ struct __DRIcontextRec {
     void *private;
 
     /**
-     * Method to bind a DRI drawable to a DRI graphics context.
-     *
-     * \since Internal API version 20030606.
-     * \deprecated Replaced by bindContext3.
-     */
-#ifndef DRI_NEW_INTERFACE_ONLY
-    Bool (*bindContext2)(Display *dpy, int scrn, GLXDrawable draw,
-			 GLXDrawable read, GLXContext gc);
-#else
-    void *bindContext2;
-#endif /* DRI_NEW_INTERFACE_ONLY */
-
-    /**
-     * Method to unbind a DRI drawable from a DRI graphics context.
-     *
-     * \since Internal API version 20030606.
-     * \deprecated Replaced by unbindContext3.
-     */
-#ifndef DRI_NEW_INTERFACE_ONLY
-    Bool (*unbindContext2)(Display *dpy, int scrn, GLXDrawable draw,
-			   GLXDrawable read, GLXContext gc);
-#else
-    void *unbindContext2;
-#endif /* DRI_NEW_INTERFACE_ONLY */
-
-    /**
      * Pointer to the mode used to create this context.
      *
      * \since Internal API version 20040317.
@@ -408,17 +339,17 @@ struct __DRIcontextRec {
     /**
      * Method to bind a DRI drawable to a DRI graphics context.
      *
-     * \since Internal API version 20040415.
+     * \since Internal API version 20050722.
      */
-    GLboolean (*bindContext3)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
+    GLboolean (*bindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
 			 __DRIid read, __DRIcontext *ctx);
 
     /**
      * Method to unbind a DRI drawable from a DRI graphics context.
      *
-     * \since Internal API version 20040415.
+     * \since Internal API version 20050722.
      */
-    GLboolean (*unbindContext3)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
+    GLboolean (*unbindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
 			   __DRIid read, __DRIcontext *ctx);
 };