diff options
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_primitive_restart.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_rebase.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 781e360d269..ded711b9fcd 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -1179,7 +1179,7 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) ctx->Shared->NullBufferObj); ASSERT(!exec->vtx.buffer_map); - exec->vtx.buffer_map = (GLfloat *)_mesa_align_malloc(VBO_VERT_BUFFER_SIZE, 64); + exec->vtx.buffer_map = _mesa_align_malloc(VBO_VERT_BUFFER_SIZE, 64); exec->vtx.buffer_ptr = exec->vtx.buffer_map; vbo_exec_vtxfmt_init( exec ); diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c index 18d851c1e1f..0797b5bc84c 100644 --- a/src/mesa/vbo/vbo_primitive_restart.c +++ b/src/mesa/vbo/vbo_primitive_restart.c @@ -86,7 +86,7 @@ find_sub_primitives(const void *elements, unsigned element_size, GLuint scan_index; unsigned scan_num; - sub_prims = (struct sub_primitive *) + sub_prims = malloc(max_prims * sizeof(struct sub_primitive)); if (!sub_prims) { diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c index fff9df0c29d..0813f1ccd12 100644 --- a/src/mesa/vbo/vbo_rebase.c +++ b/src/mesa/vbo/vbo_rebase.c @@ -146,7 +146,7 @@ void vbo_rebase_prims( struct gl_context *ctx, /* If we can just tell the hardware or the TNL to interpret our * indices with a different base, do so. */ - tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims); + tmp_prims = malloc(sizeof(*prim) * nr_prims); for (i = 0; i < nr_prims; i++) { tmp_prims[i] = prim[i]; @@ -195,7 +195,7 @@ void vbo_rebase_prims( struct gl_context *ctx, else { /* Otherwise the primitives need adjustment. */ - tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims); + tmp_prims = malloc(sizeof(*prim) * nr_prims); for (i = 0; i < nr_prims; i++) { /* If this fails, it could indicate an application error: |