diff options
| author | Michal Krol <michal@vmware.com> | 2010-01-14 18:11:41 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-01-14 18:11:41 +0100 |
| commit | 5184b02b0793136a15b7edf309d79a1efe1bc73d (patch) | |
| tree | 939f7f87f623b0651e31ea84131c00630ae19f12 /src/gallium/include/pipe/p_state.h | |
| parent | 1bc77e9931a248b74e0ef6b6aa2f4c5b2d1a2ca3 (diff) | |
| parent | ea0cc47a4f769e19ceadb9704669244f5ba53871 (diff) | |
Merge branch 'instanced-arrays'
Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
Diffstat (limited to 'src/gallium/include/pipe/p_state.h')
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 66d6cfa11e..e2885eb2b8 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -372,6 +372,11 @@ struct pipe_vertex_element /** Offset of this attribute, in bytes, from the start of the vertex */ unsigned src_offset; + /** Instance data rate divisor. 0 means this is per-vertex data, + * n means per-instance data used for n consecutive instances (n > 0). + */ + unsigned instance_divisor; + /** Which vertex_buffer (as given to pipe->set_vertex_buffer()) does * this attribute live in? */ |