Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video

1 files changed, 3 insertions, 0 deletions

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 139dd210b8f..3f91666ac16 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -431,6 +431,7 @@ struct r300_vertex_element_state {
     unsigned vertex_size_dwords;
 
     struct r300_vertex_stream_state vertex_stream;
+    struct r300_vertex_stream_state vertex_stream_instanced;
 };
 
 enum r300_hiz_func {
@@ -490,6 +491,8 @@ struct r300_context {
     /* When no vertex buffer is set, this one is used instead to prevent
      * hardlocks. */
     struct pipe_resource *dummy_vb;
+    /* Vertex buffer for InstanceID. */
+    struct r300_resource *vb_instanceid;
 
     /* The currently active query. */
     struct r300_query *query_current;