From 183b7373f9919eeb5eb408f38578e01717b2cc10 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 27 Sep 2011 08:26:50 +0200 Subject: libX11 pixman mesa xserver git update 27 sep 2011 --- mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h | 52 ++++++++++++------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h') diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h index c653ca434..d854e4449 100644 --- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h +++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h @@ -64,7 +64,7 @@ struct u_vbuf_mgr { /* Contains only real vertex buffers. * Hardware drivers should use real_vertex_buffers[i] * instead of vertex_buffers[i].buffer. */ - struct pipe_resource *real_vertex_buffer[PIPE_MAX_ATTRIBS]; + struct pipe_vertex_buffer real_vertex_buffer[PIPE_MAX_ATTRIBS]; int nr_real_vertex_buffers; /* Precomputed max_index for hardware vertex buffers. */ @@ -88,7 +88,7 @@ struct u_vbuf_resource { }; /* Opaque type containing information about vertex elements for the manager. */ -struct u_vbuf_mgr_elements; +struct u_vbuf_elements; enum u_fetch_alignment { U_VERTEX_FETCH_BYTE_ALIGNED, @@ -96,42 +96,40 @@ enum u_fetch_alignment { }; enum u_vbuf_return_flags { - U_VBUF_BUFFERS_UPDATED = 1, - U_VBUF_UPLOAD_FLUSHED = 2 + U_VBUF_BUFFERS_UPDATED = 1 }; struct u_vbuf_mgr * -u_vbuf_mgr_create(struct pipe_context *pipe, - unsigned upload_buffer_size, - unsigned upload_buffer_alignment, - unsigned upload_buffer_bind, - enum u_fetch_alignment fetch_alignment); +u_vbuf_create(struct pipe_context *pipe, + unsigned upload_buffer_size, + unsigned upload_buffer_alignment, + unsigned upload_buffer_bind, + enum u_fetch_alignment fetch_alignment); -void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgr); +void u_vbuf_destroy(struct u_vbuf_mgr *mgr); -struct u_vbuf_mgr_elements * -u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgr, - unsigned count, - const struct pipe_vertex_element *attrs, - struct pipe_vertex_element *native_attrs); +struct u_vbuf_elements * +u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgr, + unsigned count, + const struct pipe_vertex_element *attrs, + struct pipe_vertex_element *native_attrs); -void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgr, - void *cso, - struct u_vbuf_mgr_elements *ve); +void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgr, + void *cso, + struct u_vbuf_elements *ve); -void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr, - struct u_vbuf_mgr_elements *ve); +void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr, + struct u_vbuf_elements *ve); -void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgr, - unsigned count, - const struct pipe_vertex_buffer *bufs); +void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgr, + unsigned count, + const struct pipe_vertex_buffer *bufs); -enum u_vbuf_return_flags -u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgr, - const struct pipe_draw_info *info); +enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf_mgr *mgr, + const struct pipe_draw_info *info); -void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgr); +void u_vbuf_draw_end(struct u_vbuf_mgr *mgr); static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r) -- cgit v1.2.3