diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-22 14:57:51 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-22 14:57:51 -0600 |
| commit | 2ead49f98bcc18ab0ebc7942de78e280ec56d77a (patch) | |
| tree | 40096f3c6146820ba79eab63006d098c4f6b9c0a /src/mesa/main | |
| parent | 8e3f6c0f96eb22198ec436990acc85d44aca7d8e (diff) | |
mesa: reduce gl_array_object::VertexAttrib[] array from 32 to 16 elements
This array was mistakenly dimensioned with VERT_ATTRIB_MAX (32) but it
should really be MAX_VERTEX_GENERIC_ATTRIBS (16).
The generic vertex attributes are in addition to the conventional arrays
(except in NV vertex program mode- they alias/overlay in that case) so
the total of all conventional attributes plus generic attributes should
total 32 (not 48).
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 55bfa2bf41..e3471123c6 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1574,8 +1574,13 @@ struct gl_array_object struct gl_client_array PointSize; /*@}*/ - /** Generic arrays for vertex programs/shaders */ - struct gl_client_array VertexAttrib[VERT_ATTRIB_MAX]; + /** + * Generic arrays for vertex programs/shaders. + * For NV vertex programs, these attributes alias and take priority + * over the conventional attribs above. For ARB vertex programs and + * GLSL vertex shaders, these attributes are separate. + */ + struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS]; /** Mask of _NEW_ARRAY_* values indicating which arrays are enabled */ GLbitfield _Enabled; |