[Mesa3d-dev] Latest glext.h file

[Gareth H. <ga...@va...>]

The following patch addresses a couple of issues with version 7 of glext.h,
available now from oss.sgi.com.

According to the GL_ARB_texture_compression spec,

    1.0,  03/24/00 prbrown1: Applied changes approved as part of the extension
                             at the March 2000 ARB meeting, as follows:
                             ...
                             * Renamed TEXTURE_IMAGE_SIZE_ARB to
                               TEXTURE_COMPRESSED_IMAGE_SIZE_ARB.

Version 7 of glext.h seems to have undone this change.  Just bringing this to
your attention, there may very well be a reason for this change that I'm not
aware of.

To build the latest GLperf code on Linux, the GL_COLOR_TABLE_*_EXT tokens had to
be added.  These were taken from the GL_EXT_paletted_texture spec, and are
duplicates of the corresponding values from the OpenGL 1.2 imaging subset.

I recently added support for the soon-to-be-deprecated GL_EXT_texture_env_dot3
to Mesa, to expose the functionality in the Radeon DRI driver.  We will, of
course, update this to the ARB extension when it is finalized, but I've added
the required tokens so we can implement dot product bump mapping now.

(Mesa people:  I've updated Mesa's copy of glext.h to version 7 and will commit
it now, with the following patch applied).

-- Gareth


--- glext.h	Wed Jan 31 01:07:34 2001
+++ glext.h.new	Wed Jan 31 01:14:30 2001
@@ -220,7 +220,7 @@
 #define GL_COMPRESSED_RGB_ARB             0x84ED
 #define GL_COMPRESSED_RGBA_ARB            0x84EE
 #define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_IMAGE_SIZE_ARB         0x86A0
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
 #define GL_TEXTURE_COMPRESSED_ARB         0x86A1
 #define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
 #define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
@@ -842,6 +842,14 @@
 #define GL_COLOR_INDEX8_EXT               0x80E5
 #define GL_COLOR_INDEX12_EXT              0x80E6
 #define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_COLOR_TABLE_FORMAT_EXT         0x80D8
+#define GL_COLOR_TABLE_WIDTH_EXT          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_EXT       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_EXT     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_EXT      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_EXT     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
 #endif
 
@@ -1494,6 +1502,11 @@
 #define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
 #endif
 
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
 
 /*************************************************************/
 
@@ -3027,6 +3040,10 @@
 extern void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
 #endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const
GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
 #endif