diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 13:21:11 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 13:21:11 +1100 |
| commit | 295d6f8e8f03192320aa8d4ed767427dd06071a5 (patch) | |
| tree | ca8d7949d700d96b7d123366aa57b80894d1757f /src/gallium/auxiliary/draw/draw_vs.h | |
| parent | 2882a2db7a766c60bb231978ea829632438dd8a4 (diff) | |
| parent | 41ccdde767e7aba6e8e6a9a035eacd6338c03a95 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_vs.h')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs.h b/src/gallium/auxiliary/draw/draw_vs.h index 45992d1986..68c24abad3 100644 --- a/src/gallium/auxiliary/draw/draw_vs.h +++ b/src/gallium/auxiliary/draw/draw_vs.h @@ -64,7 +64,7 @@ struct draw_vs_varient_key { unsigned nr_outputs:8; unsigned viewport:1; unsigned clip:1; - unsigned pad:5; + unsigned const_vbuffers:5; struct draw_varient_element element[PIPE_MAX_ATTRIBS]; }; @@ -76,7 +76,7 @@ struct draw_vs_varient { struct draw_vertex_shader *vs; - void (*set_input)( struct draw_vs_varient *, + void (*set_buffer)( struct draw_vs_varient *, unsigned i, const void *ptr, unsigned stride ); |