summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Krol <michal@vmware.com>2009-12-29 19:18:54 +0100
committerMichal Krol <michal@vmware.com>2009-12-29 19:18:54 +0100
commitf7d1689cfa8e3eb2aea4b86031510323b4d13110 (patch)
tree04bfcd2cc8a1e5d51ec3dc5e777ecd1cf066a824
parentd0b55120beb4848be5e7ef24f0301f8397baa8be (diff)
gallium: Move instance_divisor field from vertex_buffer to vertex_element.
-rw-r--r--src/gallium/include/pipe/p_state.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 4d38bbcc326..4d25f601f42 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -364,7 +364,6 @@ struct pipe_vertex_buffer
unsigned stride; /**< stride to same attrib in next vertex, in bytes */
unsigned max_index; /**< number of vertices in this buffer */
unsigned buffer_offset; /**< offset to start of data in buffer, in bytes */
- unsigned instance_divisor; /**< instance data rate divisor, 0 means per-vertex data */
struct pipe_buffer *buffer; /**< the actual buffer */
};
@@ -377,6 +376,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?
*/