diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-09-17 03:40:11 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-09-17 03:40:11 +0000 |
| commit | 148a2847a105ce9d9189ad3081091de60f803a33 (patch) | |
| tree | 103a9c215249d036f6bd44ffb8db812ca903f3ad /src/mesa/tnl | |
| parent | 4561f8418331f74cabf29649e9a4df7e92504a90 (diff) | |
More work on ARB_vertex_buffer_object.
Use GLubyte * instead of void * for gl_client_array->Ptr to simplify upcoming
pointer arithmetic changes.
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 6 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_program.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index f1d6ee8925..85f63dd8fb 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -298,7 +298,7 @@ static void _tnl_vb_bind_immediate( GLcontext *ctx, struct immediate *IM ) } if (inputs & VERT_BIT_COLOR1) { - tmp->SecondaryColor.Ptr = IM->Attrib[VERT_ATTRIB_COLOR1] + start; + tmp->SecondaryColor.Ptr = (GLubyte *) (IM->Attrib[VERT_ATTRIB_COLOR1] + start); VB->SecondaryColorPtr[0] = &tmp->SecondaryColor; } @@ -308,12 +308,12 @@ static void _tnl_vb_bind_immediate( GLcontext *ctx, struct immediate *IM ) if (inputs & VERT_BIT_COLOR0) { if (IM->CopyOrFlag & VERT_BIT_COLOR0) { - tmp->Color.Ptr = IM->Attrib[VERT_ATTRIB_COLOR0] + start; + tmp->Color.Ptr = (GLubyte *) (IM->Attrib[VERT_ATTRIB_COLOR0] + start); tmp->Color.StrideB = 4 * sizeof(GLfloat); tmp->Color.Flags = 0; } else { - tmp->Color.Ptr = ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; + tmp->Color.Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; tmp->Color.StrideB = 0; tmp->Color.Flags = CA_CLIENT_DATA; /* hack */ VB->import_source = IM; diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index 452c00620f..7fac7ec893 100644 --- a/src/mesa/tnl/t_vb_program.c +++ b/src/mesa/tnl/t_vb_program.c @@ -287,7 +287,7 @@ static GLboolean run_validate_program( GLcontext *ctx, */ static void init_color_array( struct gl_client_array *a, GLvector4f *vec ) { - a->Ptr = vec->data; + a->Ptr = (GLubyte *) vec->data; a->Size = 4; a->Type = GL_FLOAT; a->Stride = 0; |