diff options
author | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:50:08 +0100 |
---|---|---|
committer | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:50:08 +0100 |
commit | 40ae246ea1c1715876fe0e164e2041a4478246fd (patch) | |
tree | 172ae8c581c5a7c7b35d68ed5dbc4085e28c2033 /mesa/vbo/vbo_context.h | |
parent | ed0beba0b514a7d4971345db2ff716aedd2892bb (diff) |
DRI SDK headers from mesa 7.6.0.
Diffstat (limited to 'mesa/vbo/vbo_context.h')
-rw-r--r-- | mesa/vbo/vbo_context.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesa/vbo/vbo_context.h b/mesa/vbo/vbo_context.h index 5c85161..8b726dc 100644 --- a/mesa/vbo/vbo_context.h +++ b/mesa/vbo/vbo_context.h @@ -68,8 +68,8 @@ struct vbo_context { struct gl_client_array *generic_currval; struct gl_client_array *mat_currval; - GLuint map_vp_none[32]; - GLuint map_vp_arb[32]; + GLuint map_vp_none[VERT_ATTRIB_MAX]; + GLuint map_vp_arb[VERT_ATTRIB_MAX]; GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->Current, ctx->Light.Material */ GLfloat CurrentFloatEdgeFlag; @@ -92,13 +92,13 @@ static INLINE struct vbo_context *vbo_context(GLcontext *ctx) return (struct vbo_context *)(ctx->swtnl_im); } -enum { - VP_NONE = 1, - VP_NV, - VP_ARB -}; -static INLINE GLuint get_program_mode( GLcontext *ctx ) +/** + * Return VP_x token to indicate whether we're running fixed-function + * vertex transformation, an NV vertex program or ARB vertex program/shader. + */ +static INLINE enum vp_mode +get_program_mode( GLcontext *ctx ) { if (!ctx->VertexProgram._Current) return VP_NONE; |