diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-25 00:21:32 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-25 00:21:32 +0000 |
commit | 095c6699f449ed4803f23e844cc0227743a9c3e1 (patch) | |
tree | 2446935d4cdb2ab45834a94e8780d90ddd66292e /src/mesa/tnl/t_context.h | |
parent | f12ea2d402e8f6d29dfd40c731351ff210887b58 (diff) |
No longer alias generic vertex attribs with conventional attribs for GL_ARB_vertex_program.
Diffstat (limited to 'src/mesa/tnl/t_context.h')
-rw-r--r-- | src/mesa/tnl/t_context.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index 7a0ca6f411..7a80e3477c 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -152,6 +152,9 @@ enum { #define _TNL_ATTRIB_TEX(u) (_TNL_ATTRIB_TEX0 + (u)) #define _TNL_ATTRIB_ATTRIBUTE(n) (_TNL_ATTRIB_ATTRIBUTE0 + (n)) +/* special index used for handing invalid glVertexAttribute() indices */ +#define _TNL_ATTRIB_ERROR (_TNL_ATTRIB_ATTRIBUTE15 + 1) + /* Define bit ranges instead of bit masks. */ #define _TNL_FIRST_PROG _TNL_ATTRIB_WEIGHT @@ -228,10 +231,11 @@ struct _tnl_dynfn_generators { struct _tnl_dynfn *(*Attribute[4])( GLcontext *ctx, int key ); }; -#define _TNL_MAX_ATTR_CODEGEN 16 +#define _TNL_MAX_ATTR_CODEGEN 32 -/* The assembly of vertices in immediate mode is separated from +/** + * The assembly of vertices in immediate mode is separated from * display list compilation. This allows a simpler immediate mode * treatment and a display list compiler better suited to * hardware-acceleration. @@ -250,7 +254,8 @@ struct tnl_vtx { GLuint counter, initial_counter; struct tnl_copied_vtx copied; - tnl_attrfv_func tabfv[_TNL_MAX_ATTR_CODEGEN+1][4]; /* plus 1 for ERROR_ATTRIB */ + /** Note extra space for error handler: */ + tnl_attrfv_func tabfv[_TNL_ATTRIB_ERROR+1][4]; struct _tnl_dynfn_lists cache; struct _tnl_dynfn_generators gen; |