added glXAllocate/FreeMemoryNV()
authorBrian Paul <brian.paul@tungstengraphics.com>
Thu, 22 Aug 2002 21:10:37 +0000 (21:10 +0000)
committerBrian Paul <brian.paul@tungstengraphics.com>
Thu, 22 Aug 2002 21:10:37 +0000 (21:10 +0000)
include/GL/gl.h
include/GL/glext.h
include/GL/glx.h

index fcc5bdd3273191ba41499b186acb179ebd058ed6..0701d593d6cead5d61997cad13466a51f6950bf1 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.66 2002/05/27 17:05:19 brianp Exp $ */
+/* $Id: gl.h,v 1.67 2002/08/22 21:10:37 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -83,9 +83,6 @@ extern "C" {
 
 
 #define GL_VERSION_1_1   1
-#define GL_VERSION_1_2   1
-#define GL_VERSION_1_3   1
-#define GL_ARB_imaging   1
 
 
 /*
@@ -333,10 +330,6 @@ typedef double             GLclampd;       /* double precision float in [0,1] */
 #define GL_DST_COLOR                           0x0306
 #define GL_ONE_MINUS_DST_COLOR                 0x0307
 #define GL_SRC_ALPHA_SATURATE                  0x0308
-#define GL_CONSTANT_COLOR                      0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR            0x8002
-#define GL_CONSTANT_ALPHA                      0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA            0x8004
 
 /* Render Mode */
 #define GL_FEEDBACK                            0x1C01
@@ -724,238 +717,6 @@ typedef double            GLclampd;       /* double precision float in [0,1] */
 #define GL_CLIENT_ALL_ATTRIB_BITS              0xFFFFFFFF
 
 
-/* OpenGL 1.2 */
-#define GL_RESCALE_NORMAL                      0x803A
-#define GL_CLAMP_TO_EDGE                       0x812F
-#define GL_MAX_ELEMENTS_VERTICES               0x80E8
-#define GL_MAX_ELEMENTS_INDICES                        0x80E9
-#define GL_BGR                                 0x80E0
-#define GL_BGRA                                        0x80E1
-#define GL_UNSIGNED_BYTE_3_3_2                 0x8032
-#define GL_UNSIGNED_BYTE_2_3_3_REV             0x8362
-#define GL_UNSIGNED_SHORT_5_6_5                        0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV            0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4              0x8033
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV          0x8365
-#define GL_UNSIGNED_SHORT_5_5_5_1              0x8034
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV          0x8366
-#define GL_UNSIGNED_INT_8_8_8_8                        0x8035
-#define GL_UNSIGNED_INT_8_8_8_8_REV            0x8367
-#define GL_UNSIGNED_INT_10_10_10_2             0x8036
-#define GL_UNSIGNED_INT_2_10_10_10_REV         0x8368
-#define GL_LIGHT_MODEL_COLOR_CONTROL           0x81F8
-#define GL_SINGLE_COLOR                                0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR             0x81FA
-#define GL_TEXTURE_MIN_LOD                     0x813A
-#define GL_TEXTURE_MAX_LOD                     0x813B
-#define GL_TEXTURE_BASE_LEVEL                  0x813C
-#define GL_TEXTURE_MAX_LEVEL                   0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE             0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY       0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE             0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY       0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE            0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE            0x846E
-#define GL_PACK_SKIP_IMAGES                    0x806B
-#define GL_PACK_IMAGE_HEIGHT                   0x806C
-#define GL_UNPACK_SKIP_IMAGES                  0x806D
-#define GL_UNPACK_IMAGE_HEIGHT                 0x806E
-#define GL_TEXTURE_3D                          0x806F
-#define GL_PROXY_TEXTURE_3D                    0x8070
-#define GL_TEXTURE_DEPTH                       0x8071
-#define GL_TEXTURE_WRAP_R                      0x8072
-#define GL_MAX_3D_TEXTURE_SIZE                 0x8073
-#define GL_TEXTURE_BINDING_3D                  0x806A
-
-
-/*
- * OpenGL 1.2 imaging subset
- */
-/* GL_EXT_color_table */
-#define GL_COLOR_TABLE                         0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE                0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE       0x80D2
-#define GL_PROXY_COLOR_TABLE                   0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE  0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE                   0x80D6
-#define GL_COLOR_TABLE_BIAS                    0x80D7
-#define GL_COLOR_TABLE_FORMAT                  0x80D8
-#define GL_COLOR_TABLE_WIDTH                   0x80D9
-#define GL_COLOR_TABLE_RED_SIZE                        0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE              0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE               0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE              0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE          0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE          0x80DF
-/* GL_EXT_convolution and GL_HP_convolution_border_modes */
-#define GL_CONVOLUTION_1D                      0x8010
-#define GL_CONVOLUTION_2D                      0x8011
-#define GL_SEPARABLE_2D                                0x8012
-#define GL_CONVOLUTION_BORDER_MODE             0x8013
-#define GL_CONVOLUTION_FILTER_SCALE            0x8014
-#define GL_CONVOLUTION_FILTER_BIAS             0x8015
-#define GL_REDUCE                              0x8016
-#define GL_CONVOLUTION_FORMAT                  0x8017
-#define GL_CONVOLUTION_WIDTH                   0x8018
-#define GL_CONVOLUTION_HEIGHT                  0x8019
-#define GL_MAX_CONVOLUTION_WIDTH               0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT              0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE          0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE                0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE         0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE                0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS           0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS         0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS          0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS         0x8023
-#define GL_CONSTANT_BORDER                     0x8151
-#define GL_REPLICATE_BORDER                    0x8153
-#define GL_CONVOLUTION_BORDER_COLOR            0x8154
-/* GL_SGI_color_matrix */
-#define GL_COLOR_MATRIX                                0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH            0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH                0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE         0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE       0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE                0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE       0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS          0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS                0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS         0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS                0x80BB
-/* GL_EXT_histogram */
-#define GL_HISTOGRAM                           0x8024
-#define GL_PROXY_HISTOGRAM                     0x8025
-#define GL_HISTOGRAM_WIDTH                     0x8026
-#define GL_HISTOGRAM_FORMAT                    0x8027
-#define GL_HISTOGRAM_RED_SIZE                  0x8028
-#define GL_HISTOGRAM_GREEN_SIZE                        0x8029
-#define GL_HISTOGRAM_BLUE_SIZE                 0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE                        0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE            0x802C
-#define GL_HISTOGRAM_SINK                      0x802D
-#define GL_MINMAX                              0x802E
-#define GL_MINMAX_FORMAT                       0x802F
-#define GL_MINMAX_SINK                         0x8030
-#define GL_TABLE_TOO_LARGE                     0x8031
-/* GL_EXT_blend_color, GL_EXT_blend_minmax */
-#define GL_BLEND_EQUATION                      0x8009
-#define GL_MIN                                 0x8007
-#define GL_MAX                                 0x8008
-#define GL_FUNC_ADD                            0x8006
-#define GL_FUNC_SUBTRACT                       0x800A
-#define GL_FUNC_REVERSE_SUBTRACT               0x800B
-#define GL_BLEND_COLOR                         0x8005
-
-
-/* OpenGL 1.3 */
-/* multitexture */
-#define GL_TEXTURE0                            0x84C0
-#define GL_TEXTURE1                            0x84C1
-#define GL_TEXTURE2                            0x84C2
-#define GL_TEXTURE3                            0x84C3
-#define GL_TEXTURE4                            0x84C4
-#define GL_TEXTURE5                            0x84C5
-#define GL_TEXTURE6                            0x84C6
-#define GL_TEXTURE7                            0x84C7
-#define GL_TEXTURE8                            0x84C8
-#define GL_TEXTURE9                            0x84C9
-#define GL_TEXTURE10                           0x84CA
-#define GL_TEXTURE11                           0x84CB
-#define GL_TEXTURE12                           0x84CC
-#define GL_TEXTURE13                           0x84CD
-#define GL_TEXTURE14                           0x84CE
-#define GL_TEXTURE15                           0x84CF
-#define GL_TEXTURE16                           0x84D0
-#define GL_TEXTURE17                           0x84D1
-#define GL_TEXTURE18                           0x84D2
-#define GL_TEXTURE19                           0x84D3
-#define GL_TEXTURE20                           0x84D4
-#define GL_TEXTURE21                           0x84D5
-#define GL_TEXTURE22                           0x84D6
-#define GL_TEXTURE23                           0x84D7
-#define GL_TEXTURE24                           0x84D8
-#define GL_TEXTURE25                           0x84D9
-#define GL_TEXTURE26                           0x84DA
-#define GL_TEXTURE27                           0x84DB
-#define GL_TEXTURE28                           0x84DC
-#define GL_TEXTURE29                           0x84DD
-#define GL_TEXTURE30                           0x84DE
-#define GL_TEXTURE31                           0x84DF
-#define GL_ACTIVE_TEXTURE                      0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE               0x84E1
-#define GL_MAX_TEXTURE_UNITS                   0x84E2
-/* texture_cube_map */
-#define GL_NORMAL_MAP                          0x8511
-#define GL_REFLECTION_MAP                      0x8512
-#define GL_TEXTURE_CUBE_MAP                    0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP            0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X         0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X         0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y         0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y         0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z         0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z         0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP              0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE           0x851C
-/* texture_compression */
-#define GL_COMPRESSED_ALPHA                    0x84E9
-#define GL_COMPRESSED_LUMINANCE                        0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA          0x84EB
-#define GL_COMPRESSED_INTENSITY                        0x84EC
-#define GL_COMPRESSED_RGB                      0x84ED
-#define GL_COMPRESSED_RGBA                     0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT            0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE       0x86A0
-#define GL_TEXTURE_COMPRESSED                  0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS      0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS          0x86A3
-/* multisample */
-#define GL_MULTISAMPLE                         0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE            0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE                 0x809F
-#define GL_SAMPLE_COVERAGE                     0x80A0
-#define GL_SAMPLE_BUFFERS                      0x80A8
-#define GL_SAMPLES                             0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE               0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT              0x80AB
-#define GL_MULTISAMPLE_BIT                     0x20000000
-/* transpose_matrix */
-#define GL_TRANSPOSE_MODELVIEW_MATRIX          0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX         0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX            0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX              0x84E6
-/* texture_env_combine */
-#define GL_COMBINE                             0x8570
-#define GL_COMBINE_RGB                         0x8571
-#define GL_COMBINE_ALPHA                       0x8572
-#define GL_SOURCE0_RGB                         0x8580
-#define GL_SOURCE1_RGB                         0x8581
-#define GL_SOURCE2_RGB                         0x8582
-#define GL_SOURCE0_ALPHA                       0x8588
-#define GL_SOURCE1_ALPHA                       0x8589
-#define GL_SOURCE2_ALPHA                       0x858A
-#define GL_OPERAND0_RGB                                0x8590
-#define GL_OPERAND1_RGB                                0x8591
-#define GL_OPERAND2_RGB                                0x8592
-#define GL_OPERAND0_ALPHA                      0x8598
-#define GL_OPERAND1_ALPHA                      0x8599
-#define GL_OPERAND2_ALPHA                      0x859A
-#define GL_RGB_SCALE                           0x8573
-#define GL_ADD_SIGNED                          0x8574
-#define GL_INTERPOLATE                         0x8575
-#define GL_SUBTRACT                            0x84E7
-#define GL_CONSTANT                            0x8576
-#define GL_PRIMARY_COLOR                       0x8577
-#define GL_PREVIOUS                            0x8578
-/* texture_env_dot3 */
-#define GL_DOT3_RGB                            0x86AE
-#define GL_DOT3_RGBA                           0x86AF
-/* texture_border_clamp */
-#define GL_CLAMP_TO_BORDER                     0x812D
-
-
 
 #if defined(__BEOS__) || defined(__QUICKDRAW__)
 #pragma export on
@@ -1058,7 +819,6 @@ GLAPI void GLAPIENTRY glFlush( void );
 GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
 
 
-
 /*
  * Depth Buffer
  */
@@ -1081,7 +841,6 @@ GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GL
 GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
 
 
-
 /*
  * Transformation
  */
@@ -1123,7 +882,6 @@ GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
 GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
 
 
-
 /*
  * Display Lists
  */
@@ -1146,7 +904,6 @@ GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
 GLAPI void GLAPIENTRY glListBase( GLuint base );
 
 
-
 /*
  * Drawing Functions
  */
@@ -1342,7 +1099,6 @@ GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
 GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
 
 
-
 /*
  * Vertex Arrays  (1.1)
  */
@@ -1376,7 +1132,6 @@ GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
 GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
                                            const GLvoid *pointer );
 
-
 /*
  * Lighting
  */
@@ -1411,8 +1166,6 @@ GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params
 GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
 
 
-
-
 /*
  * Raster functions
  */
@@ -1454,8 +1207,6 @@ GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
                                     GLsizei width, GLsizei height,
                                     GLenum type );
 
-
-
 /*
  * Stenciling
  */
@@ -1533,7 +1284,6 @@ GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
                                      GLvoid *pixels );
 
 
-
 /* 1.1 functions */
 
 GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
@@ -1590,8 +1340,6 @@ GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
                                            GLsizei width, GLsizei height );
 
 
-
-
 /*
  * Evaluators
  */
@@ -1645,7 +1393,6 @@ GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
 GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
 
 
-
 /*
  * Fog
  */
@@ -1659,7 +1406,6 @@ GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
 GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
 
 
-
 /*
  * Selection and Feedback
  */
@@ -1679,17 +1425,63 @@ GLAPI void GLAPIENTRY glPushName( GLuint name );
 GLAPI void GLAPIENTRY glPopName( void );
 
 
+#if defined(GL_GLEXT_LEGACY)
 
-/* 1.2 functions */
-GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
-       GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
 
-GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
-                                      GLint internalFormat,
-                                      GLsizei width, GLsizei height,
-                                      GLsizei depth, GLint border,
-                                      GLenum format, GLenum type,
-                                      const GLvoid *pixels );
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2   1
+
+#define GL_RESCALE_NORMAL                      0x803A
+#define GL_CLAMP_TO_EDGE                       0x812F
+#define GL_MAX_ELEMENTS_VERTICES               0x80E8
+#define GL_MAX_ELEMENTS_INDICES                        0x80E9
+#define GL_BGR                                 0x80E0
+#define GL_BGRA                                        0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2                 0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV             0x8362
+#define GL_UNSIGNED_SHORT_5_6_5                        0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV            0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4              0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV          0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1              0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV          0x8366
+#define GL_UNSIGNED_INT_8_8_8_8                        0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV            0x8367
+#define GL_UNSIGNED_INT_10_10_10_2             0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV         0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL           0x81F8
+#define GL_SINGLE_COLOR                                0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR             0x81FA
+#define GL_TEXTURE_MIN_LOD                     0x813A
+#define GL_TEXTURE_MAX_LOD                     0x813B
+#define GL_TEXTURE_BASE_LEVEL                  0x813C
+#define GL_TEXTURE_MAX_LEVEL                   0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE             0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY       0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE             0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY       0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE            0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE            0x846E
+#define GL_PACK_SKIP_IMAGES                    0x806B
+#define GL_PACK_IMAGE_HEIGHT                   0x806C
+#define GL_UNPACK_SKIP_IMAGES                  0x806D
+#define GL_UNPACK_IMAGE_HEIGHT                 0x806E
+#define GL_TEXTURE_3D                          0x806F
+#define GL_PROXY_TEXTURE_3D                    0x8070
+#define GL_TEXTURE_DEPTH                       0x8071
+#define GL_TEXTURE_WRAP_R                      0x8072
+#define GL_MAX_3D_TEXTURE_SIZE                 0x8073
+#define GL_TEXTURE_BINDING_3D                  0x806A
+
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+       GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
 
 GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
                                          GLint xoffset, GLint yoffset,
@@ -1815,9 +1607,199 @@ GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
 GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
        GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
 
+#endif /* GL_VERSION_1_2 */
+
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging   1
+
+#define GL_CONSTANT_COLOR                      0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR            0x8002
+#define GL_CONSTANT_ALPHA                      0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA            0x8004
+#define GL_COLOR_TABLE                         0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE                0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE       0x80D2
+#define GL_PROXY_COLOR_TABLE                   0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE  0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE                   0x80D6
+#define GL_COLOR_TABLE_BIAS                    0x80D7
+#define GL_COLOR_TABLE_FORMAT                  0x80D8
+#define GL_COLOR_TABLE_WIDTH                   0x80D9
+#define GL_COLOR_TABLE_RED_SIZE                        0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE              0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE               0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE              0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE          0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE          0x80DF
+#define GL_CONVOLUTION_1D                      0x8010
+#define GL_CONVOLUTION_2D                      0x8011
+#define GL_SEPARABLE_2D                                0x8012
+#define GL_CONVOLUTION_BORDER_MODE             0x8013
+#define GL_CONVOLUTION_FILTER_SCALE            0x8014
+#define GL_CONVOLUTION_FILTER_BIAS             0x8015
+#define GL_REDUCE                              0x8016
+#define GL_CONVOLUTION_FORMAT                  0x8017
+#define GL_CONVOLUTION_WIDTH                   0x8018
+#define GL_CONVOLUTION_HEIGHT                  0x8019
+#define GL_MAX_CONVOLUTION_WIDTH               0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT              0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE          0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE                0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE         0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE                0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS           0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS         0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS          0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS         0x8023
+#define GL_CONSTANT_BORDER                     0x8151
+#define GL_REPLICATE_BORDER                    0x8153
+#define GL_CONVOLUTION_BORDER_COLOR            0x8154
+#define GL_COLOR_MATRIX                                0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH            0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH                0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE         0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE       0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE                0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE       0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS          0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS                0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS         0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS                0x80BB
+#define GL_HISTOGRAM                           0x8024
+#define GL_PROXY_HISTOGRAM                     0x8025
+#define GL_HISTOGRAM_WIDTH                     0x8026
+#define GL_HISTOGRAM_FORMAT                    0x8027
+#define GL_HISTOGRAM_RED_SIZE                  0x8028
+#define GL_HISTOGRAM_GREEN_SIZE                        0x8029
+#define GL_HISTOGRAM_BLUE_SIZE                 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE                        0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE            0x802C
+#define GL_HISTOGRAM_SINK                      0x802D
+#define GL_MINMAX                              0x802E
+#define GL_MINMAX_FORMAT                       0x802F
+#define GL_MINMAX_SINK                         0x8030
+#define GL_TABLE_TOO_LARGE                     0x8031
+#define GL_BLEND_EQUATION                      0x8009
+#define GL_MIN                                 0x8007
+#define GL_MAX                                 0x8008
+#define GL_FUNC_ADD                            0x8006
+#define GL_FUNC_SUBTRACT                       0x800A
+#define GL_FUNC_REVERSE_SUBTRACT               0x800B
+#define GL_BLEND_COLOR                         0x8005
+
+#endif /* GL_ARB_imaging */
 
 
-/* 1.3 functions */
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3   1
+
+/* OpenGL 1.3 */
+/* multitexture */
+#define GL_TEXTURE0                            0x84C0
+#define GL_TEXTURE1                            0x84C1
+#define GL_TEXTURE2                            0x84C2
+#define GL_TEXTURE3                            0x84C3
+#define GL_TEXTURE4                            0x84C4
+#define GL_TEXTURE5                            0x84C5
+#define GL_TEXTURE6                            0x84C6
+#define GL_TEXTURE7                            0x84C7
+#define GL_TEXTURE8                            0x84C8
+#define GL_TEXTURE9                            0x84C9
+#define GL_TEXTURE10                           0x84CA
+#define GL_TEXTURE11                           0x84CB
+#define GL_TEXTURE12                           0x84CC
+#define GL_TEXTURE13                           0x84CD
+#define GL_TEXTURE14                           0x84CE
+#define GL_TEXTURE15                           0x84CF
+#define GL_TEXTURE16                           0x84D0
+#define GL_TEXTURE17                           0x84D1
+#define GL_TEXTURE18                           0x84D2
+#define GL_TEXTURE19                           0x84D3
+#define GL_TEXTURE20                           0x84D4
+#define GL_TEXTURE21                           0x84D5
+#define GL_TEXTURE22                           0x84D6
+#define GL_TEXTURE23                           0x84D7
+#define GL_TEXTURE24                           0x84D8
+#define GL_TEXTURE25                           0x84D9
+#define GL_TEXTURE26                           0x84DA
+#define GL_TEXTURE27                           0x84DB
+#define GL_TEXTURE28                           0x84DC
+#define GL_TEXTURE29                           0x84DD
+#define GL_TEXTURE30                           0x84DE
+#define GL_TEXTURE31                           0x84DF
+#define GL_ACTIVE_TEXTURE                      0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE               0x84E1
+#define GL_MAX_TEXTURE_UNITS                   0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP                          0x8511
+#define GL_REFLECTION_MAP                      0x8512
+#define GL_TEXTURE_CUBE_MAP                    0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP            0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X         0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X         0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y         0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y         0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z         0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z         0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP              0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE           0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA                    0x84E9
+#define GL_COMPRESSED_LUMINANCE                        0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA          0x84EB
+#define GL_COMPRESSED_INTENSITY                        0x84EC
+#define GL_COMPRESSED_RGB                      0x84ED
+#define GL_COMPRESSED_RGBA                     0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT            0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE       0x86A0
+#define GL_TEXTURE_COMPRESSED                  0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS      0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS          0x86A3
+/* multisample */
+#define GL_MULTISAMPLE                         0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE            0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE                 0x809F
+#define GL_SAMPLE_COVERAGE                     0x80A0
+#define GL_SAMPLE_BUFFERS                      0x80A8
+#define GL_SAMPLES                             0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE               0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT              0x80AB
+#define GL_MULTISAMPLE_BIT                     0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX          0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX         0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX            0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX              0x84E6
+/* texture_env_combine */
+#define GL_COMBINE                             0x8570
+#define GL_COMBINE_RGB                         0x8571
+#define GL_COMBINE_ALPHA                       0x8572
+#define GL_SOURCE0_RGB                         0x8580
+#define GL_SOURCE1_RGB                         0x8581
+#define GL_SOURCE2_RGB                         0x8582
+#define GL_SOURCE0_ALPHA                       0x8588
+#define GL_SOURCE1_ALPHA                       0x8589
+#define GL_SOURCE2_ALPHA                       0x858A
+#define GL_OPERAND0_RGB                                0x8590
+#define GL_OPERAND1_RGB                                0x8591
+#define GL_OPERAND2_RGB                                0x8592
+#define GL_OPERAND0_ALPHA                      0x8598
+#define GL_OPERAND1_ALPHA                      0x8599
+#define GL_OPERAND2_ALPHA                      0x859A
+#define GL_RGB_SCALE                           0x8573
+#define GL_ADD_SIGNED                          0x8574
+#define GL_INTERPOLATE                         0x8575
+#define GL_SUBTRACT                            0x84E7
+#define GL_CONSTANT                            0x8576
+#define GL_PRIMARY_COLOR                       0x8577
+#define GL_PREVIOUS                            0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB                            0x86AE
+#define GL_DOT3_RGBA                           0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER                     0x812D
 
 GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
 
@@ -1912,6 +1894,9 @@ GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
 
 GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
 
+#endif /* GL_VERSION_1_3 */
+
+
 
 /*
  * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
@@ -1994,10 +1979,6 @@ GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
 
 
 
-
-#if defined(GL_GLEXT_LEGACY)
-
-
 /*
  * 1. GL_EXT_abgr
  */
@@ -2370,8 +2351,6 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
 
 
 
-
-
 /*
  * 197. GL_MESA_window_pos
  */
@@ -2433,15 +2412,31 @@ GLAPI void GLAPIENTRY glResizeBuffersMESA( void );
 
 #else  /* GL_GLEXT_LEGACY */
 
+
 #include <GL/glext.h>
 
+/* fix-up known errors in glext.h */
+#ifndef GL_TEXTURE_BINDING_3D
+#define GL_TEXTURE_BINDING_3D                  0x806A
+#endif
+#ifdef GL_IGNORE_BORDER
+#undef GL_IGNORE_BORDER /* invalid! */
+#endif
+#ifdef GL_WRAP_BORDER
+#undef GL_WRAP_BORDER /* invalid! */
+#endif
+#ifndef GL_POST_COLOR_MATRIX_ALPHA_BIAS
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS    0x80BB
+#endif
+
+
 #endif  /* GL_GLEXT_LEGACY */
 
 
 
 /*
  * ???. GL_MESA_trace
- * XXX this should go into glext.h at some point
+ * XXX obsolete
  */
 #ifndef GL_MESA_trace
 #define GL_MESA_trace 1
@@ -2472,7 +2467,7 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid
 
 /*
  * ???. GL_MESA_packed_depth_stencil
- * XXX this will be in glext.h someday
+ * XXX obsolete
  */
 #ifndef GL_MESA_packed_depth_stencil
 #define GL_MESA_packed_depth_stencil 1
@@ -2486,63 +2481,6 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid
 #endif /* GL_MESA_packed_depth_stencil */
 
 
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-
-/* XXX not finalized yet - just testing */
-GLAPI void GLAPIENTRY glWindowPos2dARB(GLdouble x, GLdouble y);
-GLAPI void GLAPIENTRY glWindowPos2fARB(GLfloat x, GLfloat y);
-GLAPI void GLAPIENTRY glWindowPos2iARB(GLint x, GLint y);
-GLAPI void GLAPIENTRY glWindowPos2sARB(GLshort x, GLshort y);
-GLAPI void GLAPIENTRY glWindowPos2dvARB(const GLdouble *p);
-GLAPI void GLAPIENTRY glWindowPos2fvARB(const GLfloat *p);
-GLAPI void GLAPIENTRY glWindowPos2ivARB(const GLint *p);
-GLAPI void GLAPIENTRY glWindowPos2svARB(const GLshort *p);
-GLAPI void GLAPIENTRY glWindowPos3dARB(GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glWindowPos3fARB(GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glWindowPos3iARB(GLint x, GLint y, GLint z);
-GLAPI void GLAPIENTRY glWindowPos3sARB(GLshort x, GLshort y, GLshort z);
-GLAPI void GLAPIENTRY glWindowPos3dvARB(const GLdouble *p);
-GLAPI void GLAPIENTRY glWindowPos3fvARB(const GLfloat *p);
-GLAPI void GLAPIENTRY glWindowPos3ivARB(const GLint *p);
-GLAPI void GLAPIENTRY glWindowPos3svARB(const GLshort *p);
-
-#endif /* GL_ARB_window_pos */
-
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-
-/* XXX move to glext.h */
-#define GL_TEXTURE_COMPARE_MODE_ARB    0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB    0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB    0x884E
-
-#endif
-
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-
-/* XXX move to glext.h */
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB    0x80BF
-
-#endif
-
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-
-/* XXX move to glext.h */
-#define GL_DEPTH_COMPONENT16_ARB         0x81A5
-#define GL_DEPTH_COMPONENT24_ARB         0x81A6
-#define GL_DEPTH_COMPONENT32_ARB         0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB        0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB        0x884B
-
-#endif
-
-
 
 /**********************************************************************
  * Begin system-specific stuff
index fc9cb3c176d9a7c9119910baa16b323100772172..f842f69de3bad11ce4d163a359487fe7ed460846 100644 (file)
@@ -49,9 +49,9 @@ extern "C" {
 /*************************************************************/
 
 /* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2002/05/30 */
+/* glext.h last updated 2002/07/18 */
 /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 15
+#define GL_GLEXT_VERSION 16
 
 #ifndef GL_VERSION_1_2
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
@@ -2289,6 +2289,11 @@ extern "C" {
 #ifndef GL_EXT_shadow_funcs
 #endif
 
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
 
 /*************************************************************/
 
@@ -4642,6 +4647,14 @@ typedef void (APIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint
 #define GL_EXT_shadow_funcs 1
 #endif
 
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
 
 #ifdef __cplusplus
 }
index e19937f8bb3d18774f22440032159a162c3eb576..1f6f0c9cc080eff514f6cb0f31abbfc792f4c4fd 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.35 2001/12/14 03:19:06 brianp Exp $ */
+/* $Id: glx.h,v 1.36 2002/08/22 21:10:38 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -297,6 +297,15 @@ extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
 extern void (*glXGetProcAddress(const GLubyte *procname))();
 
 
+/*
+ * AGP memory allocator.
+ */
+extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void glXFreeMemoryNV(GLvoid *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
+
+
 
 #ifndef GLX_GLXEXT_LEGACY