diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
| commit | 155fbcb0ed85c6452cbedd2317f201100fe698ab (patch) | |
| tree | 15e8a2662b1341bd07cebb9cd3624bc4ed42d020 /src/gallium/drivers/failover/fo_context.h | |
| parent | 9a8342ebcd83a2022b3c9b9539c5b15ac56d6440 (diff) | |
| parent | eeaa0861bfc98a06ceec269801271b7453c4fcbd (diff) | |
Merge commit 'origin/master' into gallium-sw-api-2
Diffstat (limited to 'src/gallium/drivers/failover/fo_context.h')
| -rw-r--r-- | src/gallium/drivers/failover/fo_context.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/failover/fo_context.h b/src/gallium/drivers/failover/fo_context.h index bb1a168ea7..4a754465bb 100644 --- a/src/gallium/drivers/failover/fo_context.h +++ b/src/gallium/drivers/failover/fo_context.h @@ -78,6 +78,7 @@ struct failover_context { const struct fo_state *rasterizer; const struct fo_state *fragment_shader; const struct fo_state *vertex_shader; + const struct fo_state *vertex_elements; struct pipe_blend_color blend_color; struct pipe_stencil_ref stencil_ref; @@ -89,10 +90,8 @@ struct failover_context { struct pipe_texture *vertex_textures[PIPE_MAX_VERTEX_SAMPLERS]; struct pipe_viewport_state viewport; struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS]; - struct pipe_vertex_element vertex_elements[PIPE_MAX_ATTRIBS]; uint num_vertex_buffers; - uint num_vertex_elements; void *sw_sampler_state[PIPE_MAX_SAMPLERS]; void *hw_sampler_state[PIPE_MAX_SAMPLERS]; |