diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-05-07 00:33:12 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-05-07 00:33:12 +0000 |
| commit | 54f1027362fa9463dde0caa195c8fb2940aa2042 (patch) | |
| tree | 02a7b15fffa28589110e8467f17a4513edc392e2 /src/mesa/drivers/dri/i830/i830_context.c | |
| parent | 4ab8b77520f77a7a28a688c7599c917703f1a5e7 (diff) | |
Refactor "classic" texture environments to be implemented in terms of
ARB_texture_env_combine state. Add support for
ARB_texture_env_crossbar. Combiner state is only emitted for operands
that need to be emitted for the combine operation.
Diffstat (limited to 'src/mesa/drivers/dri/i830/i830_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_context.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c index 7f306f2110..97a9f793fc 100644 --- a/src/mesa/drivers/dri/i830/i830_context.c +++ b/src/mesa/drivers/dri/i830/i830_context.c @@ -26,14 +26,15 @@ * **************************************************************************/ /* $XFree86: xc/lib/GL/mesa/src/drv/i830/i830_context.c,v 1.9 2003/02/06 04:18:00 dawes Exp $ */ -/* - * Authors: - * Jeff Hartmann <jhartmann@2d3d.com> - * Graeme Fisher <graeme@2d3d.co.za> - * Abraham vd Merwe <abraham@2d3d.co.za> +/** + * \file i830_context.c + * + * Heavily Based on I810 driver written by Keith Whitwell. * - * Heavily Based on I810 driver written by: - * Keith Whitwell <keith@tungstengraphics.com> + * \author Jeff Hartmann <jhartmann@2d3d.com> + * \author Graeme Fisher <graeme@2d3d.co.za> + * \author Abraham vd Merwe <abraham@2d3d.co.za> + * \author Keith Whitwell <keith@tungstengraphics.com> */ #include "glheader.h" @@ -71,7 +72,7 @@ int I830_DEBUG = (0); * Mesa's Driver Functions ***************************************/ -#define DRIVER_DATE "20021115" +#define DRIVER_DATE "20040506" const char __driConfigOptions[] = { 0 }; @@ -146,6 +147,7 @@ static const char * const card_extensions[] = "GL_ARB_texture_compression", "GL_ARB_texture_env_add", "GL_ARB_texture_env_combine", + "GL_ARB_texture_env_crossbar", "GL_ARB_texture_env_dot3", "GL_ARB_texture_mirrored_repeat", "GL_EXT_blend_color", |