summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-04-19 01:40:00 +0000
committerBrian Paul <[email protected]>2000-04-19 01:40:00 +0000
commit353479fa8a63aebc21825ad614115b7b5434fe0d (patch)
tree5082181cd65b8662adb7946fb55ddf62dc713fe0 /include
parentc397a6b28351ad97f996f913cfe9266b9f9096f6 (diff)
added GLX_EXT_import_context, 1.3 misc clean-up
Diffstat (limited to 'include')
-rw-r--r--include/GL/glx.h28
1 files changed, 25 insertions, 3 deletions
diff --git a/include/GL/glx.h b/include/GL/glx.h
index e9f8cbf50f5..ead38a91a05 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.19 2000/04/10 21:12:20 brianp Exp $ */
+/* $Id: glx.h,v 1.20 2000/04/19 01:40:00 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -108,8 +108,6 @@ extern "C" {
/*
* GLX 1.3 and later:
- * XXX don't know the values of some of these enums!
- * XXX some 1.3 enums may be missing!
*/
#define GLX_CONFIG_CAVEAT 0x20
#define GLX_DONT_CARE 0xFFFFFFFF
@@ -194,10 +192,19 @@ extern "C" {
/*
+ * 47. GLX_EXT_import_context
+ */
+#define GLX_SHARE_CONTEXT_EXT 0x800A
+#define GLX_VISUAL_ID_EXT 0x800B
+#define GLX_SCREEN_EXT 0x800C
+
+
+/*
* Compile-time extension tests
*/
#define GLX_EXT_visual_info 1
#define GLX_EXT_visual_rating 1
+#define GLX_EXT_import_context 1
#define GLX_MESA_pixmap_colormap 1
#define GLX_MESA_release_buffers 1
#define GLX_MESA_copy_sub_buffer 1
@@ -355,6 +362,21 @@ extern int glXWaitVideoSyncSGI(int divisor, int remainder,
unsigned int *count);
+
+/* GLX_EXT_import_context */
+extern void glXFreeContextEXT(Display *dpy, GLXContext context);
+
+extern GLXContextID glXGetContextIDEXT(const GLXContext context);
+
+extern Display *glXGetCurrentDisplayEXT(void);
+
+extern GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID);
+
+extern int glXQueryContextInfoEXT(Display *dpy, GLXContext context,
+ int attribute,int *value);
+
+
+
/* GLX_ARB_get_proc_address */
extern void (*glXGetProcAddressARB(const GLubyte *procName))();