diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2003-03-11 10:32:22 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-03-11 10:32:22 +0000 |
| commit | 3f00e34097d088a1447d414835c6f51436c7a3a4 (patch) | |
| tree | 3044c06b18d26f22a29b45385f5d32b8e63d2805 /include | |
| parent | 3e48e6fce4861febd24d8d1008df66ae1b87c8ad (diff) | |
Merge from trunk to bring in GL_ATI_texture_env_combine3 tokens (Jon Smirl)
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 12 | ||||
| -rw-r--r-- | include/GL/glext.h | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 44254a77ff6..9fe11d5c765 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,10 +1,9 @@ -/* $Id: gl.h,v 1.72 2002/10/17 19:39:31 kschultz Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.0.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 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"), @@ -2646,6 +2645,13 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid #endif /* GL_APPLE_ycbcr_422 */ +#ifndef GL_ATI_texture_env_combine3 +#define GL_ATI_texture_env_combine3 1 +#define GL_MODULATE_ADD_ATI 0x8744 +#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 +#define GL_MODULATE_SUBTRACT_ATI 0x8746 +#endif + /********************************************************************** * Begin system-specific stuff diff --git a/include/GL/glext.h b/include/GL/glext.h index 245f100c706..7d1f396bbd4 100644 --- a/include/GL/glext.h +++ b/include/GL/glext.h @@ -2423,6 +2423,11 @@ extern "C" { #define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 #endif +#ifndef GL_ATI_texture_env_combine3 +#define GL_MODULATE_ADD_ATI 0x8744 +#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 +#define GL_MODULATE_SUBTRACT_ATI 0x8746 +#endif /*************************************************************/ @@ -5016,6 +5021,9 @@ GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum); typedef void (APIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); #endif +#ifndef GL_ATI_texture_env_combine3 +#define GL_ATI_texture_env_combine3 1 +#endif #ifdef __cplusplus } |