summaryrefslogtreecommitdiff
path: root/include/GL/internal
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-06-02 17:37:09 +0000
committerIan Romanick <idr@us.ibm.com>2004-06-02 17:37:09 +0000
commit318aa8409983f3292b4919196df2ca42f4de6a16 (patch)
treef48b7119722dd727a101b976303987c0eb36480d /include/GL/internal
parent9fcb9c3ac7adb7eaa37a8da4e741ce99dcd651a2 (diff)
XF86DRIDestroyContext, XF86DRICreateDrawable, and
XF86DRIDestroyDrawable are all called directly from DRI drivers using the new interface. Therefore, prototypes, using available datatypes, must be available in dri_interface.h. Since the prototypes are available there, xf86dri.h is no longer needed for DRI_NEW_INTERFACE_ONLY builds.
Diffstat (limited to 'include/GL/internal')
-rw-r--r--include/GL/internal/dri_interface.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 977a822859..be0496f6bc 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -39,13 +39,9 @@
#define DRI_INTERFACE_H
#ifndef DRI_NEW_INTERFACE_ONLY
-/* FIXME: With a small amount of work, these two includes can be removed. */
-#include <X11/Xlib.h>
-#include <GL/glx.h>
-#endif
-
-#ifndef DRI_NEW_INTERFACE_ONLY
-#include <GL/glxint.h>
+# include <X11/X.h>
+# include <GL/glx.h>
+# include "GL/glxint.h"
#endif
#include <GL/internal/glcore.h>
@@ -152,6 +148,15 @@ typedef Bool (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int scrn,
int * numClipRects, drm_clip_rect_t ** pClipRects,
int * backX, int * backY,
int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
+
+extern Bool XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
+ __DRIid context_id );
+
+extern Bool XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
+ __DRIid drawable, drm_drawable_t *hHWDrawable );
+
+extern Bool XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen,
+ __DRIid drawable);
/*@}*/