diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
| commit | 5b22d4d5511efbd4fb0658c370edadd39829e39b (patch) | |
| tree | 96a36b429ff2a0819653279a5e63a1bed79d4434 /mesalib/src/gallium/auxiliary/util/u_draw_quad.h | |
| parent | 7bc456b7052b9591a58bfb6b509abb09d5464990 (diff) | |
| parent | 67c290de36ddc1caae94c0892157ac16b90e4f99 (diff) | |
| download | vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.gz vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.bz2 vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 31 oct 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_draw_quad.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_draw_quad.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_draw_quad.h b/mesalib/src/gallium/auxiliary/util/u_draw_quad.h index 2834a4a81..cb17f4e4c 100644 --- a/mesalib/src/gallium/auxiliary/util/u_draw_quad.h +++ b/mesalib/src/gallium/auxiliary/util/u_draw_quad.h @@ -44,8 +44,9 @@ struct cso_context; extern void util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso, - struct pipe_resource *vbuf, uint offset, - uint num_attribs, uint num_verts, uint prim_type); + struct pipe_resource *vbuf, uint vbuf_slot, + uint offset, uint prim_type, uint num_attribs, + uint num_verts); void util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer, @@ -53,6 +54,7 @@ util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer, extern void util_draw_texquad(struct pipe_context *pipe, struct cso_context *cso, + uint vbuf_slot, float x0, float y0, float x1, float y1, float z); |