From 2191d8064e9d177311f0833241d16384ead89e1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Wed, 22 Dec 2010 21:38:48 +0100 Subject: [PATCH] [g3dvl] fix merge conflicts --- src/gallium/auxiliary/vl/vl_compositor.c | 5 ++--- src/gallium/auxiliary/vl/vl_vertex_buffers.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 1a05f36..5187c63 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -516,7 +516,7 @@ static unsigned gen_data(struct vl_compositor *c, } } - pipe_buffer_unmap(c->pipe, c->vertex_buf.buffer, buf_transfer); + pipe_buffer_unmap(c->pipe, buf_transfer); return num_rects; } @@ -633,6 +633,5 @@ void vl_compositor_set_csc_matrix(struct vl_compositor *compositor, const float sizeof(struct fragment_shader_consts) ); - pipe_buffer_unmap(compositor->pipe, compositor->fs_const_buf, - buf_transfer); + pipe_buffer_unmap(compositor->pipe, buf_transfer); } diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.c b/src/gallium/auxiliary/vl/vl_vertex_buffers.c index 4182bad..3a69730 100644 --- a/src/gallium/auxiliary/vl/vl_vertex_buffers.c +++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.c @@ -77,7 +77,7 @@ vl_vb_upload_quads(struct pipe_context *pipe, unsigned max_blocks) for ( i = 0; i < max_blocks; ++i) memcpy(v + i, &const_quad, sizeof(const_quad)); - pipe_buffer_unmap(pipe, quad.buffer, buf_transfer); + pipe_buffer_unmap(pipe, buf_transfer); return quad; } @@ -161,7 +161,7 @@ vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe) { assert(buffer && pipe); - pipe_buffer_unmap(pipe, buffer->resource, buffer->transfer); + pipe_buffer_unmap(pipe, buffer->transfer); } unsigned -- 2.7.4