diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
| commit | 36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e (patch) | |
| tree | 6c680de320af7a288fe70e5a95696bcf0f5faa56 /src/mesa/main/mtypes.h | |
| parent | 0cebd5822a39ad3b3d7621f8e59efab329bfb5b9 (diff) | |
Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 75117902e1..8935f0ad73 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,10 +1,8 @@ -/* $Id: mtypes.h,v 1.109 2003/04/05 00:38:09 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.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"), @@ -1006,6 +1004,7 @@ struct gl_texture_attrib { GLuint CurrentUnit; /* Active texture unit */ GLuint _EnabledUnits; /* one bit set for each really-enabled unit */ + GLuint _EnabledCoordUnits; /* one bit per enabled coordinate unit */ GLuint _GenFlags; /* for texgen */ GLuint _TexGenEnabled; GLuint _TexMatEnabled; @@ -1562,7 +1561,7 @@ struct matrix_stack #define _NEW_ARRAY_TEXCOORD_5 VERT_BIT_TEX5 #define _NEW_ARRAY_TEXCOORD_6 VERT_BIT_TEX6 #define _NEW_ARRAY_TEXCOORD_7 VERT_BIT_TEX7 -#define _NEW_ARRAY_ATTRIB_0 0x10000 /* start at bit 16 */ +#define _NEW_ARRAY_ATTRIB_0 0x1 /* alias conventional arrays */ #define _NEW_ARRAY_ALL 0xffffffff |