diff options
author | Brian Paul <[email protected]> | 2003-11-29 19:33:33 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2003-11-29 19:33:33 +0000 |
commit | e90de7883a3bd9afd27ac83314f08cf9f03f60e3 (patch) | |
tree | bcbdd5ba61e8f1b93d3a2466ac0e7be85a35024c /src/mesa/main | |
parent | afb6fe034c3df9377ca8c0393a60c7996af92faf (diff) |
Fix generic/conventional vertex array glitches.
Changed _NEW_ARRAY_ATTRIB_0 back to 0x10000 so that the conventional and
generic enable bits do not alias.
In ac_import.c test Array.Normal.Enabled instead of Array._Enabled & _NEW_ARRAY_COLOR0, etc.
In t_array_import.c give priority for generic arrays over conventional
arrays on an individual basis, not all or none.
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1e0a0633cd4..686dd4aac8d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1929,7 +1929,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 0x1 /* alias conventional arrays */ +#define _NEW_ARRAY_ATTRIB_0 0x10000 /* start at bit 16 */ #define _NEW_ARRAY_ALL 0xffffffff |