added missing 1.3 token values, added glXGetFBConfigs(), fixed glXChooseFBConfig()

1 files changed, 41 insertions, 38 deletions

diff --git a/include/GL/glx.h b/include/GL/glx.h
index 16637efb40..e9f8cbf50f 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.18 2000/03/31 14:48:28 brianp Exp $ */
+/* $Id: glx.h,v 1.19 2000/04/10 21:12:20 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -111,10 +111,10 @@ extern "C" {
  * XXX don't know the values of some of these enums!
  * XXX some 1.3 enums may be missing!
  */
-#define GLX_CONFIG_CAVEAT		?
-#define GLX_DONT_CARE			?
-#define GLX_SLOW_CONFIG			?
-#define GLX_NON_CONFORMANT_CONFIG	?
+#define GLX_CONFIG_CAVEAT		0x20
+#define GLX_DONT_CARE			0xFFFFFFFF
+#define GLX_SLOW_CONFIG			0x8001
+#define GLX_NON_CONFORMANT_CONFIG	0x800D
 #define GLX_X_VISUAL_TYPE		0x22
 #define GLX_TRANSPARENT_TYPE		0x23
 #define GLX_TRANSPARENT_INDEX_VALUE	0x24
@@ -122,29 +122,29 @@ extern "C" {
 #define GLX_TRANSPARENT_GREEN_VALUE	0x26
 #define GLX_TRANSPARENT_BLUE_VALUE	0x27
 #define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_MAX_PBUFFER_WIDTH		?
-#define GLX_MAX_PBUFFER_HEIGHT		?
-#define GLX_MAX_PBUFFER_PIXELS		?
-#define GLX_PRESERVED_CONTENTS		?
-#define GLX_LARGEST_BUFFER		?
-#define GLX_DRAWABLE_TYPE		?
-#define GLX_FBCONFIG_ID			?
-#define GLX_VISUAL_ID			?
-#define GLX_WINDOW_BIT			?
-#define GLX_PIXMAP_BIT			?
-#define GLX_PBUFFER_BIT			?
-#define GLX_AUX_BUFFERS_BIT		?
-#define GLX_FRONT_LEFT_BUFFER_BIT	?
-#define GLX_FRONT_RIGHT_BUFFER_BIT	?
-#define GLX_BACK_LEFT_BUFFER_BIT	?
-#define GLX_BACK_RIGHT_BUFFER_BIT	?
-#define GLX_AUX_BUFFERS_BIT		?
-#define GLX_DEPTH_BUFFER_BIT		?
-#define GLX_STENCIL_BUFFER_BIT		?
-#define GLX_ACCUM_BUFFER_BIT		?
-#define GLX_RENDER_TYPE			?
-#define GLX_DRAWABLE_TYPE		?
-#define GLX_X_RENDERABLE		?
+#define GLX_MAX_PBUFFER_WIDTH		0x8016
+#define GLX_MAX_PBUFFER_HEIGHT		0x8017
+#define GLX_MAX_PBUFFER_PIXELS		0x8018
+#define GLX_PRESERVED_CONTENTS		0x801B
+#define GLX_LARGEST_BUFFER		0x801C
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_FBCONFIG_ID			0x8013
+#define GLX_VISUAL_ID			0x800B
+#define GLX_WINDOW_BIT			0x00000001
+#define GLX_PIXMAP_BIT			0x00000002
+#define GLX_PBUFFER_BIT			0x00000004
+#define GLX_AUX_BUFFERS_BIT		0x00000010
+#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
+#define GLX_AUX_BUFFERS_BIT		0x00000010
+#define GLX_DEPTH_BUFFER_BIT		0x00000020
+#define GLX_STENCIL_BUFFER_BIT		0x00000040
+#define GLX_ACCUM_BUFFER_BIT		0x00000080
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_RENDER_TYPE			0x8011
+#define GLX_X_RENDERABLE		0x8012
 #define GLX_NONE			0x8000
 #define GLX_TRUE_COLOR			0x8002
 #define GLX_DIRECT_COLOR		0x8003
@@ -153,14 +153,14 @@ extern "C" {
 #define GLX_GRAY_SCALE			0x8006
 #define GLX_STATIC_GRAY			0x8007
 #define GLX_TRANSPARENT_INDEX		0x8009
-#define GLX_COLOR_INDEX_TYPE		?
-#define GLX_COLOR_INDEX_BIT		?
-#define GLX_SCREEN			?
-#define GLX_PBUFFER_CLOBBER_MASK	?
-#define GLX_DAMAGED			?
-#define GLX_SAVED			?
-#define GLX_WINDOW			?
-#define GLX_PBUFFER			?
+#define GLX_COLOR_INDEX_TYPE		0x8015
+#define GLX_COLOR_INDEX_BIT		0x00000002
+#define GLX_SCREEN			0x800C
+#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
+#define GLX_DAMAGED			0x8020
+#define GLX_SAVED			0x8021
+#define GLX_WINDOW			0x8022
+#define GLX_PBUFFER			0x8033
 
 
 /*
@@ -281,12 +281,15 @@ extern Display *glXGetCurrentDisplay( void );
 
 
 /* GLX 1.3 and later */
-extern GLXFBConfig glXChooseFBConfig( Display *dpy, int screen,
-                                      const int *attribList, int *nitems );
+extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
+                                       const int *attribList, int *nitems );
 
 extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
                                  int attribute, int *value );
 
+extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
+                                     int *nelements );
+
 extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
                                               GLXFBConfig config );