added GLX_EXT_visual_rating

[mesa.git] / include / GL / glx.h

diff --git a/include/GL/glx.h b/include/GL/glx.h
index e98f9cb8e7440456bbd494ed7832167c02b984c9..672a9b860e436087ca933d36c6a7adf2e62cddca 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,10 +1,10 @@
-/* $Id: glx.h,v 1.8 1999/11/23 19:54:53 brianp Exp $ */
+/* $Id: glx.h,v 1.17 2000/03/31 01:03:41 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,12 +30,21 @@
 #define GLX_H
 
 
+#ifdef __VMS
+# ifdef __cplusplus
+/* VMS Xlib.h gives problems with C++.
+ * this avoids a bunch of trivial warnings */
+#pragma message disable nosimpint
+#endif
+#endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include "GL/gl.h"
-#ifdef MESA
-#include "GL/xmesa.h"
+#ifdef __VMS
+# ifdef __cplusplus
+#pragma message enable nosimpint
 #endif
+#endif
+#include "GL/gl.h"
 
 
 #if defined(USE_MGL_NAMESPACE)
@@ -50,7 +59,6 @@ extern "C" {
 
 #define GLX_VERSION_1_1                1
 #define GLX_VERSION_1_2                1
-#define GLX_VERSION_1_3                1
 
 #define GLX_EXTENSION_NAME   "GLX"
 
@@ -123,6 +131,7 @@ extern "C" {
 #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      ?
@@ -145,6 +154,7 @@ extern "C" {
 #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                    ?
@@ -154,7 +164,7 @@ extern "C" {
 
 
 /*
- * GLX_EXT_visual_info extension
+ * 28. GLX_EXT_visual_info extension
  */
 #define GLX_X_VISUAL_TYPE_EXT          0x22
 #define GLX_TRANSPARENT_TYPE_EXT       0x23
@@ -163,11 +173,6 @@ extern "C" {
 #define GLX_TRANSPARENT_GREEN_VALUE_EXT        0x26
 #define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27
 #define GLX_TRANSPARENT_ALPHA_VALUE_EXT        0x28
-
-
-/*
- * GLX_visual_info extension
- */
 #define GLX_TRUE_COLOR_EXT             0x8002
 #define GLX_DIRECT_COLOR_EXT           0x8003
 #define GLX_PSEUDO_COLOR_EXT           0x8004
@@ -179,16 +184,26 @@ extern "C" {
 #define GLX_TRANSPARENT_INDEX_EXT      0x8009
 
 
+/*
+ * 42. GLX_EXT_visual_rating
+ */
+#define GLX_VISUAL_CAVEAT_EXT          0x20
+/*#define GLX_NONE_EXT                 0x8000*/
+#define GLX_SLOW_VISUALEXT             0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT  0x800D
+
+
 /*
  * Compile-time extension tests
  */
 #define GLX_EXT_visual_info            1
-#define GLX_EXT_get_proc_address       1
+#define GLX_EXT_visual_rating          1
 #define GLX_MESA_pixmap_colormap       1
 #define GLX_MESA_release_buffers       1
 #define GLX_MESA_copy_sub_buffer       1
 #define GLX_MESA_set_3dfx_mode         1
 #define GLX_SGI_video_sync             1
+#define GLX_ARB_get_proc_address       1
 
 
 
@@ -223,7 +238,7 @@ extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
                            GLXContext ctx);
 
 extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-                           GLuint mask );
+                           unsigned long mask );
 
 extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
 
@@ -337,6 +352,10 @@ extern int glXWaitVideoSyncSGI(int divisor, int remainder,
                                unsigned int *count);
 
 
+/* GLX_ARB_get_proc_address */
+extern void (*glXGetProcAddressARB(const GLubyte *procName))();
+
+
 
 #ifdef __cplusplus
 }