diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-12-06 15:41:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-12-06 15:41:43 +0000 |
| commit | 9580179dfb42d5b81ff6ec9704b82a556c7f1229 (patch) | |
| tree | ae2a55aa82c4efc43ae832abcf316e1773c228bb /src/mesa/tnl/t_vertex.c | |
| parent | d5179613d5302173471a6a910fa9ec235c9ff046 (diff) | |
C++ fixes, mostly casts (Stephane Conversy)
Diffstat (limited to 'src/mesa/tnl/t_vertex.c')
| -rw-r--r-- | src/mesa/tnl/t_vertex.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index ca3aad1404..b532a20142 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -87,7 +87,8 @@ void _tnl_register_fastpath( struct tnl_clipspace *vtx, fastpath->attr_count = vtx->attr_count; fastpath->match_strides = match_strides; fastpath->func = vtx->emit; - fastpath->attr = MALLOC(vtx->attr_count * sizeof(fastpath->attr[0])); + fastpath->attr = (struct attr_type *) + _mesa_malloc(vtx->attr_count * sizeof(fastpath->attr[0])); for (i = 0; i < vtx->attr_count; i++) { fastpath->attr[i].format = vtx->attr[i].format; @@ -425,7 +426,7 @@ void *_tnl_emit_vertices_to_buffer( GLcontext *ctx, /* Note: dest should not be adjusted for non-zero 'start' values: */ - vtx->emit( ctx, end - start, dest ); + vtx->emit( ctx, end - start, (GLubyte*) dest ); return (void *)((GLubyte *)dest + vtx->vertex_size * (end - start)); } |