diff options
| author | Christian König <[email protected]> | 2011-06-04 12:55:43 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-04 12:55:43 +0200 |
| commit | f82cfe1eb40b1de9f6d4cbdce2c509e3e429c1d4 (patch) | |
| tree | 036bc265f9bcc66f54760c14181d90373ebd43bc /src/gallium/drivers/r300/r300_context.h | |
| parent | 10370b752cd793665feec9494e6545a3f04c69f9 (diff) | |
Revert "Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video"
This reverts commit 10370b752cd793665feec9494e6545a3f04c69f9, reversing
changes made to ded2a9a628c58c2c8bfaaf6b8dd213e68de1dd20.
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 3f91666ac16..139dd210b8f 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -431,7 +431,6 @@ 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 { @@ -491,8 +490,6 @@ 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; |