summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-05-24 15:04:01 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-05-24 15:04:01 +0000
commitf658ab0e2e9c4f319c0e6e77e7d08031be74f93b (patch)
treebc515658cde7a8e6775eec9411485bddc86aa9bf /include
parentaea66b135eaa5a5f2bc8c652fa7a1a42cca2fe83 (diff)
always define GL_ARB_multitexture (OpenGL 1.2.1 feature)
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h206
1 files changed, 105 insertions, 101 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 63bae14f24..8e9ce07bd5 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.42 2000/05/23 22:41:51 brianp Exp $ */
+/* $Id: gl.h,v 1.43 2000/05/24 15:04:01 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1722,11 +1722,94 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+
#if defined(GL_GLEXT_LEGACY)
/*
- * GL_EXT_abgr (number 1)
+ * 1. GL_EXT_abgr
*/
#ifndef GL_EXT_abgr
#define GL_EXT_abgr 1
@@ -1738,7 +1821,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
/*
- * GL_EXT_blend_color (number 2)
+ * 2. GL_EXT_blend_color
*/
#ifndef GL_EXT_blend_color
#define GL_EXT_blend_color 1
@@ -1756,7 +1839,7 @@ GLAPI void GLAPIENTRY glBlendColorEXT( GLclampf red, GLclampf green, GLclampf bl
/*
- * GL_EXT_polygon_offset (number 3)
+ * 3. GL_EXT_polygon_offset
*/
#ifndef GL_EXT_polygon_offset
#define GL_EXT_polygon_offset 1
@@ -1772,7 +1855,7 @@ GLAPI void GLAPIENTRY glPolygonOffsetEXT( GLfloat factor, GLfloat bias );
/*
- * GL_EXT_texture3D (number 6)
+ * 6. GL_EXT_texture3D
*/
#ifndef GL_EXT_texture3D
#define GL_EXT_texture3D 1
@@ -1799,7 +1882,7 @@ GLAPI void GLAPIENTRY glCopyTexSubImage3DEXT( GLenum target, GLint level, GLint
/*
- * GL_EXT_texture_object (number 20)
+ * 20. GL_EXT_texture_object
*/
#ifndef GL_EXT_texture_object
#define GL_EXT_texture_object 1
@@ -1826,7 +1909,7 @@ GLAPI GLboolean GLAPIENTRY glIsTextureEXT( GLuint texture );
/*
- * GL_EXT_rescale_normal (number 27)
+ * 27. GL_EXT_rescale_normal
*/
#ifndef GL_EXT_rescale_normal
#define GL_EXT_rescale_normal 1
@@ -1838,7 +1921,7 @@ GLAPI GLboolean GLAPIENTRY glIsTextureEXT( GLuint texture );
/*
- * GL_EXT_vertex_array (number 30)
+ * 30. GL_EXT_vertex_array
*/
#ifndef GL_EXT_vertex_array
#define GL_EXT_vertex_array 1
@@ -1899,7 +1982,7 @@ GLAPI void GLAPIENTRY glDrawArraysEXT( GLenum mode, GLint first, GLsizei count )
/*
- * GL_SGIS_texture_edge_clamp (number 35)
+ * 35. GL_SGIS_texture_edge_clamp
*/
#ifndef GL_SGIS_texture_edge_clamp
#define GL_SGIS_texture_edge_clamp 1
@@ -1911,7 +1994,7 @@ GLAPI void GLAPIENTRY glDrawArraysEXT( GLenum mode, GLint first, GLsizei count )
/*
- * GL_EXT_blend_minmax (number 37)
+ * 37. GL_EXT_blend_minmax
*/
#ifndef GL_EXT_blend_minmax
#define GL_EXT_blend_minmax 1
@@ -1928,7 +2011,7 @@ GLAPI void GLAPIENTRY glBlendEquationEXT( GLenum mode );
/*
- * GL_EXT_blend_subtract (number 38) (requires GL_EXT_blend_max )
+ * 38. GL_EXT_blend_subtract (requires GL_EXT_blend_max )
*/
#ifndef GL_EXT_blend_subtract
#define GL_EXT_blend_subtract 1
@@ -1941,7 +2024,7 @@ GLAPI void GLAPIENTRY glBlendEquationEXT( GLenum mode );
/*
- * GL_EXT_blend_logic_op (number 39)
+ * 39. GL_EXT_blend_logic_op
*/
#ifndef GL_EXT_blend_logic_op
#define GL_EXT_blend_logic_op 1
@@ -1953,7 +2036,7 @@ GLAPI void GLAPIENTRY glBlendEquationEXT( GLenum mode );
/*
- * GL_EXT_point_parameters (number 54)
+ * 54. GL_EXT_point_parameters
*/
#ifndef GL_EXT_point_parameters
#define GL_EXT_point_parameters 1
@@ -1973,7 +2056,7 @@ GLAPI void GLAPIENTRY glPointParameterfvSGIS(GLenum pname, const GLfloat *params
/*
- * GL_EXT_paletted_texture (number 78)
+ * 78. GL_EXT_paletted_texture
*/
#ifndef GL_EXT_paletted_texture
#define GL_EXT_paletted_texture 1
@@ -2010,7 +2093,7 @@ GLAPI void GLAPIENTRY glGetColorTableParameterivEXT( GLenum target, GLenum pname
/*
- * GL_EXT_clip_volume_hint (number 79)
+ * 79. GL_EXT_clip_volume_hint
*/
#ifndef GL_EXT_clip_volume_hint
#define GL_EXT_clip_volume_hint 1
@@ -2022,7 +2105,7 @@ GLAPI void GLAPIENTRY glGetColorTableParameterivEXT( GLenum target, GLenum pname
/*
- * GL_EXT_compiled_vertex_array (number 97)
+ * 97. GL_EXT_compiled_vertex_array
*/
#ifndef GL_EXT_compiled_vertex_array
#define GL_EXT_compiled_vertex_array 1
@@ -2048,7 +2131,7 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
/*
- * GL_EXT_shared_texture_palette (number 141) (req's GL_EXT_paletted_texture)
+ * 141. GL_EXT_shared_texture_palette (req's GL_EXT_paletted_texture)
*/
#ifndef GL_EXT_shared_texture_palette
#define GL_EXT_shared_texture_palette 1
@@ -2060,7 +2143,7 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
/*
- * GL_EXT_stencil_wrap (number 176)
+ * 176. GL_EXT_stencil_wrap
*/
#ifndef GL_EXT_stencil_wrap
#define GL_EXT_stencil_wrap 1
@@ -2073,7 +2156,7 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
/*
- * GL_NV_texgen_reflection (number 179)
+ * 179. GL_NV_texgen_reflection
*/
#ifndef GL_NV_texgen_reflection
#define GL_NV_texgen_reflection 1
@@ -2086,7 +2169,7 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
/*
- * GL_EXT_texture_env_add (number 185)
+ * 185. GL_EXT_texture_env_add
*/
#ifndef GL_EXT_texture_env_add
#define GL_EXT_texture_env_add 1
@@ -2097,89 +2180,10 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
-/*
- * GL_ARB_multitexture (ARB 0)
- */
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-
-#define GL_TEXTURE0_ARB 0x84C0
-#define GL_TEXTURE1_ARB 0x84C1
-#define GL_TEXTURE2_ARB 0x84C2
-#define GL_TEXTURE3_ARB 0x84C3
-#define GL_TEXTURE4_ARB 0x84C4
-#define GL_TEXTURE5_ARB 0x84C5
-#define GL_TEXTURE6_ARB 0x84C6
-#define GL_TEXTURE7_ARB 0x84C7
-#define GL_TEXTURE8_ARB 0x84C8
-#define GL_TEXTURE9_ARB 0x84C9
-#define GL_TEXTURE10_ARB 0x84CA
-#define GL_TEXTURE11_ARB 0x84CB
-#define GL_TEXTURE12_ARB 0x84CC
-#define GL_TEXTURE13_ARB 0x84CD
-#define GL_TEXTURE14_ARB 0x84CE
-#define GL_TEXTURE15_ARB 0x84CF
-#define GL_TEXTURE16_ARB 0x84D0
-#define GL_TEXTURE17_ARB 0x84D1
-#define GL_TEXTURE18_ARB 0x84D2
-#define GL_TEXTURE19_ARB 0x84D3
-#define GL_TEXTURE20_ARB 0x84D4
-#define GL_TEXTURE21_ARB 0x84D5
-#define GL_TEXTURE22_ARB 0x84D6
-#define GL_TEXTURE23_ARB 0x84D7
-#define GL_TEXTURE24_ARB 0x84D8
-#define GL_TEXTURE25_ARB 0x84D9
-#define GL_TEXTURE26_ARB 0x84DA
-#define GL_TEXTURE27_ARB 0x84DB
-#define GL_TEXTURE28_ARB 0x84DC
-#define GL_TEXTURE29_ARB 0x84DD
-#define GL_TEXTURE30_ARB 0x84DE
-#define GL_TEXTURE31_ARB 0x84DF
-#define GL_ACTIVE_TEXTURE_ARB 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
-
-GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
-GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
-GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
-GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
-GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
-GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
-GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
-GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
-GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
-GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
-
-#endif /* GL_ARB_multitexture */
-
/*
- * GL_MESA_window_pos (197)
+ * 197. GL_MESA_window_pos
*/
#ifndef GL_MESA_window_pos
#define GL_MESA_window_pos 1
@@ -2214,7 +2218,7 @@ GLAPI void GLAPIENTRY glWindowPos4dvMESA( const GLdouble *p );
/*
- * GL_MESA_resize_bufffers (196)
+ * 196. GL_MESA_resize_bufffers
*/
#ifndef GL_MESA_resize_bufffers
#define GL_MESA_resize_buffers 1