Mesa (instanced-arrays): gallium: Move instance_divisor field from vertex_buffer to vertex_element.

[Michał Król]

Module: Mesa
Branch: instanced-arrays
Commit: f7d1689cfa8e3eb2aea4b86031510323b4d13110
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7d1689cfa8e3eb2aea4b86031510323b4d13110

Author: Michal Krol <michal at vmware.com>
Date:   Tue Dec 29 19:18:54 2009 +0100

gallium: Move instance_divisor field from vertex_buffer to vertex_element.

---

 src/gallium/include/pipe/p_state.h |    6 +++++-
 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 4d38bbc..4d25f60 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?
     */