Second stage of mesa-4 merge.

3 files changed, 29 insertions, 12 deletions

diff --git a/include/GL/Imakefile b/include/GL/Imakefile
index 7283a627a..057df659c 100644
--- a/include/GL/Imakefile
+++ b/include/GL/Imakefile
@@ -1,11 +1,12 @@
-XCOMM $XFree86: xc/include/GL/Imakefile,v 1.12 2001/03/22 21:48:52 dawes Exp $
+XCOMM $XFree86: xc/include/GL/Imakefile,v 1.13 2001/04/30 14:58:48 dawes Exp $
 
 LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
 LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
+LinkSourceFile(glxext.h, ../../extras/Mesa/include/GL)
 LinkSourceFile(osmesa.h, ../../extras/Mesa/include/GL)
 
 GLXHEADERS = gl.h glext.h glu.h glx.h glxint.h glxmd.h glxproto.h \
-	     glxtokens.h osmesa.h
+	     glxtokens.h osmesa.h glxext.h
 
 HEADERS = $(GLXHEADERS)
 
diff --git a/include/GL/glx.h b/include/GL/glx.h
index c8d040987..95bcaba4a 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glx_h__
 #define __GLX_glx_h__
 
-/* $XFree86: xc/include/GL/glx.h,v 1.7 2000/06/30 18:27:00 dawes Exp $ */
+/* $XFree86: xc/include/GL/glx.h,v 1.8 2001/03/21 15:51:38 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -108,15 +108,30 @@ extern int glXQueryContext (Display *dpy, GLXContext ctx, int attribute, int *va
 extern void glXSelectEvent (Display *dpy, GLXDrawable draw, unsigned long event_mask);
 extern void glXGetSelectedEvent (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
 
-/*** SGI GLX extensions */
+/* GLX 1.4 and later */
+extern void (*glXGetProcAddress(const GLubyte *procname))();
+
+
+#ifndef GLX_GLXEXT_LEGACY
+
+#include <GL/glxext.h>
+
+#else
+
+/* GLX extensions */
+#define GLX_EXT_import_context	1
+#define GLX_EXT_visual_info	1
+#define GLX_EXT_visual_rating	1
+#define GLX_ARB_get_proc_address 1
 extern GLXContextID glXGetContextIDEXT (const GLXContext ctx);
-extern GLXDrawable glXGetCurrentDrawableEXT (void);
 extern GLXContext glXImportContextEXT (Display *dpy, GLXContextID contextID);
 extern void glXFreeContextEXT (Display *dpy, GLXContext ctx);
 extern int glXQueryContextInfoEXT (Display *dpy, GLXContext ctx, int attribute, int *value);
-
+extern Display * glXGetCurrentDisplayEXT (void);
 extern void (*glXGetProcAddressARB(const GLubyte *procName))( void );
 
+#endif /* GLX_GLXEXT_LEGACY */
+
 /*** Should these go here, or in another header? */
 /*
 ** GLX Events
diff --git a/include/GL/glxtokens.h b/include/GL/glxtokens.h
index 298397bc8..e30c579b3 100644
--- a/include/GL/glxtokens.h
+++ b/include/GL/glxtokens.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glxtokens_h__
 #define __GLX_glxtokens_h__
 
-/* $XFree86: xc/include/GL/glxtokens.h,v 1.4 2000/06/17 00:02:46 martin Exp $ */
+/* $XFree86: xc/include/GL/glxtokens.h,v 1.5 2001/03/21 15:51:38 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -43,6 +43,7 @@ extern "C" {
 #define GLX_VERSION_1_1 1
 #define GLX_VERSION_1_2 1
 #define GLX_VERSION_1_3 1
+#define GLX_VERSION_1_4 1
 
 /*
 ** Visual Config Attributes (glXGetConfig, glXGetFBConfigAttrib)
@@ -217,11 +218,11 @@ extern "C" {
 #define GLX_VISUAL_ID_EXT	0x800B	/* id of context's visual */
 #define GLX_SCREEN_EXT		0x800C	/* screen number */
 
-/* GLX Extension Strings */
-#define GLX_EXT_import_context	1
-#define GLX_EXT_visual_info	1
-#define GLX_EXT_visual_rating	1
-#define GLX_ARB_get_proc_address 1
+/*
+ * GLX 1.4 and later:
+ */
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
 
 #ifdef __cplusplus
 }