summaryrefslogtreecommitdiff
path: root/include/GL
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-07-26 05:57:24 +0000
committerIan Romanick <idr@us.ibm.com>2005-07-26 05:57:24 +0000
commit5c6fd3dd4c1b8e95c4da8cc4a52aa310ad324d45 (patch)
tree17957896f7bcf4f45b4e8d8bc2a75537df433c30 /include/GL
parenta08d8a095c117bd845418401dc754851e6187aa4 (diff)
No, really, get rid of all the remaining references to DRI_USE_NEW_INTERFACE.
A couple other remnants of the old interfaces hit the dust too. Thanks Jon. :)
Diffstat (limited to 'include/GL')
-rw-r--r--include/GL/internal/dri_interface.h27
1 files changed, 4 insertions, 23 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 1b1aeba55f9..08d3844266c 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -38,7 +38,7 @@
#ifndef DRI_INTERFACE_H
#define DRI_INTERFACE_H
-#ifndef DRI_NEW_INTERFACE_ONLY
+#if 0 /*ndef DRI_NEW_INTERFACE_ONLY*/
# include <X11/X.h>
# include <GL/glx.h>
# include "GL/glxint.h"
@@ -72,10 +72,6 @@ typedef void __DRInativeDisplay;
* \name Functions provided by the driver loader.
*/
/*@{*/
-extern __DRIscreen *__glXFindDRIScreen(__DRInativeDisplay *dpy, int scrn);
-
-
-
/**
* Type of a pointer to \c glXGetScreenDriver, as returned by
* \c glXGetProcAddress. This function is used to get the name of the DRI
@@ -96,26 +92,11 @@ typedef const char * (* PFNGLXGETSCREENDRIVERPROC) (__DRInativeDisplay *dpy, int
typedef const char * (* PFNGLXGETDRIVERCONFIGPROC) (const char *driverName);
/**
- * Type of a pointer to \c __glXScrEnableExtension, as returned by
- * \c glXGetProcAddress. This function is used to enable a GLX extension
- * on the specified screen.
- *
- * \sa __glXScrEnableExtension, glXGetProcAddress
+ * Type of a pointer to \c glxEnableExtension, as returned by
+ * \c __DRIinterfaceMethods::getProcAddress. This function is used to enable
+ * a GLX extension on the specified screen.
*/
typedef void (* PFNGLXSCRENABLEEXTENSIONPROC) ( void *psc, const char * name );
-
-
-/* Test for the xf86dri.h header file */
-#ifndef _XF86DRI_H_
-extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
- __DRIid context_id );
-
-extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
- __DRIid drawable, drm_drawable_t *hHWDrawable );
-
-extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen,
- __DRIid drawable);
-#endif
/*@}*/