diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-28 16:28:11 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-28 16:28:11 +0000 |
| commit | 683dba1164133554f511a4fa57b2c304a488b9dc (patch) | |
| tree | 79d14ab7d647cfadd18f097fdbb559831fc3932b /include | |
| parent | 4965446dbd9003dceaa729a5dd53e2104365367e (diff) | |
minimal support for GL_ATI_texture_env_combine3, merge with DRI trunk
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 13 | ||||
| -rw-r--r-- | include/GL/glxext.h | 11 |
2 files changed, 21 insertions, 3 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 44254a77ff..3d75e09e55 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,10 +1,10 @@ -/* $Id: gl.h,v 1.72 2002/10/17 19:39:31 kschultz Exp $ */ +/* $Id: gl.h,v 1.72.2.1 2003/02/28 16:29:05 brianp 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 +2646,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/glxext.h b/include/GL/glxext.h index 54620bd4e1..aa899546ad 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -260,6 +260,9 @@ extern "C" { #ifndef GLX_MESA_release_buffers #endif +#ifndef GLX_MESA_agp_offset +#endif + #ifndef GLX_MESA_set_3dfx_mode #define GLX_3DFX_WINDOW_MODE_MESA 0x1 #define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2 @@ -568,6 +571,14 @@ extern Bool glXSet3DfxModeMESA (int); typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode); #endif +#ifndef GLX_MESA_agp_offset +#define GLX_MESA_agp_offset 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern GLuint glXGetAGPOffsetMESA (const GLvoid *); +#endif /* GLX_GLXEXT_PROTOTYPES */ +typedef GLuint ( * PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *); +#endif + #ifndef GLX_SGIX_visual_select_group #define GLX_SGIX_visual_select_group 1 #endif |