diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
| commit | e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563 (patch) | |
| tree | 8dc271c2fdc6ceda6b329762d234c88e0fdffe2e /src/gallium/drivers/r300/r300_render_translate.c | |
| parent | 9f2cf899578464a7448d7abec681bde42eb3d2f2 (diff) | |
| parent | 5c102dd94f435e97507213fbd128e50dd15f5f54 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
Diffstat (limited to 'src/gallium/drivers/r300/r300_render_translate.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_render_translate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_render_translate.c b/src/gallium/drivers/r300/r300_render_translate.c index 90b2f40be5..26e00a2cad 100644 --- a/src/gallium/drivers/r300/r300_render_translate.c +++ b/src/gallium/drivers/r300/r300_render_translate.c @@ -128,12 +128,11 @@ void r300_begin_vertex_translate(struct r300_context *r300) /* Unmap all buffers. */ for (i = 0; i < r300->vertex_buffer_count; i++) { if (vb_translated[i]) { - pipe_buffer_unmap(pipe, r300->vertex_buffer[i].buffer, - vb_transfer[i]); + pipe_buffer_unmap(pipe, vb_transfer[i]); } } - pipe_buffer_unmap(pipe, out_buffer, out_transfer); + pipe_buffer_unmap(pipe, out_transfer); /* Setup the new vertex buffer in the first free slot. */ for (i = 0; i < PIPE_MAX_ATTRIBS; i++) { |