diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /src/mesa/vf/vf.c | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'src/mesa/vf/vf.c')
| -rw-r--r-- | src/mesa/vf/vf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/vf/vf.c b/src/mesa/vf/vf.c index 82f3d2b641..defb7cbe2c 100644 --- a/src/mesa/vf/vf.c +++ b/src/mesa/vf/vf.c @@ -86,7 +86,7 @@ void vf_register_fastpath( struct vertex_fetch *vf, fastpath->match_strides = match_strides; fastpath->func = vf->emit; fastpath->attr = (struct vf_attr_type *) - _mesa_malloc(vf->attr_count * sizeof(fastpath->attr[0])); + malloc(vf->attr_count * sizeof(fastpath->attr[0])); for (i = 0; i < vf->attr_count; i++) { fastpath->attr[i].format = vf->attr[i].format; @@ -162,8 +162,8 @@ GLuint vf_set_vertex_attributes( struct vertex_fetch *vf, const GLuint format = map[i].format; if (format == EMIT_PAD) { if (DBG) - _mesa_printf("%d: pad %d, offset %d\n", i, - map[i].offset, offset); + printf("%d: pad %d, offset %d\n", i, + map[i].offset, offset); offset += map[i].offset; @@ -180,9 +180,9 @@ GLuint vf_set_vertex_attributes( struct vertex_fetch *vf, vf->attr[j].vertoffset = offset; if (DBG) - _mesa_printf("%d: %s, offset %d\n", i, - vf_format_info[format].name, - vf->attr[j].vertoffset); + printf("%d: %s, offset %d\n", i, + vf_format_info[format].name, + vf->attr[j].vertoffset); offset += vf_format_info[format].attrsize; j++; @@ -296,7 +296,7 @@ void vf_get_attr( struct vertex_fetch *vf, /* Else return the value from ctx->Current. */ - _mesa_memcpy( dest, dflt, 4*sizeof(GLfloat)); + memcpy( dest, dflt, 4*sizeof(GLfloat)); } |