fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[g3dvl] fix merge conflicts

Browse source
This commit is contained in:
Christian König 2010-12-22 21:38:48 +01:00
parent e179a8bf34
commit 2191d8064e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/auxiliary/vl/vl_compositor.c
View file

@ -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);
}

4
src/gallium/auxiliary/vl/vl_vertex_buffers.c
View file

@ -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